From e4e26e9cd27d60cc0a79cb6961dcc13de3791b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 20 Oct 2024 12:28:09 +0200
Subject: [PATCH] net-im/synapse: Restrict dev-python/twisted due to
 regressions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: https://bugs.gentoo.org/941879
Bug: https://github.com/element-hq/synapse/issues/17075
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 net-im/synapse/synapse-1.113.0-r1.ebuild | 6 ++----
 net-im/synapse/synapse-1.114.0-r1.ebuild | 6 ++----
 net-im/synapse/synapse-1.115.0-r2.ebuild | 6 ++----
 net-im/synapse/synapse-1.116.0-r1.ebuild | 6 ++----
 net-im/synapse/synapse-1.116.0-r2.ebuild | 6 ++----
 5 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/net-im/synapse/synapse-1.113.0-r1.ebuild b/net-im/synapse/synapse-1.113.0-r1.ebuild
index f3419579ad09d..2a3f66af95ae8 100644
--- a/net-im/synapse/synapse-1.113.0-r1.ebuild
+++ b/net-im/synapse/synapse-1.113.0-r1.ebuild
@@ -124,9 +124,7 @@ DEPEND="
 	acct-user/synapse
 	acct-group/synapse
 "
-# The dev-python/twisted-24.3.0_p20240628 snapshot available in our tree
-# introduces some breaking changes for synapse,
-# see https://github.com/element-hq/synapse/issues/17075
+# <twisted: https://github.com/element-hq/synapse/issues/17075
 RDEPEND="
 	${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -156,7 +154,7 @@ RDEPEND="
 	dev-python/signedjson[${PYTHON_USEDEP}]
 	dev-python/sortedcontainers[${PYTHON_USEDEP}]
 	dev-python/treq[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
+	<dev-python/twisted-24.10[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
diff --git a/net-im/synapse/synapse-1.114.0-r1.ebuild b/net-im/synapse/synapse-1.114.0-r1.ebuild
index 1babee2f0d9a5..5445fd9a9573d 100644
--- a/net-im/synapse/synapse-1.114.0-r1.ebuild
+++ b/net-im/synapse/synapse-1.114.0-r1.ebuild
@@ -124,9 +124,7 @@ DEPEND="
 	acct-user/synapse
 	acct-group/synapse
 "
-# The dev-python/twisted-24.3.0_p20240628 snapshot available in our tree
-# introduces some breaking changes for synapse,
-# see https://github.com/element-hq/synapse/issues/17075
+# <twisted: https://github.com/element-hq/synapse/issues/17075
 RDEPEND="
 	${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -156,7 +154,7 @@ RDEPEND="
 	dev-python/signedjson[${PYTHON_USEDEP}]
 	dev-python/sortedcontainers[${PYTHON_USEDEP}]
 	dev-python/treq[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
+	<dev-python/twisted-24.10[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
diff --git a/net-im/synapse/synapse-1.115.0-r2.ebuild b/net-im/synapse/synapse-1.115.0-r2.ebuild
index 3a7e70a1e23cb..39b32557718e7 100644
--- a/net-im/synapse/synapse-1.115.0-r2.ebuild
+++ b/net-im/synapse/synapse-1.115.0-r2.ebuild
@@ -124,9 +124,7 @@ DEPEND="
 	acct-user/synapse
 	acct-group/synapse
 "
-# The dev-python/twisted-24.3.0_p20240628 snapshot available in our tree
-# introduces some breaking changes for synapse,
-# see https://github.com/element-hq/synapse/issues/17075
+# <twisted: https://github.com/element-hq/synapse/issues/17075
 RDEPEND="
 	${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -156,7 +154,7 @@ RDEPEND="
 	dev-python/signedjson[${PYTHON_USEDEP}]
 	dev-python/sortedcontainers[${PYTHON_USEDEP}]
 	dev-python/treq[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
+	<dev-python/twisted-24.10[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
diff --git a/net-im/synapse/synapse-1.116.0-r1.ebuild b/net-im/synapse/synapse-1.116.0-r1.ebuild
index b030bb579e910..a5627622a9e93 100644
--- a/net-im/synapse/synapse-1.116.0-r1.ebuild
+++ b/net-im/synapse/synapse-1.116.0-r1.ebuild
@@ -124,9 +124,7 @@ DEPEND="
 	acct-user/synapse
 	acct-group/synapse
 "
-# The dev-python/twisted-24.3.0_p20240628 snapshot available in our tree
-# introduces some breaking changes for synapse,
-# see https://github.com/element-hq/synapse/issues/17075
+# <twisted: https://github.com/element-hq/synapse/issues/17075
 RDEPEND="
 	${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -156,7 +154,7 @@ RDEPEND="
 	dev-python/signedjson[${PYTHON_USEDEP}]
 	dev-python/sortedcontainers[${PYTHON_USEDEP}]
 	dev-python/treq[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
+	<dev-python/twisted-24.10[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
diff --git a/net-im/synapse/synapse-1.116.0-r2.ebuild b/net-im/synapse/synapse-1.116.0-r2.ebuild
index 4506c4e74f1dd..de5fd7861198a 100644
--- a/net-im/synapse/synapse-1.116.0-r2.ebuild
+++ b/net-im/synapse/synapse-1.116.0-r2.ebuild
@@ -124,9 +124,7 @@ DEPEND="
 	acct-user/synapse
 	acct-group/synapse
 "
-# The dev-python/twisted-24.3.0_p20240628 snapshot available in our tree
-# introduces some breaking changes for synapse,
-# see https://github.com/element-hq/synapse/issues/17075
+# <twisted: https://github.com/element-hq/synapse/issues/17075
 RDEPEND="
 	${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -156,7 +154,7 @@ RDEPEND="
 	dev-python/signedjson[${PYTHON_USEDEP}]
 	dev-python/sortedcontainers[${PYTHON_USEDEP}]
 	dev-python/treq[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
+	<dev-python/twisted-24.10[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )