From 16a20b7d5631ef55e3e7d4783a3a9dd7ae5540f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
Date: Wed, 5 Jul 2023 11:08:51 +0200
Subject: [PATCH] net-im/synapse: restrict rdeps to <pillow-10 and <pydantic-2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pillow 10 removes some deprecated constatns that are used in synapse,
the issue is already fixed in upstream, see [1,2].
Moreover, synapse is incompatible with pydantic 2.0 [3].

[1] https://github.com/matrix-org/synapse/issues/15873
[2] https://github.com/matrix-org/synapse/pull/15876
[3] https://github.com/matrix-org/synapse/issues/15858

Closes: https://bugs.gentoo.org/909644
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
---
 .../{synapse-1.85.2.ebuild => synapse-1.85.2-r1.ebuild}     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename net-im/synapse/{synapse-1.85.2.ebuild => synapse-1.85.2-r1.ebuild} (96%)

diff --git a/net-im/synapse/synapse-1.85.2.ebuild b/net-im/synapse/synapse-1.85.2-r1.ebuild
similarity index 96%
rename from net-im/synapse/synapse-1.85.2.ebuild
rename to net-im/synapse/synapse-1.85.2-r1.ebuild
index 89e8f254b8254..50379e31f4a11 100644
--- a/net-im/synapse/synapse-1.85.2.ebuild
+++ b/net-im/synapse/synapse-1.85.2-r1.ebuild
@@ -92,6 +92,8 @@ DEPEND="
 	acct-user/synapse
 	acct-group/synapse
 "
+# <pillow-10, see bug #909644
+# <pydantic-2, see https://github.com/matrix-org/synapse/issues/15858
 RDEPEND="
 	${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -108,11 +110,11 @@ RDEPEND="
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/phonenumbers[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP},webp]
+	<dev-python/pillow-10[${PYTHON_USEDEP},webp]
 	dev-python/prometheus-client[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pydantic[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
 	dev-python/pymacaroons[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]