[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Michał Górny]

commit:     7f3158e874904e547bed32548c9344a64946f266
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 17:29:39 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 17:35:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3158e8

net-p2p/deluge: Flatten twisted dep

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

 net-p2p/deluge/deluge-1.3.15-r5.ebuild | 7 +------
 net-p2p/deluge/deluge-1.3.15-r6.ebuild | 7 +------
 net-p2p/deluge/deluge-1.3.15-r7.ebuild | 7 +------
 net-p2p/deluge/deluge-1.3.9999.ebuild  | 7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.15-r5.ebuild 
b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
index 61514eb8e1d..bb90b884827 100644
--- a/net-p2p/deluge/deluge-1.3.15-r5.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
@@ -46,12 +46,7 @@ RDEPEND="${CDEPEND}
                dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
                dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
                dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-               || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-                       (
-                       >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
-                       >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
-                       )
-               )
+               >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
                geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
                gtk? (
                        sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )

diff --git a/net-p2p/deluge/deluge-1.3.15-r6.ebuild 
b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
index f044210962a..58e3297a8a9 100644
--- a/net-p2p/deluge/deluge-1.3.15-r6.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
@@ -45,12 +45,7 @@ RDEPEND="
                dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
                dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
                dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-               || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-                       (
-                       >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
-                       >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
-                       )
-               )
+               >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
                geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
                gtk? (
                        sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )

diff --git a/net-p2p/deluge/deluge-1.3.15-r7.ebuild 
b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
index 13817ba74ca..018c45c4ff6 100644
--- a/net-p2p/deluge/deluge-1.3.15-r7.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
@@ -46,12 +46,7 @@ RDEPEND="
                dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
                dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
                dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-               || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-                       (
-                       >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
-                       >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
-                       )
-               )
+               >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
                geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
                gtk? (
                        sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild 
b/net-p2p/deluge/deluge-1.3.9999.ebuild
index af10c260e9f..33dd3918e4e 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -47,12 +47,7 @@ RDEPEND="
                dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
                dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
                dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-               || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-                       (
-                       >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
-                       >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
-                       )
-               )
+               >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
                geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
                gtk? (
                        sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )