summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPPed72 <paolo.pedroni@iol.it>2020-01-24 16:04:07 +0100
committerJoonas Niilola <juippis@gentoo.org>2020-01-27 08:32:20 +0200
commit8eeaceea9b91ac8f068cdcb333842d7aebb7c9e6 (patch)
tree689e59d4856b65b60eb3f5ffcdd03d686ef3f7e0 /net-p2p/deluge/deluge-9999.ebuild
parentnet-im/telegram-desktop-bin: Drop old (diff)
downloadgentoo-8eeaceea9b91ac8f068cdcb333842d7aebb7c9e6.tar.gz
gentoo-8eeaceea9b91ac8f068cdcb333842d7aebb7c9e6.tar.bz2
gentoo-8eeaceea9b91ac8f068cdcb333842d7aebb7c9e6.zip
net-p2p/deluge: fix deluge-web.init file
Also fixes installation of unwanted files and byte compilation of python modules. Remove old. Closes: https://bugs.gentoo.org/705914 Signed-off-by: Paolo Pedroni <paolo.pedroni@iol.it> Closes: https://github.com/gentoo/gentoo/pull/14425 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-p2p/deluge/deluge-9999.ebuild')
-rw-r--r--net-p2p/deluge/deluge-9999.ebuild26
1 files changed, 14 insertions, 12 deletions
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index fc0402eb7223..d1806e7558e9 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -85,31 +85,33 @@ esetup.py() {
python_install_all() {
distutils-r1_python_install_all
if ! use console ; then
- rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
- rm -f "${D}/usr/bin/deluge-console" || die
- rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+ 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
fi
if ! use gtk ; then
- rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
- rm -rf "${D}/usr/share/icons/" || die
- rm -f "${D}/usr/bin/deluge-gtk" || die
- rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
- rm -f "${D}/usr/share/applications/deluge.desktop" || die
+ 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
fi
if use webinterface; then
- newinitd "${FILESDIR}/deluge-web.init" deluge-web
+ newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
newconfd "${FILESDIR}/deluge-web.conf" deluge-web
systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
else
- rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
- rm -f "${D}/usr/bin/deluge-web" || die
- rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+ 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
fi
newinitd "${FILESDIR}"/deluged.init-2 deluged
newconfd "${FILESDIR}"/deluged.conf-2 deluged
systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+ python_optimize
}
pkg_postinst() {