| 1 |
commit: a2896777300cd3a3b7b68c248bd4a5756fb6ca55 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 1 13:57:18 2020 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 1 13:58:15 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2896777 |
| 7 |
|
| 8 |
net-p2p/deluge: Fix "cannot remove deluge-console" |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/730196 |
| 11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{deluge-9999.ebuild => deluge-2.0.3-r7.ebuild} | 19 ++++++++++--------- |
| 15 |
net-p2p/deluge/deluge-9999.ebuild | 19 ++++++++++--------- |
| 16 |
2 files changed, 20 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r7.ebuild |
| 19 |
similarity index 89% |
| 20 |
copy from net-p2p/deluge/deluge-9999.ebuild |
| 21 |
copy to net-p2p/deluge/deluge-2.0.3-r7.ebuild |
| 22 |
index 121cab58004..2caebb8c9d1 100644 |
| 23 |
--- a/net-p2p/deluge/deluge-9999.ebuild |
| 24 |
+++ b/net-p2p/deluge/deluge-2.0.3-r7.ebuild |
| 25 |
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then |
| 26 |
EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}" |
| 27 |
else |
| 28 |
SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz" |
| 29 |
- KEYWORDS="~amd64 ~x86" |
| 30 |
+ KEYWORDS="~amd64 ~arm ~sparc ~x86" |
| 31 |
fi |
| 32 |
|
| 33 |
LICENSE="GPL-2" |
| 34 |
@@ -61,6 +61,7 @@ RDEPEND=" |
| 35 |
PATCHES=( |
| 36 |
"${FILESDIR}/${PN}-2.0.3-setup.py.patch" |
| 37 |
"${FILESDIR}/${PN}-2.0.3-UI-status.patch" |
| 38 |
+ "${FILESDIR}/${PN}-2.0.3-gettext.patch" |
| 39 |
) |
| 40 |
|
| 41 |
python_prepare_all() { |
| 42 |
@@ -91,15 +92,15 @@ python_install_all() { |
| 43 |
distutils-r1_python_install_all |
| 44 |
if ! use console ; then |
| 45 |
rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die |
| 46 |
- rm "${D}/usr/bin/deluge-console" || die |
| 47 |
- rm "${D}/usr/share/man/man1/deluge-console.1" ||die |
| 48 |
+ rm "${ED}/usr/bin/deluge-console" || die |
| 49 |
+ rm "${ED}/usr/share/man/man1/deluge-console.1" ||die |
| 50 |
fi |
| 51 |
if ! use gtk ; then |
| 52 |
rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die |
| 53 |
- rm -r "${D}/usr/share/icons/" || die |
| 54 |
- rm "${D}/usr/bin/deluge-gtk" || die |
| 55 |
- rm "${D}/usr/share/man/man1/deluge-gtk.1" || die |
| 56 |
- rm "${D}/usr/share/applications/deluge.desktop" || die |
| 57 |
+ rm -r "${ED}/usr/share/icons/" || die |
| 58 |
+ rm "${ED}/usr/bin/deluge-gtk" || die |
| 59 |
+ rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die |
| 60 |
+ rm "${ED}/usr/share/applications/deluge.desktop" || die |
| 61 |
fi |
| 62 |
if use webinterface; then |
| 63 |
newinitd "${FILESDIR}/deluge-web.init-2" deluge-web |
| 64 |
@@ -108,8 +109,8 @@ python_install_all() { |
| 65 |
systemd_install_serviced "${FILESDIR}/deluge-web.service.conf" |
| 66 |
else |
| 67 |
rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die |
| 68 |
- rm "${D}/usr/bin/deluge-web" || die |
| 69 |
- rm "${D}/usr/share/man/man1/deluge-web.1" || die |
| 70 |
+ rm "${ED}/usr/bin/deluge-web" || die |
| 71 |
+ rm "${ED}/usr/share/man/man1/deluge-web.1" || die |
| 72 |
fi |
| 73 |
newinitd "${FILESDIR}"/deluged.init-2 deluged |
| 74 |
newconfd "${FILESDIR}"/deluged.conf-2 deluged |
| 75 |
|
| 76 |
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild |
| 77 |
index 121cab58004..2caebb8c9d1 100644 |
| 78 |
--- a/net-p2p/deluge/deluge-9999.ebuild |
| 79 |
+++ b/net-p2p/deluge/deluge-9999.ebuild |
| 80 |
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then |
| 81 |
EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}" |
| 82 |
else |
| 83 |
SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz" |
| 84 |
- KEYWORDS="~amd64 ~x86" |
| 85 |
+ KEYWORDS="~amd64 ~arm ~sparc ~x86" |
| 86 |
fi |
| 87 |
|
| 88 |
LICENSE="GPL-2" |
| 89 |
@@ -61,6 +61,7 @@ RDEPEND=" |
| 90 |
PATCHES=( |
| 91 |
"${FILESDIR}/${PN}-2.0.3-setup.py.patch" |
| 92 |
"${FILESDIR}/${PN}-2.0.3-UI-status.patch" |
| 93 |
+ "${FILESDIR}/${PN}-2.0.3-gettext.patch" |
| 94 |
) |
| 95 |
|
| 96 |
python_prepare_all() { |
| 97 |
@@ -91,15 +92,15 @@ python_install_all() { |
| 98 |
distutils-r1_python_install_all |
| 99 |
if ! use console ; then |
| 100 |
rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die |
| 101 |
- rm "${D}/usr/bin/deluge-console" || die |
| 102 |
- rm "${D}/usr/share/man/man1/deluge-console.1" ||die |
| 103 |
+ rm "${ED}/usr/bin/deluge-console" || die |
| 104 |
+ rm "${ED}/usr/share/man/man1/deluge-console.1" ||die |
| 105 |
fi |
| 106 |
if ! use gtk ; then |
| 107 |
rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die |
| 108 |
- rm -r "${D}/usr/share/icons/" || die |
| 109 |
- rm "${D}/usr/bin/deluge-gtk" || die |
| 110 |
- rm "${D}/usr/share/man/man1/deluge-gtk.1" || die |
| 111 |
- rm "${D}/usr/share/applications/deluge.desktop" || die |
| 112 |
+ rm -r "${ED}/usr/share/icons/" || die |
| 113 |
+ rm "${ED}/usr/bin/deluge-gtk" || die |
| 114 |
+ rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die |
| 115 |
+ rm "${ED}/usr/share/applications/deluge.desktop" || die |
| 116 |
fi |
| 117 |
if use webinterface; then |
| 118 |
newinitd "${FILESDIR}/deluge-web.init-2" deluge-web |
| 119 |
@@ -108,8 +109,8 @@ python_install_all() { |
| 120 |
systemd_install_serviced "${FILESDIR}/deluge-web.service.conf" |
| 121 |
else |
| 122 |
rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die |
| 123 |
- rm "${D}/usr/bin/deluge-web" || die |
| 124 |
- rm "${D}/usr/share/man/man1/deluge-web.1" || die |
| 125 |
+ rm "${ED}/usr/bin/deluge-web" || die |
| 126 |
+ rm "${ED}/usr/share/man/man1/deluge-web.1" || die |
| 127 |
fi |
| 128 |
newinitd "${FILESDIR}"/deluged.init-2 deluged |
| 129 |
newconfd "${FILESDIR}"/deluged.conf-2 deluged |
Archives