commit: 1da7b6b2c619ce5403c3a769acaab91a7ef3f58a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 11 01:15:06 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 11 01:16:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da7b6b2
net-p2p/deluge: use PYTHON_SINGLE_USEDEP for libtorrent-rasterbar Finally had to convert older versions (1.2.x) of libtorrent-rasterbar to python-single-r1 so fixing the dependency here too. Bug: https://bugs.gentoo.org/828676 Signed-off-by: Sam James <sam <AT> gentoo.org> net-p2p/deluge/{deluge-9999.ebuild => deluge-2.0.3-r11.ebuild} | 7 ++----- net-p2p/deluge/deluge-9999.ebuild | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r11.ebuild similarity index 92% copy from net-p2p/deluge/deluge-9999.ebuild copy to net-p2p/deluge/deluge-2.0.3-r11.ebuild index be0397a7f781..e244b9e1a44c 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-2.0.3-r11.ebuild @@ -27,18 +27,16 @@ 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=" + <net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' - <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] ') dev-util/intltool acct-group/deluge acct-user/deluge" RDEPEND=" + <net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' dev-python/chardet[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] @@ -50,7 +48,6 @@ 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}] ) diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index be0397a7f781..e244b9e1a44c 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -27,18 +27,16 @@ 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=" + <net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' - <net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] ') dev-util/intltool acct-group/deluge acct-user/deluge" RDEPEND=" + <net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' dev-python/chardet[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] @@ -50,7 +48,6 @@ 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}] )
