| 1 |
commit: 7f5848e0a74dcdf5125e2c752d602d495fcdcbd9 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 06:55:43 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:46:44 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5848e0 |
| 7 |
|
| 8 |
net-p2p/deluge: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
...ge-1.3.15-r2.ebuild => deluge-1.3.15-r5.ebuild} | 46 ++++++++++---------- |
| 13 |
...ge-1.3.15-r3.ebuild => deluge-1.3.15-r6.ebuild} | 49 ++++++++++++---------- |
| 14 |
...ge-1.3.15-r4.ebuild => deluge-1.3.15-r7.ebuild} | 49 ++++++++++++---------- |
| 15 |
net-p2p/deluge/deluge-1.3.9999.ebuild | 49 ++++++++++++---------- |
| 16 |
...luge-2.0.3-r2.ebuild => deluge-2.0.3-r4.ebuild} | 49 ++++++++++++---------- |
| 17 |
...luge-2.0.3-r3.ebuild => deluge-2.0.3-r5.ebuild} | 49 ++++++++++++---------- |
| 18 |
net-p2p/deluge/deluge-9999.ebuild | 49 ++++++++++++---------- |
| 19 |
7 files changed, 187 insertions(+), 153 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-p2p/deluge/deluge-1.3.15-r2.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild |
| 22 |
similarity index 81% |
| 23 |
rename from net-p2p/deluge/deluge-1.3.15-r2.ebuild |
| 24 |
rename to net-p2p/deluge/deluge-1.3.15-r5.ebuild |
| 25 |
index f49c58d5c41..61514eb8e1d 100644 |
| 26 |
--- a/net-p2p/deluge/deluge-1.3.15-r2.ebuild |
| 27 |
+++ b/net-p2p/deluge/deluge-1.3.15-r5.ebuild |
| 28 |
@@ -1,4 +1,4 @@ |
| 29 |
-# Copyright 1999-2018 Gentoo Foundation |
| 30 |
+# Copyright 1999-2020 Gentoo Authors |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
|
| 33 |
EAPI="6" |
| 34 |
@@ -34,30 +34,34 @@ PATCHES=( |
| 35 |
"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch" |
| 36 |
) |
| 37 |
|
| 38 |
-CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]" |
| 39 |
+CDEPEND=" |
| 40 |
+ $(python_gen_cond_dep ' |
| 41 |
+ net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}] |
| 42 |
+ ')" |
| 43 |
DEPEND="${CDEPEND} |
| 44 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 45 |
dev-util/intltool" |
| 46 |
RDEPEND="${CDEPEND} |
| 47 |
- dev-python/chardet[${PYTHON_USEDEP}] |
| 48 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 49 |
- dev-python/pyxdg[${PYTHON_USEDEP}] |
| 50 |
- dev-python/setproctitle[${PYTHON_USEDEP}] |
| 51 |
- || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 52 |
- ( |
| 53 |
- >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}] |
| 54 |
- >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}] |
| 55 |
+ $(python_gen_cond_dep ' |
| 56 |
+ dev-python/chardet[${PYTHON_MULTI_USEDEP}] |
| 57 |
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] |
| 58 |
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] |
| 59 |
+ dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] |
| 60 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] |
| 61 |
+ ( |
| 62 |
+ >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}] |
| 63 |
+ >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}] |
| 64 |
+ ) |
| 65 |
) |
| 66 |
- ) |
| 67 |
- geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) |
| 68 |
- gtk? ( |
| 69 |
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
| 70 |
- dev-python/pygobject:2[${PYTHON_USEDEP}] |
| 71 |
- >=dev-python/pygtk-2.12[${PYTHON_USEDEP}] |
| 72 |
- gnome-base/librsvg |
| 73 |
- libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] ) |
| 74 |
- ) |
| 75 |
- webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )" |
| 76 |
+ geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) |
| 77 |
+ gtk? ( |
| 78 |
+ sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) |
| 79 |
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] |
| 80 |
+ >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}] |
| 81 |
+ gnome-base/librsvg |
| 82 |
+ libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] ) |
| 83 |
+ ) |
| 84 |
+ webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] ) |
| 85 |
+ ')" |
| 86 |
|
| 87 |
python_prepare_all() { |
| 88 |
local args=( |
| 89 |
|
| 90 |
diff --git a/net-p2p/deluge/deluge-1.3.15-r3.ebuild b/net-p2p/deluge/deluge-1.3.15-r6.ebuild |
| 91 |
similarity index 78% |
| 92 |
rename from net-p2p/deluge/deluge-1.3.15-r3.ebuild |
| 93 |
rename to net-p2p/deluge/deluge-1.3.15-r6.ebuild |
| 94 |
index d3ef7813a7a..f044210962a 100644 |
| 95 |
--- a/net-p2p/deluge/deluge-1.3.15-r3.ebuild |
| 96 |
+++ b/net-p2p/deluge/deluge-1.3.15-r6.ebuild |
| 97 |
@@ -1,4 +1,4 @@ |
| 98 |
-# Copyright 1999-2019 Gentoo Authors |
| 99 |
+# Copyright 1999-2020 Gentoo Authors |
| 100 |
# Distributed under the terms of the GNU General Public License v2 |
| 101 |
|
| 102 |
EAPI="7" |
| 103 |
@@ -33,29 +33,34 @@ PATCHES=( |
| 104 |
"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch" |
| 105 |
) |
| 106 |
|
| 107 |
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}] |
| 108 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 109 |
+DEPEND=" |
| 110 |
+ $(python_gen_cond_dep ' |
| 111 |
+ <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}] |
| 112 |
+ ') |
| 113 |
dev-util/intltool" |
| 114 |
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}] |
| 115 |
- dev-python/chardet[${PYTHON_USEDEP}] |
| 116 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 117 |
- dev-python/pyxdg[${PYTHON_USEDEP}] |
| 118 |
- dev-python/setproctitle[${PYTHON_USEDEP}] |
| 119 |
- || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 120 |
- ( |
| 121 |
- >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}] |
| 122 |
- >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}] |
| 123 |
+RDEPEND=" |
| 124 |
+ $(python_gen_cond_dep ' |
| 125 |
+ <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}] |
| 126 |
+ dev-python/chardet[${PYTHON_MULTI_USEDEP}] |
| 127 |
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] |
| 128 |
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] |
| 129 |
+ dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] |
| 130 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] |
| 131 |
+ ( |
| 132 |
+ >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}] |
| 133 |
+ >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}] |
| 134 |
+ ) |
| 135 |
) |
| 136 |
- ) |
| 137 |
- geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) |
| 138 |
- gtk? ( |
| 139 |
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
| 140 |
- dev-python/pygobject:2[${PYTHON_USEDEP}] |
| 141 |
- >=dev-python/pygtk-2.12[${PYTHON_USEDEP}] |
| 142 |
- gnome-base/librsvg |
| 143 |
- libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] ) |
| 144 |
- ) |
| 145 |
- webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )" |
| 146 |
+ geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) |
| 147 |
+ gtk? ( |
| 148 |
+ sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) |
| 149 |
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] |
| 150 |
+ >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}] |
| 151 |
+ gnome-base/librsvg |
| 152 |
+ libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] ) |
| 153 |
+ ) |
| 154 |
+ webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] ) |
| 155 |
+ ')" |
| 156 |
|
| 157 |
python_prepare_all() { |
| 158 |
local args=( |
| 159 |
|
| 160 |
diff --git a/net-p2p/deluge/deluge-1.3.15-r4.ebuild b/net-p2p/deluge/deluge-1.3.15-r7.ebuild |
| 161 |
similarity index 78% |
| 162 |
rename from net-p2p/deluge/deluge-1.3.15-r4.ebuild |
| 163 |
rename to net-p2p/deluge/deluge-1.3.15-r7.ebuild |
| 164 |
index d938267bcd8..13817ba74ca 100644 |
| 165 |
--- a/net-p2p/deluge/deluge-1.3.15-r4.ebuild |
| 166 |
+++ b/net-p2p/deluge/deluge-1.3.15-r7.ebuild |
| 167 |
@@ -1,4 +1,4 @@ |
| 168 |
-# Copyright 1999-2019 Gentoo Authors |
| 169 |
+# Copyright 1999-2020 Gentoo Authors |
| 170 |
# Distributed under the terms of the GNU General Public License v2 |
| 171 |
|
| 172 |
EAPI="7" |
| 173 |
@@ -32,31 +32,36 @@ PATCHES=( |
| 174 |
"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch" |
| 175 |
) |
| 176 |
|
| 177 |
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}] |
| 178 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 179 |
+DEPEND=" |
| 180 |
+ $(python_gen_cond_dep ' |
| 181 |
+ <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}] |
| 182 |
+ ') |
| 183 |
dev-util/intltool |
| 184 |
acct-group/deluge |
| 185 |
acct-user/deluge" |
| 186 |
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}] |
| 187 |
- dev-python/chardet[${PYTHON_USEDEP}] |
| 188 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 189 |
- dev-python/pyxdg[${PYTHON_USEDEP}] |
| 190 |
- dev-python/setproctitle[${PYTHON_USEDEP}] |
| 191 |
- || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 192 |
- ( |
| 193 |
- >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}] |
| 194 |
- >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}] |
| 195 |
+RDEPEND=" |
| 196 |
+ $(python_gen_cond_dep ' |
| 197 |
+ <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}] |
| 198 |
+ dev-python/chardet[${PYTHON_MULTI_USEDEP}] |
| 199 |
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] |
| 200 |
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] |
| 201 |
+ dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] |
| 202 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] |
| 203 |
+ ( |
| 204 |
+ >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}] |
| 205 |
+ >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}] |
| 206 |
+ ) |
| 207 |
) |
| 208 |
- ) |
| 209 |
- geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) |
| 210 |
- gtk? ( |
| 211 |
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
| 212 |
- dev-python/pygobject:2[${PYTHON_USEDEP}] |
| 213 |
- >=dev-python/pygtk-2.12[${PYTHON_USEDEP}] |
| 214 |
- gnome-base/librsvg |
| 215 |
- libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] ) |
| 216 |
- ) |
| 217 |
- webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )" |
| 218 |
+ geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) |
| 219 |
+ gtk? ( |
| 220 |
+ sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) |
| 221 |
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] |
| 222 |
+ >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}] |
| 223 |
+ gnome-base/librsvg |
| 224 |
+ libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] ) |
| 225 |
+ ) |
| 226 |
+ webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] ) |
| 227 |
+ ')" |
| 228 |
|
| 229 |
python_prepare_all() { |
| 230 |
local args=( |
| 231 |
|
| 232 |
diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild |
| 233 |
index 1be3b571988..af10c260e9f 100644 |
| 234 |
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild |
| 235 |
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild |
| 236 |
@@ -1,4 +1,4 @@ |
| 237 |
-# Copyright 1999-2019 Gentoo Authors |
| 238 |
+# Copyright 1999-2020 Gentoo Authors |
| 239 |
# Distributed under the terms of the GNU General Public License v2 |
| 240 |
|
| 241 |
EAPI="7" |
| 242 |
@@ -33,31 +33,36 @@ PATCHES=( |
| 243 |
"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch" |
| 244 |
) |
| 245 |
|
| 246 |
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}] |
| 247 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 248 |
+DEPEND=" |
| 249 |
+ $(python_gen_cond_dep ' |
| 250 |
+ <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}] |
| 251 |
+ ') |
| 252 |
dev-util/intltool |
| 253 |
acct-group/deluge |
| 254 |
acct-user/deluge" |
| 255 |
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}] |
| 256 |
- dev-python/chardet[${PYTHON_USEDEP}] |
| 257 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 258 |
- dev-python/pyxdg[${PYTHON_USEDEP}] |
| 259 |
- dev-python/setproctitle[${PYTHON_USEDEP}] |
| 260 |
- || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 261 |
- ( |
| 262 |
- >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}] |
| 263 |
- >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}] |
| 264 |
+RDEPEND=" |
| 265 |
+ $(python_gen_cond_dep ' |
| 266 |
+ <net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}] |
| 267 |
+ dev-python/chardet[${PYTHON_MULTI_USEDEP}] |
| 268 |
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] |
| 269 |
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] |
| 270 |
+ dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] |
| 271 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}] |
| 272 |
+ ( |
| 273 |
+ >=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}] |
| 274 |
+ >=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}] |
| 275 |
+ ) |
| 276 |
) |
| 277 |
- ) |
| 278 |
- geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) |
| 279 |
- gtk? ( |
| 280 |
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
| 281 |
- dev-python/pygobject:2[${PYTHON_USEDEP}] |
| 282 |
- >=dev-python/pygtk-2.12[${PYTHON_USEDEP}] |
| 283 |
- gnome-base/librsvg |
| 284 |
- libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] ) |
| 285 |
- ) |
| 286 |
- webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )" |
| 287 |
+ geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) |
| 288 |
+ gtk? ( |
| 289 |
+ sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) |
| 290 |
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] |
| 291 |
+ >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}] |
| 292 |
+ gnome-base/librsvg |
| 293 |
+ libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] ) |
| 294 |
+ ) |
| 295 |
+ webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] ) |
| 296 |
+ ')" |
| 297 |
|
| 298 |
python_prepare_all() { |
| 299 |
local args=( |
| 300 |
|
| 301 |
diff --git a/net-p2p/deluge/deluge-2.0.3-r2.ebuild b/net-p2p/deluge/deluge-2.0.3-r4.ebuild |
| 302 |
similarity index 77% |
| 303 |
rename from net-p2p/deluge/deluge-2.0.3-r2.ebuild |
| 304 |
rename to net-p2p/deluge/deluge-2.0.3-r4.ebuild |
| 305 |
index f3c58d701a9..cf9714d1618 100644 |
| 306 |
--- a/net-p2p/deluge/deluge-2.0.3-r2.ebuild |
| 307 |
+++ b/net-p2p/deluge/deluge-2.0.3-r4.ebuild |
| 308 |
@@ -27,31 +27,36 @@ REQUIRED_USE=" |
| 309 |
sound? ( gtk ) |
| 310 |
" |
| 311 |
|
| 312 |
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 313 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 314 |
+DEPEND=" |
| 315 |
+ $(python_gen_cond_dep ' |
| 316 |
+ net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}] |
| 317 |
+ dev-python/wheel[${PYTHON_MULTI_USEDEP}] |
| 318 |
+ ') |
| 319 |
dev-util/intltool |
| 320 |
- dev-python/wheel[${PYTHON_USEDEP}] |
| 321 |
acct-group/deluge |
| 322 |
acct-user/deluge" |
| 323 |
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}] |
| 324 |
- dev-python/distro[${PYTHON_USEDEP}] |
| 325 |
- dev-python/pillow[${PYTHON_USEDEP}] |
| 326 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 327 |
- dev-python/pyxdg[${PYTHON_USEDEP}] |
| 328 |
- dev-python/rencode[${PYTHON_USEDEP}] |
| 329 |
- dev-python/setproctitle[${PYTHON_USEDEP}] |
| 330 |
- dev-python/six[${PYTHON_USEDEP}] |
| 331 |
- >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}] |
| 332 |
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
| 333 |
- geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) |
| 334 |
- gtk? ( |
| 335 |
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
| 336 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
| 337 |
- gnome-base/librsvg |
| 338 |
- libnotify? ( x11-libs/libnotify ) |
| 339 |
- ) |
| 340 |
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 341 |
- dev-python/mako[${PYTHON_USEDEP}]" |
| 342 |
+RDEPEND=" |
| 343 |
+ $(python_gen_cond_dep ' |
| 344 |
+ dev-python/chardet[${PYTHON_MULTI_USEDEP}] |
| 345 |
+ dev-python/distro[${PYTHON_MULTI_USEDEP}] |
| 346 |
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}] |
| 347 |
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] |
| 348 |
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] |
| 349 |
+ dev-python/rencode[${PYTHON_MULTI_USEDEP}] |
| 350 |
+ dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] |
| 351 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
| 352 |
+ >=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}] |
| 353 |
+ >=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}] |
| 354 |
+ geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) |
| 355 |
+ gtk? ( |
| 356 |
+ sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) |
| 357 |
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] |
| 358 |
+ gnome-base/librsvg |
| 359 |
+ libnotify? ( x11-libs/libnotify ) |
| 360 |
+ ) |
| 361 |
+ net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}] |
| 362 |
+ dev-python/mako[${PYTHON_MULTI_USEDEP}] |
| 363 |
+ ')" |
| 364 |
|
| 365 |
PATCHES=( |
| 366 |
"${FILESDIR}/${PN}-2.0.3-setup.py.patch" |
| 367 |
|
| 368 |
diff --git a/net-p2p/deluge/deluge-2.0.3-r3.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild |
| 369 |
similarity index 77% |
| 370 |
rename from net-p2p/deluge/deluge-2.0.3-r3.ebuild |
| 371 |
rename to net-p2p/deluge/deluge-2.0.3-r5.ebuild |
| 372 |
index 8b3cbf5b4f9..3cdc92e94de 100644 |
| 373 |
--- a/net-p2p/deluge/deluge-2.0.3-r3.ebuild |
| 374 |
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild |
| 375 |
@@ -27,31 +27,36 @@ REQUIRED_USE=" |
| 376 |
sound? ( gtk ) |
| 377 |
" |
| 378 |
|
| 379 |
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 380 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 381 |
+DEPEND=" |
| 382 |
+ $(python_gen_cond_dep ' |
| 383 |
+ net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}] |
| 384 |
+ dev-python/wheel[${PYTHON_MULTI_USEDEP}] |
| 385 |
+ ') |
| 386 |
dev-util/intltool |
| 387 |
- dev-python/wheel[${PYTHON_USEDEP}] |
| 388 |
acct-group/deluge |
| 389 |
acct-user/deluge" |
| 390 |
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}] |
| 391 |
- dev-python/distro[${PYTHON_USEDEP}] |
| 392 |
- dev-python/pillow[${PYTHON_USEDEP}] |
| 393 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 394 |
- dev-python/pyxdg[${PYTHON_USEDEP}] |
| 395 |
- dev-python/rencode[${PYTHON_USEDEP}] |
| 396 |
- dev-python/setproctitle[${PYTHON_USEDEP}] |
| 397 |
- dev-python/six[${PYTHON_USEDEP}] |
| 398 |
- >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}] |
| 399 |
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
| 400 |
- geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) |
| 401 |
- gtk? ( |
| 402 |
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
| 403 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
| 404 |
- gnome-base/librsvg |
| 405 |
- libnotify? ( x11-libs/libnotify ) |
| 406 |
- ) |
| 407 |
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 408 |
- dev-python/mako[${PYTHON_USEDEP}]" |
| 409 |
+RDEPEND=" |
| 410 |
+ $(python_gen_cond_dep ' |
| 411 |
+ dev-python/chardet[${PYTHON_MULTI_USEDEP}] |
| 412 |
+ dev-python/distro[${PYTHON_MULTI_USEDEP}] |
| 413 |
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}] |
| 414 |
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] |
| 415 |
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] |
| 416 |
+ dev-python/rencode[${PYTHON_MULTI_USEDEP}] |
| 417 |
+ dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] |
| 418 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
| 419 |
+ >=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}] |
| 420 |
+ >=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}] |
| 421 |
+ geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) |
| 422 |
+ gtk? ( |
| 423 |
+ sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) |
| 424 |
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] |
| 425 |
+ gnome-base/librsvg |
| 426 |
+ libnotify? ( x11-libs/libnotify ) |
| 427 |
+ ) |
| 428 |
+ net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}] |
| 429 |
+ dev-python/mako[${PYTHON_MULTI_USEDEP}] |
| 430 |
+ ')" |
| 431 |
|
| 432 |
PATCHES=( |
| 433 |
"${FILESDIR}/${PN}-2.0.3-setup.py.patch" |
| 434 |
|
| 435 |
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild |
| 436 |
index d1806e7558e..9bf5ba2d72b 100644 |
| 437 |
--- a/net-p2p/deluge/deluge-9999.ebuild |
| 438 |
+++ b/net-p2p/deluge/deluge-9999.ebuild |
| 439 |
@@ -27,31 +27,36 @@ REQUIRED_USE=" |
| 440 |
sound? ( gtk ) |
| 441 |
" |
| 442 |
|
| 443 |
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 444 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 445 |
+DEPEND=" |
| 446 |
+ $(python_gen_cond_dep ' |
| 447 |
+ net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}] |
| 448 |
+ dev-python/wheel[${PYTHON_MULTI_USEDEP}] |
| 449 |
+ ') |
| 450 |
dev-util/intltool |
| 451 |
- dev-python/wheel[${PYTHON_USEDEP}] |
| 452 |
acct-group/deluge |
| 453 |
acct-user/deluge" |
| 454 |
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}] |
| 455 |
- dev-python/distro[${PYTHON_USEDEP}] |
| 456 |
- dev-python/pillow[${PYTHON_USEDEP}] |
| 457 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 458 |
- dev-python/pyxdg[${PYTHON_USEDEP}] |
| 459 |
- dev-python/rencode[${PYTHON_USEDEP}] |
| 460 |
- dev-python/setproctitle[${PYTHON_USEDEP}] |
| 461 |
- dev-python/six[${PYTHON_USEDEP}] |
| 462 |
- >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}] |
| 463 |
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
| 464 |
- geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) |
| 465 |
- gtk? ( |
| 466 |
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
| 467 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
| 468 |
- gnome-base/librsvg |
| 469 |
- libnotify? ( x11-libs/libnotify ) |
| 470 |
- ) |
| 471 |
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 472 |
- dev-python/mako[${PYTHON_USEDEP}]" |
| 473 |
+RDEPEND=" |
| 474 |
+ $(python_gen_cond_dep ' |
| 475 |
+ dev-python/chardet[${PYTHON_MULTI_USEDEP}] |
| 476 |
+ dev-python/distro[${PYTHON_MULTI_USEDEP}] |
| 477 |
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}] |
| 478 |
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}] |
| 479 |
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] |
| 480 |
+ dev-python/rencode[${PYTHON_MULTI_USEDEP}] |
| 481 |
+ dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] |
| 482 |
+ dev-python/six[${PYTHON_MULTI_USEDEP}] |
| 483 |
+ >=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}] |
| 484 |
+ >=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}] |
| 485 |
+ geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] ) |
| 486 |
+ gtk? ( |
| 487 |
+ sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] ) |
| 488 |
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] |
| 489 |
+ gnome-base/librsvg |
| 490 |
+ libnotify? ( x11-libs/libnotify ) |
| 491 |
+ ) |
| 492 |
+ net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}] |
| 493 |
+ dev-python/mako[${PYTHON_MULTI_USEDEP}] |
| 494 |
+ ')" |
| 495 |
|
| 496 |
PATCHES=( |
| 497 |
"${FILESDIR}/${PN}-2.0.3-setup.py.patch" |
Archives