commit: dd83699d620548c1e6fe2cd14cd5f51058b1dac5 Author: PPed72 <paolo.pedroni <AT> iol <DOT> it> AuthorDate: Wed Jan 23 10:58:20 2019 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Thu Jan 24 23:22:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd83699d
net-p2p/deluge: restrict libtorrent-rasterbar dependency net-libs/libtorrent-rasterbar-1.2 removed several deprecated functions needed by net-p2p deluge. We thus restrict the dependency to be <net-libs/libtorrent-rasterbar-1.2 Also a few cleanups already discussed for deluge-9999 Closes: https://bugs.gentoo.org/676056 Signed-off-by: Paolo Pedroni <paolo.pedroni <AT> iol.it> Package-Manager: Portage-2.3.51, Repoman-2.3.11 Closes: https://github.com/gentoo/gentoo/pull/10892 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> ...uge-1.3.9999.ebuild => deluge-1.3.15-r3.ebuild} | 23 +++++++--------------- net-p2p/deluge/deluge-1.3.9999.ebuild | 19 +++++------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.15-r3.ebuild similarity index 85% copy from net-p2p/deluge/deluge-1.3.9999.ebuild copy to net-p2p/deluge/deluge-1.3.15-r3.ebuild index a32833a4f9f..2245028f990 100644 --- a/net-p2p/deluge/deluge-1.3.9999.ebuild +++ b/net-p2p/deluge/deluge-1.3.15-r3.ebuild @@ -1,21 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PYTHON_COMPAT=( python2_7 ) DISTUTILS_SINGLE_IMPL=1 -PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW" -inherit distutils-r1 eutils systemd user l10n +inherit distutils-r1 systemd user DESCRIPTION="BitTorrent client with a client/server model" HOMEPAGE="https://deluge-torrent.org/"; -if [[ ${PV} == 1.3.9999 ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git http://git.deluge-torrent.org/${PN}"; - EGIT_BRANCH="1.3-stable" SRC_URI="" else SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"; @@ -32,13 +30,13 @@ REQUIRED_USE=" " PATCHES=( "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch" + "${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch" ) -CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]" -DEPEND="${CDEPEND} +DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-util/intltool" -RDEPEND="${CDEPEND} +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}] @@ -71,13 +69,6 @@ python_prepare_all() { ) sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die - local loc_dir="${S}/deluge/i18n" - l10n_find_plocales_changes "${loc_dir}" "" ".po" - rm_loc() { - rm -vf "${loc_dir}/${1}.po" || die - } - l10n_for_each_disabled_locale_do rm_loc - distutils-r1_python_prepare_all } diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild index a32833a4f9f..5abf8ffb3d0 100644 --- a/net-p2p/deluge/deluge-1.3.9999.ebuild +++ b/net-p2p/deluge/deluge-1.3.9999.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PYTHON_COMPAT=( python2_7 ) DISTUTILS_SINGLE_IMPL=1 -PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW" -inherit distutils-r1 eutils systemd user l10n +inherit distutils-r1 systemd user DESCRIPTION="BitTorrent client with a client/server model" HOMEPAGE="https://deluge-torrent.org/"; @@ -34,11 +33,10 @@ PATCHES=( "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch" ) -CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]" -DEPEND="${CDEPEND} +DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-util/intltool" -RDEPEND="${CDEPEND} +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}] @@ -71,13 +69,6 @@ python_prepare_all() { ) sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die - local loc_dir="${S}/deluge/i18n" - l10n_find_plocales_changes "${loc_dir}" "" ".po" - rm_loc() { - rm -vf "${loc_dir}/${1}.po" || die - } - l10n_for_each_disabled_locale_do rm_loc - distutils-r1_python_prepare_all }
