net-p2p/deluge: Flatten twisted dep

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

diff --git a/net-p2p/deluge/deluge-1.3.15-r5.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
index 61514eb8e1d161f29f6f51fd2e06ce2ae3bc518c..bb90b8848275d8bf721f5283c4d4c7e7b65b4b2d 100644 (file)
--- 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 f044210962adeeb57436430c12389ddb0f842174..58e3297a8a9aa9500cf238f7b975e7345b46f30d 100644 (file)
--- 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 13817ba74ca242da34413a83e894a2b6f9096a4d..018c45c4ff659e8429b53b5ac7c319c6e56526ef 100644 (file)
--- 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 af10c260e9f35cdff0f67218f46091b1ed7e0c86..33dd3918e4ea5083beb6cdf4680408d99c0a5167 100644 (file)
--- 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}] )