net-p2p/deluge: Switch to PYTHON_MULTI_USEDEP API

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

diff --git a/net-p2p/deluge/deluge-1.3.15-r2.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
similarity index 81%
rename from net-p2p/deluge/deluge-1.3.15-r2.ebuild
rename to net-p2p/deluge/deluge-1.3.15-r5.ebuild
index f49c58d5c41ab4a7bdf9ecd133850e3d1d8ce65a..61514eb8e1d161f29f6f51fd2e06ce2ae3bc518c 100644 (file)
--- a/net-p2p/deluge/deluge-1.3.15-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -34,30 +34,34 @@ PATCHES=(
        "${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
+CDEPEND="
+       $(python_gen_cond_dep '
+               net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+       ')"
 DEPEND="${CDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
        dev-util/intltool"
 RDEPEND="${CDEPEND}
-       dev-python/chardet[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
-       dev-python/pyxdg[${PYTHON_USEDEP}]
-       dev-python/setproctitle[${PYTHON_USEDEP}]
-       || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-               (
-               >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-               >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+               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}]
+                       )
                )
-       )
-       geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-       gtk? (
-               sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-               dev-python/pygobject:2[${PYTHON_USEDEP}]
-               >=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-               gnome-base/librsvg
-               libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-       )
-       webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+               geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+               gtk? (
+                       sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+                       dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+                       gnome-base/librsvg
+                       libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+               )
+               webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+       ')"
 
 python_prepare_all() {
        local args=(

diff --git a/net-p2p/deluge/deluge-1.3.15-r3.ebuild b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
similarity index 78%
rename from net-p2p/deluge/deluge-1.3.15-r3.ebuild
rename to net-p2p/deluge/deluge-1.3.15-r6.ebuild
index d3ef7813a7a0cdd1c5512dbda7a8a8470f1e9c6d..f044210962adeeb57436430c12389ddb0f842174 100644 (file)
--- a/net-p2p/deluge/deluge-1.3.15-r3.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,29 +33,34 @@ PATCHES=(
        "${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-       dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+       $(python_gen_cond_dep '
+               <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+       ')
        dev-util/intltool"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-       dev-python/chardet[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
-       dev-python/pyxdg[${PYTHON_USEDEP}]
-       dev-python/setproctitle[${PYTHON_USEDEP}]
-       || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-               (
-               >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-               >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+RDEPEND="
+       $(python_gen_cond_dep '
+               <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+               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}]
+                       )
                )
-       )
-       geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-       gtk? (
-               sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-               dev-python/pygobject:2[${PYTHON_USEDEP}]
-               >=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-               gnome-base/librsvg
-               libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-       )
-       webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+               geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+               gtk? (
+                       sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+                       dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+                       gnome-base/librsvg
+                       libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+               )
+               webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+       ')"
 
 python_prepare_all() {
        local args=(

diff --git a/net-p2p/deluge/deluge-1.3.15-r4.ebuild b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
similarity index 78%
rename from net-p2p/deluge/deluge-1.3.15-r4.ebuild
rename to net-p2p/deluge/deluge-1.3.15-r7.ebuild
index d938267bcd807164a7461ec906263a83f537bab0..13817ba74ca242da34413a83e894a2b6f9096a4d 100644 (file)
--- a/net-p2p/deluge/deluge-1.3.15-r4.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -32,31 +32,36 @@ PATCHES=(
        "${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-       dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+       $(python_gen_cond_dep '
+               <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+       ')
        dev-util/intltool
        acct-group/deluge
        acct-user/deluge"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-       dev-python/chardet[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
-       dev-python/pyxdg[${PYTHON_USEDEP}]
-       dev-python/setproctitle[${PYTHON_USEDEP}]
-       || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-               (
-               >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-               >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+RDEPEND="
+       $(python_gen_cond_dep '
+               <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+               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}]
+                       )
                )
-       )
-       geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-       gtk? (
-               sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-               dev-python/pygobject:2[${PYTHON_USEDEP}]
-               >=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-               gnome-base/librsvg
-               libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-       )
-       webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+               geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+               gtk? (
+                       sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+                       dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+                       gnome-base/librsvg
+                       libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+               )
+               webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+       ')"
 
 python_prepare_all() {
        local args=(

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 1be3b571988404bf89fa87abce54b245b9e4b702..af10c260e9f35cdff0f67218f46091b1ed7e0c86 100644 (file)
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,31 +33,36 @@ PATCHES=(
        "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-       dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+       $(python_gen_cond_dep '
+               <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+       ')
        dev-util/intltool
        acct-group/deluge
        acct-user/deluge"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-       dev-python/chardet[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
-       dev-python/pyxdg[${PYTHON_USEDEP}]
-       dev-python/setproctitle[${PYTHON_USEDEP}]
-       || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-               (
-               >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-               >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+RDEPEND="
+       $(python_gen_cond_dep '
+               <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+               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}]
+                       )
                )
-       )
-       geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-       gtk? (
-               sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-               dev-python/pygobject:2[${PYTHON_USEDEP}]
-               >=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-               gnome-base/librsvg
-               libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-       )
-       webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+               geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+               gtk? (
+                       sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+                       dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+                       gnome-base/librsvg
+                       libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+               )
+               webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+       ')"
 
 python_prepare_all() {
        local args=(

diff --git a/net-p2p/deluge/deluge-2.0.3-r2.ebuild b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
similarity index 77%
rename from net-p2p/deluge/deluge-2.0.3-r2.ebuild
rename to net-p2p/deluge/deluge-2.0.3-r4.ebuild
index f3c58d701a9ecf228db0eb1117c9b7f32c1d48bb..cf9714d16182b981f34c7952539f361c2f41eff9 100644 (file)
--- a/net-p2p/deluge/deluge-2.0.3-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
        sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-       dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+       $(python_gen_cond_dep '
+               net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-util/intltool
-       dev-python/wheel[${PYTHON_USEDEP}]
        acct-group/deluge
        acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-       dev-python/distro[${PYTHON_USEDEP}]
-       dev-python/pillow[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
-       dev-python/pyxdg[${PYTHON_USEDEP}]
-       dev-python/rencode[${PYTHON_USEDEP}]
-       dev-python/setproctitle[${PYTHON_USEDEP}]
-       dev-python/six[${PYTHON_USEDEP}]
-       >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-       >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-       geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-       gtk? (
-               sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-               dev-python/pygobject:3[${PYTHON_USEDEP}]
-               gnome-base/librsvg
-               libnotify? ( x11-libs/libnotify )
-       )
-       net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-       dev-python/mako[${PYTHON_USEDEP}]"
+RDEPEND="
+       $(python_gen_cond_dep '
+               dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+               dev-python/distro[${PYTHON_MULTI_USEDEP}]
+               dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+               dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+               dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+               dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+               dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+               dev-python/six[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+               >=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+               geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+               gtk? (
+                       sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+                       dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+                       gnome-base/librsvg
+                       libnotify? ( x11-libs/libnotify )
+               )
+               net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/mako[${PYTHON_MULTI_USEDEP}]
+       ')"
 
 PATCHES=(
        "${FILESDIR}/${PN}-2.0.3-setup.py.patch"

diff --git a/net-p2p/deluge/deluge-2.0.3-r3.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
similarity index 77%
rename from net-p2p/deluge/deluge-2.0.3-r3.ebuild
rename to net-p2p/deluge/deluge-2.0.3-r5.ebuild
index 8b3cbf5b4f976fe5c28387d1c29213b401e2c594..3cdc92e94de459b42802851f2efd323ad1fa502d 100644 (file)
--- a/net-p2p/deluge/deluge-2.0.3-r3.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
        sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-       dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+       $(python_gen_cond_dep '
+               net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-util/intltool
-       dev-python/wheel[${PYTHON_USEDEP}]
        acct-group/deluge
        acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-       dev-python/distro[${PYTHON_USEDEP}]
-       dev-python/pillow[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
-       dev-python/pyxdg[${PYTHON_USEDEP}]
-       dev-python/rencode[${PYTHON_USEDEP}]
-       dev-python/setproctitle[${PYTHON_USEDEP}]
-       dev-python/six[${PYTHON_USEDEP}]
-       >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-       >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-       geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-       gtk? (
-               sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-               dev-python/pygobject:3[${PYTHON_USEDEP}]
-               gnome-base/librsvg
-               libnotify? ( x11-libs/libnotify )
-       )
-       net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-       dev-python/mako[${PYTHON_USEDEP}]"
+RDEPEND="
+       $(python_gen_cond_dep '
+               dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+               dev-python/distro[${PYTHON_MULTI_USEDEP}]
+               dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+               dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+               dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+               dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+               dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+               dev-python/six[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+               >=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+               geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+               gtk? (
+                       sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+                       dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+                       gnome-base/librsvg
+                       libnotify? ( x11-libs/libnotify )
+               )
+               net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/mako[${PYTHON_MULTI_USEDEP}]
+       ')"
 
 PATCHES=(
        "${FILESDIR}/${PN}-2.0.3-setup.py.patch"

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index d1806e7558e90716d060ac80571ccd8b75d0d67c..9bf5ba2d72ba3c3c828b123a76159d15fc5de20c 100644 (file)
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
        sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-       dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+       $(python_gen_cond_dep '
+               net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-util/intltool
-       dev-python/wheel[${PYTHON_USEDEP}]
        acct-group/deluge
        acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-       dev-python/distro[${PYTHON_USEDEP}]
-       dev-python/pillow[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
-       dev-python/pyxdg[${PYTHON_USEDEP}]
-       dev-python/rencode[${PYTHON_USEDEP}]
-       dev-python/setproctitle[${PYTHON_USEDEP}]
-       dev-python/six[${PYTHON_USEDEP}]
-       >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-       >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-       geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-       gtk? (
-               sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-               dev-python/pygobject:3[${PYTHON_USEDEP}]
-               gnome-base/librsvg
-               libnotify? ( x11-libs/libnotify )
-       )
-       net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-       dev-python/mako[${PYTHON_USEDEP}]"
+RDEPEND="
+       $(python_gen_cond_dep '
+               dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+               dev-python/distro[${PYTHON_MULTI_USEDEP}]
+               dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+               dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+               dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+               dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+               dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+               dev-python/six[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+               >=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+               geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+               gtk? (
+                       sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+                       dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+                       gnome-base/librsvg
+                       libnotify? ( x11-libs/libnotify )
+               )
+               net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/mako[${PYTHON_MULTI_USEDEP}]
+       ')"
 
 PATCHES=(
        "${FILESDIR}/${PN}-2.0.3-setup.py.patch"