[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/

[Michał Górny]

commit:     a77ad28c24cca99b477cbe956785ff316a44c81d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 09:50:46 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 06:57:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a77ad28c

dev-util/buildbot: Account for dev-python/twisted USE={crypt → ssl}

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../buildbot/{buildbot-3.4.0.ebuild => buildbot-3.4.0-r1.ebuild}    | 6 +++++-
 .../buildbot/{buildbot-3.5.0.ebuild => buildbot-3.5.0-r1.ebuild}    | 6 +++++-
 dev-util/buildbot/buildbot-9999.ebuild                              | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/dev-util/buildbot/buildbot-3.4.0.ebuild b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
similarity index 97%
rename from dev-util/buildbot/buildbot-3.4.0.ebuild
rename to dev-util/buildbot/buildbot-3.4.0-r1.ebuild
index da16ccd719c4..48e0f782f784 100644
--- a/dev-util/buildbot/buildbot-3.4.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
@@ -42,6 +42,10 @@ RDEPEND="
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
+		)
 		dev-python/idna[${PYTHON_USEDEP}]
 	)
 	irc? (

diff --git a/dev-util/buildbot/buildbot-3.5.0.ebuild b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
similarity index 97%
rename from dev-util/buildbot/buildbot-3.5.0.ebuild
rename to dev-util/buildbot/buildbot-3.5.0-r1.ebuild
index eb038ad1f925..e6a1f69bd613 100644
--- a/dev-util/buildbot/buildbot-3.5.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
@@ -42,6 +42,10 @@ RDEPEND="
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
+		)
 		dev-python/idna[${PYTHON_USEDEP}]
 	)
 	irc? (

diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 4b1b1de3957d..2f299e4c1c37 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
@@ -37,6 +37,10 @@ RDEPEND="
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
+		)
 		dev-python/idna[${PYTHON_USEDEP}]
 	)
 	irc? (