| 1 |
commit: a5f55999753d6961ace6af45a1962ce62ea71da1 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 26 03:43:16 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 26 04:11:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f55999 |
| 7 |
|
| 8 |
net-p2p/deluge: depend on older libtorrent-rasterbar |
| 9 |
|
| 10 |
Deluge can't find libtorrent-rasterbar 2.x and isn't compatible |
| 11 |
with it. |
| 12 |
|
| 13 |
(For future, >= libtorrent-rasterbar 2 is now using python-single-r1 |
| 14 |
(in ~arch, anyway) and we need to therefore use the correct dependency |
| 15 |
string, given it doesn't have PYTHON_TARGETS_* anymore, but instead PYTHON_SINGLE_TARGET.) |
| 16 |
|
| 17 |
Reported on the forums at: https://forums.gentoo.org/viewtopic-t-1142958.html |
| 18 |
|
| 19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 20 |
|
| 21 |
.../deluge/{deluge-9999.ebuild => deluge-2.0.3-r10.ebuild} | 7 +++++-- |
| 22 |
net-p2p/deluge/deluge-9999.ebuild | 11 ++++++----- |
| 23 |
2 files changed, 11 insertions(+), 7 deletions(-) |
| 24 |
|
| 25 |
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r10.ebuild |
| 26 |
similarity index 92% |
| 27 |
copy from net-p2p/deluge/deluge-9999.ebuild |
| 28 |
copy to net-p2p/deluge/deluge-2.0.3-r10.ebuild |
| 29 |
index 0d7b3a317c0..be0397a7f78 100644 |
| 30 |
--- a/net-p2p/deluge/deluge-9999.ebuild |
| 31 |
+++ b/net-p2p/deluge/deluge-2.0.3-r10.ebuild |
| 32 |
@@ -27,9 +27,12 @@ REQUIRED_USE=" |
| 33 |
sound? ( gtk ) |
| 34 |
" |
| 35 |
|
| 36 |
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please |
| 37 |
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP |
| 38 |
+# instead. It doesn't seem like Deluge supports >= 2 right now. |
| 39 |
DEPEND=" |
| 40 |
$(python_gen_cond_dep ' |
| 41 |
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 42 |
+ <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}] |
| 43 |
dev-python/wheel[${PYTHON_USEDEP}] |
| 44 |
') |
| 45 |
dev-util/intltool |
| 46 |
@@ -47,6 +50,7 @@ RDEPEND=" |
| 47 |
dev-python/six[${PYTHON_USEDEP}] |
| 48 |
>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}] |
| 49 |
>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
| 50 |
+ <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}] |
| 51 |
geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) |
| 52 |
gtk? ( |
| 53 |
sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
| 54 |
@@ -54,7 +58,6 @@ RDEPEND=" |
| 55 |
gnome-base/librsvg |
| 56 |
libnotify? ( x11-libs/libnotify ) |
| 57 |
) |
| 58 |
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 59 |
dev-python/mako[${PYTHON_USEDEP}] |
| 60 |
')" |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild |
| 64 |
index 0d7b3a317c0..af6de067f70 100644 |
| 65 |
--- a/net-p2p/deluge/deluge-9999.ebuild |
| 66 |
+++ b/net-p2p/deluge/deluge-9999.ebuild |
| 67 |
@@ -5,7 +5,7 @@ EAPI="7" |
| 68 |
|
| 69 |
PYTHON_COMPAT=( python3_{8,9} ) |
| 70 |
DISTUTILS_SINGLE_IMPL=1 |
| 71 |
-inherit xdg distutils-r1 systemd |
| 72 |
+inherit distutils-r1 systemd |
| 73 |
|
| 74 |
DESCRIPTION="BitTorrent client with a client/server model" |
| 75 |
HOMEPAGE="https://deluge-torrent.org/" |
| 76 |
@@ -27,9 +27,12 @@ REQUIRED_USE=" |
| 77 |
sound? ( gtk ) |
| 78 |
" |
| 79 |
|
| 80 |
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please |
| 81 |
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP |
| 82 |
+# instead. It doesn't seem like Deluge supports >= 2 right now. |
| 83 |
DEPEND=" |
| 84 |
$(python_gen_cond_dep ' |
| 85 |
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 86 |
+ <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}] |
| 87 |
dev-python/wheel[${PYTHON_USEDEP}] |
| 88 |
') |
| 89 |
dev-util/intltool |
| 90 |
@@ -47,6 +50,7 @@ RDEPEND=" |
| 91 |
dev-python/six[${PYTHON_USEDEP}] |
| 92 |
>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}] |
| 93 |
>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] |
| 94 |
+ <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}] |
| 95 |
geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) |
| 96 |
gtk? ( |
| 97 |
sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
| 98 |
@@ -54,7 +58,6 @@ RDEPEND=" |
| 99 |
gnome-base/librsvg |
| 100 |
libnotify? ( x11-libs/libnotify ) |
| 101 |
) |
| 102 |
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] |
| 103 |
dev-python/mako[${PYTHON_USEDEP}] |
| 104 |
')" |
| 105 |
|
| 106 |
@@ -123,8 +126,6 @@ python_install_all() { |
| 107 |
} |
| 108 |
|
| 109 |
pkg_postinst() { |
| 110 |
- xdg_pkg_postinst |
| 111 |
- |
| 112 |
elog |
| 113 |
elog "If, after upgrading, deluge doesn't work, please remove the" |
| 114 |
elog "'~/.config/deluge' directory and try again, but make a backup" |
Archives