commit: a2896777300cd3a3b7b68c248bd4a5756fb6ca55 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Wed Jul 1 13:57:18 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Wed Jul 1 13:58:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2896777
net-p2p/deluge: Fix "cannot remove deluge-console" Closes: https://bugs.gentoo.org/730196 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../{deluge-9999.ebuild => deluge-2.0.3-r7.ebuild} | 19 ++++++++++--------- net-p2p/deluge/deluge-9999.ebuild | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r7.ebuild similarity index 89% copy from net-p2p/deluge/deluge-9999.ebuild copy to net-p2p/deluge/deluge-2.0.3-r7.ebuild index 121cab58004..2caebb8c9d1 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-2.0.3-r7.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}" else SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~sparc ~x86" fi LICENSE="GPL-2" @@ -61,6 +61,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-2.0.3-setup.py.patch" "${FILESDIR}/${PN}-2.0.3-UI-status.patch" + "${FILESDIR}/${PN}-2.0.3-gettext.patch" ) python_prepare_all() { @@ -91,15 +92,15 @@ python_install_all() { distutils-r1_python_install_all if ! use console ; then rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die - rm "${D}/usr/bin/deluge-console" || die - rm "${D}/usr/share/man/man1/deluge-console.1" ||die + rm "${ED}/usr/bin/deluge-console" || die + rm "${ED}/usr/share/man/man1/deluge-console.1" ||die fi if ! use gtk ; then rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die - rm -r "${D}/usr/share/icons/" || die - rm "${D}/usr/bin/deluge-gtk" || die - rm "${D}/usr/share/man/man1/deluge-gtk.1" || die - rm "${D}/usr/share/applications/deluge.desktop" || die + rm -r "${ED}/usr/share/icons/" || die + rm "${ED}/usr/bin/deluge-gtk" || die + rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die + rm "${ED}/usr/share/applications/deluge.desktop" || die fi if use webinterface; then newinitd "${FILESDIR}/deluge-web.init-2" deluge-web @@ -108,8 +109,8 @@ python_install_all() { systemd_install_serviced "${FILESDIR}/deluge-web.service.conf" else rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die - rm "${D}/usr/bin/deluge-web" || die - rm "${D}/usr/share/man/man1/deluge-web.1" || die + rm "${ED}/usr/bin/deluge-web" || die + rm "${ED}/usr/share/man/man1/deluge-web.1" || die fi newinitd "${FILESDIR}"/deluged.init-2 deluged newconfd "${FILESDIR}"/deluged.conf-2 deluged diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index 121cab58004..2caebb8c9d1 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}" else SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~sparc ~x86" fi LICENSE="GPL-2" @@ -61,6 +61,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-2.0.3-setup.py.patch" "${FILESDIR}/${PN}-2.0.3-UI-status.patch" + "${FILESDIR}/${PN}-2.0.3-gettext.patch" ) python_prepare_all() { @@ -91,15 +92,15 @@ python_install_all() { distutils-r1_python_install_all if ! use console ; then rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die - rm "${D}/usr/bin/deluge-console" || die - rm "${D}/usr/share/man/man1/deluge-console.1" ||die + rm "${ED}/usr/bin/deluge-console" || die + rm "${ED}/usr/share/man/man1/deluge-console.1" ||die fi if ! use gtk ; then rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die - rm -r "${D}/usr/share/icons/" || die - rm "${D}/usr/bin/deluge-gtk" || die - rm "${D}/usr/share/man/man1/deluge-gtk.1" || die - rm "${D}/usr/share/applications/deluge.desktop" || die + rm -r "${ED}/usr/share/icons/" || die + rm "${ED}/usr/bin/deluge-gtk" || die + rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die + rm "${ED}/usr/share/applications/deluge.desktop" || die fi if use webinterface; then newinitd "${FILESDIR}/deluge-web.init-2" deluge-web @@ -108,8 +109,8 @@ python_install_all() { systemd_install_serviced "${FILESDIR}/deluge-web.service.conf" else rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die - rm "${D}/usr/bin/deluge-web" || die - rm "${D}/usr/share/man/man1/deluge-web.1" || die + rm "${ED}/usr/bin/deluge-web" || die + rm "${ED}/usr/share/man/man1/deluge-web.1" || die fi newinitd "${FILESDIR}"/deluged.init-2 deluged newconfd "${FILESDIR}"/deluged.conf-2 deluged