summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/buildbot/buildbot-2.8.2.ebuild11
-rw-r--r--dev-util/buildbot/buildbot-9999.ebuild11
2 files changed, 4 insertions, 18 deletions
diff --git a/dev-util/buildbot/buildbot-2.8.2.ebuild b/dev-util/buildbot/buildbot-2.8.2.ebuild
index 3a8aa883913f..6a93195514d8 100644
--- a/dev-util/buildbot/buildbot-2.8.2.ebuild
+++ b/dev-util/buildbot/buildbot-2.8.2.ebuild
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
acct-user/buildbot
>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+ >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
@@ -40,9 +40,8 @@ RDEPEND="
>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
crypt? (
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
- <dev-python/idna-2.9[${PYTHON_USEDEP}]
+ dev-python/idna[${PYTHON_USEDEP}]
dev-python/service_identity[${PYTHON_USEDEP}]
)
irc? (
@@ -77,12 +76,6 @@ DEPEND="${RDEPEND}
~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
- crypt? (
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
- >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
- <dev-python/idna-2.9[${PYTHON_USEDEP}]
- dev-python/service_identity[${PYTHON_USEDEP}]
- )
)"
S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 25ce6693e4eb..aab7babe0e90 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
acct-user/buildbot
>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+ >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
@@ -41,9 +41,8 @@ RDEPEND="
>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
crypt? (
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
- <dev-python/idna-2.9[${PYTHON_USEDEP}]
+ dev-python/idna[${PYTHON_USEDEP}]
dev-python/service_identity[${PYTHON_USEDEP}]
)
irc? (
@@ -78,12 +77,6 @@ DEPEND="${RDEPEND}
dev-util/buildbot-pkg[${PYTHON_USEDEP}]
dev-util/buildbot-worker[${PYTHON_USEDEP}]
dev-util/buildbot-www[${PYTHON_USEDEP}]
- crypt? (
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
- >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
- <dev-python/idna-2.9[${PYTHON_USEDEP}]
- dev-python/service_identity[${PYTHON_USEDEP}]
- )
)"
S=${S}/master