From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1324446-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3A157158013
for <garchives@archives.gentoo.org>; Sun, 26 Sep 2021 04:14:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 488A1E0964;
Sun, 26 Sep 2021 04:14:07 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 01F8CE0964
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Sep 2021 04:14:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D61BA342FA6
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Sep 2021 04:14:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3DD4710D
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Sep 2021 04:14:04 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1632629501.a5f55999753d6961ace6af45a1962ce62ea71da1.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-p2p/deluge/deluge-2.0.3-r10.ebuild net-p2p/deluge/deluge-9999.ebuild
X-VCS-Directories: net-p2p/deluge/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: a5f55999753d6961ace6af45a1962ce62ea71da1
X-VCS-Branch: master
Date: Sun, 26 Sep 2021 04:14:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f00233e1-6a9d-4422-b9c8-91ee273fff57
X-Archives-Hash: b923079a4ce94e8444b7645419c618d5
commit: a5f55999753d6961ace6af45a1962ce62ea71da1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 26 03:43:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 26 04:11:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f55999
net-p2p/deluge: depend on older libtorrent-rasterbar
Deluge can't find libtorrent-rasterbar 2.x and isn't compatible
with it.
(For future, >= libtorrent-rasterbar 2 is now using python-single-r1
(in ~arch, anyway) and we need to therefore use the correct dependency
string, given it doesn't have PYTHON_TARGETS_* anymore, but instead PYTHON_SINGLE_TARGET.)
Reported on the forums at: https://forums.gentoo.org/viewtopic-t-1142958.html
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../deluge/{deluge-9999.ebuild => deluge-2.0.3-r10.ebuild} | 7 +++++--
net-p2p/deluge/deluge-9999.ebuild | 11 ++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
similarity index 92%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.0.3-r10.ebuild
index 0d7b3a317c0..be0397a7f78 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
@@ -27,9 +27,12 @@ REQUIRED_USE="
sound? ( gtk )
"
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
+# instead. It doesn't seem like Deluge supports >= 2 right now.
DEPEND="
$(python_gen_cond_dep '
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+ <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
')
dev-util/intltool
@@ -47,6 +50,7 @@ RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+ <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
gtk? (
sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
@@ -54,7 +58,6 @@ RDEPEND="
gnome-base/librsvg
libnotify? ( x11-libs/libnotify )
)
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}]
')"
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 0d7b3a317c0..af6de067f70 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
PYTHON_COMPAT=( python3_{8,9} )
DISTUTILS_SINGLE_IMPL=1
-inherit xdg distutils-r1 systemd
+inherit distutils-r1 systemd
DESCRIPTION="BitTorrent client with a client/server model"
HOMEPAGE="https://deluge-torrent.org/"
@@ -27,9 +27,12 @@ REQUIRED_USE="
sound? ( gtk )
"
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
+# instead. It doesn't seem like Deluge supports >= 2 right now.
DEPEND="
$(python_gen_cond_dep '
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+ <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
')
dev-util/intltool
@@ -47,6 +50,7 @@ RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+ <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
gtk? (
sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
@@ -54,7 +58,6 @@ RDEPEND="
gnome-base/librsvg
libnotify? ( x11-libs/libnotify )
)
- net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}]
')"
@@ -123,8 +126,6 @@ python_install_all() {
}
pkg_postinst() {
- xdg_pkg_postinst
-
elog
elog "If, after upgrading, deluge doesn't work, please remove the"
elog "'~/.config/deluge' directory and try again, but make a backup"