From 7f3158e874904e547bed32548c9344a64946f266 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Mar 2020 18:29:39 +0100 Subject: [PATCH] net-p2p/deluge: Flatten twisted dep MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- 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 61514eb8e1d1..bb90b8848275 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 f044210962ad..58e3297a8a9a 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 13817ba74ca2..018c45c4ff65 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 af10c260e9f3..33dd3918e4ea 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}] ) -- 2.26.2