1 |
commit: 8eeaceea9b91ac8f068cdcb333842d7aebb7c9e6 |
2 |
Author: PPed72 <paolo.pedroni <AT> iol <DOT> it> |
3 |
AuthorDate: Fri Jan 24 15:04:07 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 27 06:32:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eeaceea |
7 |
|
8 |
net-p2p/deluge: fix deluge-web.init file |
9 |
|
10 |
Also fixes installation of unwanted files and byte compilation of |
11 |
python modules. Remove old. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/705914 |
14 |
Signed-off-by: Paolo Pedroni <paolo.pedroni <AT> iol.it> |
15 |
Closes: https://github.com/gentoo/gentoo/pull/14425 |
16 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
17 |
|
18 |
...luge-2.0.3-r1.ebuild => deluge-2.0.3-r3.ebuild} | 28 ++++++------ |
19 |
net-p2p/deluge/deluge-9999.ebuild | 26 ++++++----- |
20 |
net-p2p/deluge/files/deluge-web.init-2 | 53 ++++++++++++++++++++++ |
21 |
3 files changed, 82 insertions(+), 25 deletions(-) |
22 |
|
23 |
diff --git a/net-p2p/deluge/deluge-2.0.3-r1.ebuild b/net-p2p/deluge/deluge-2.0.3-r3.ebuild |
24 |
similarity index 83% |
25 |
rename from net-p2p/deluge/deluge-2.0.3-r1.ebuild |
26 |
rename to net-p2p/deluge/deluge-2.0.3-r3.ebuild |
27 |
index 960cc354e42..d1806e7558e 100644 |
28 |
--- a/net-p2p/deluge/deluge-2.0.3-r1.ebuild |
29 |
+++ b/net-p2p/deluge/deluge-2.0.3-r3.ebuild |
30 |
@@ -3,7 +3,7 @@ |
31 |
|
32 |
EAPI="7" |
33 |
|
34 |
-PYTHON_COMPAT=( python2_7 python3_{6,7} ) |
35 |
+PYTHON_COMPAT=( python3_{6,7} ) |
36 |
DISTUTILS_SINGLE_IMPL=1 |
37 |
inherit distutils-r1 systemd |
38 |
|
39 |
@@ -85,31 +85,33 @@ esetup.py() { |
40 |
python_install_all() { |
41 |
distutils-r1_python_install_all |
42 |
if ! use console ; then |
43 |
- rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die |
44 |
- rm -f "${D}/usr/bin/deluge-console" || die |
45 |
- rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die |
46 |
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die |
47 |
+ rm "${D}/usr/bin/deluge-console" || die |
48 |
+ rm "${D}/usr/share/man/man1/deluge-console.1" ||die |
49 |
fi |
50 |
if ! use gtk ; then |
51 |
- rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die |
52 |
- rm -rf "${D}/usr/share/icons/" || die |
53 |
- rm -f "${D}/usr/bin/deluge-gtk" || die |
54 |
- rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die |
55 |
- rm -f "${D}/usr/share/applications/deluge.desktop" || die |
56 |
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die |
57 |
+ rm -r "${D}/usr/share/icons/" || die |
58 |
+ rm "${D}/usr/bin/deluge-gtk" || die |
59 |
+ rm "${D}/usr/share/man/man1/deluge-gtk.1" || die |
60 |
+ rm "${D}/usr/share/applications/deluge.desktop" || die |
61 |
fi |
62 |
if use webinterface; then |
63 |
- newinitd "${FILESDIR}/deluge-web.init" deluge-web |
64 |
+ newinitd "${FILESDIR}/deluge-web.init-2" deluge-web |
65 |
newconfd "${FILESDIR}/deluge-web.conf" deluge-web |
66 |
systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service |
67 |
systemd_install_serviced "${FILESDIR}/deluge-web.service.conf" |
68 |
else |
69 |
- rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die |
70 |
- rm -f "${D}/usr/bin/deluge-web" || die |
71 |
- rm -f "${D}/usr/share/man/man1/deluge-web.1" || die |
72 |
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die |
73 |
+ rm "${D}/usr/bin/deluge-web" || die |
74 |
+ rm "${D}/usr/share/man/man1/deluge-web.1" || die |
75 |
fi |
76 |
newinitd "${FILESDIR}"/deluged.init-2 deluged |
77 |
newconfd "${FILESDIR}"/deluged.conf-2 deluged |
78 |
systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service |
79 |
systemd_install_serviced "${FILESDIR}"/deluged.service.conf |
80 |
+ |
81 |
+ python_optimize |
82 |
} |
83 |
|
84 |
pkg_postinst() { |
85 |
|
86 |
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild |
87 |
index fc0402eb722..d1806e7558e 100644 |
88 |
--- a/net-p2p/deluge/deluge-9999.ebuild |
89 |
+++ b/net-p2p/deluge/deluge-9999.ebuild |
90 |
@@ -85,31 +85,33 @@ esetup.py() { |
91 |
python_install_all() { |
92 |
distutils-r1_python_install_all |
93 |
if ! use console ; then |
94 |
- rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die |
95 |
- rm -f "${D}/usr/bin/deluge-console" || die |
96 |
- rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die |
97 |
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die |
98 |
+ rm "${D}/usr/bin/deluge-console" || die |
99 |
+ rm "${D}/usr/share/man/man1/deluge-console.1" ||die |
100 |
fi |
101 |
if ! use gtk ; then |
102 |
- rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die |
103 |
- rm -rf "${D}/usr/share/icons/" || die |
104 |
- rm -f "${D}/usr/bin/deluge-gtk" || die |
105 |
- rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die |
106 |
- rm -f "${D}/usr/share/applications/deluge.desktop" || die |
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 |
fi |
113 |
if use webinterface; then |
114 |
- newinitd "${FILESDIR}/deluge-web.init" deluge-web |
115 |
+ newinitd "${FILESDIR}/deluge-web.init-2" deluge-web |
116 |
newconfd "${FILESDIR}/deluge-web.conf" deluge-web |
117 |
systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service |
118 |
systemd_install_serviced "${FILESDIR}/deluge-web.service.conf" |
119 |
else |
120 |
- rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die |
121 |
- rm -f "${D}/usr/bin/deluge-web" || die |
122 |
- rm -f "${D}/usr/share/man/man1/deluge-web.1" || die |
123 |
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die |
124 |
+ rm "${D}/usr/bin/deluge-web" || die |
125 |
+ rm "${D}/usr/share/man/man1/deluge-web.1" || die |
126 |
fi |
127 |
newinitd "${FILESDIR}"/deluged.init-2 deluged |
128 |
newconfd "${FILESDIR}"/deluged.conf-2 deluged |
129 |
systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service |
130 |
systemd_install_serviced "${FILESDIR}"/deluged.service.conf |
131 |
+ |
132 |
+ python_optimize |
133 |
} |
134 |
|
135 |
pkg_postinst() { |
136 |
|
137 |
diff --git a/net-p2p/deluge/files/deluge-web.init-2 b/net-p2p/deluge/files/deluge-web.init-2 |
138 |
new file mode 100644 |
139 |
index 00000000000..72ce74e7a8a |
140 |
--- /dev/null |
141 |
+++ b/net-p2p/deluge/files/deluge-web.init-2 |
142 |
@@ -0,0 +1,53 @@ |
143 |
+#!/sbin/openrc-run |
144 |
+# Copyright 1999-2013 Gentoo Foundation |
145 |
+# Distributed under the terms of the GNU General Public License, v2 or later |
146 |
+ |
147 |
+depend() { |
148 |
+ need net |
149 |
+} |
150 |
+ |
151 |
+checkconfig() { |
152 |
+ if [ "${DELUGE_WEB_USER}" = "" ] ; then |
153 |
+ eerror "Please edit /etc/conf.d/deluge-web" |
154 |
+ eerror "You have to specify a user to run deluge-web as, as we will not run it as root!" |
155 |
+ eerror "Modify DELUGE_WEB_USER to your needs (you can also add a group, after a colon)" |
156 |
+ return 1 |
157 |
+ fi |
158 |
+ if ! getent passwd "${DELUGE_WEB_USER%:*}" >/dev/null ; then |
159 |
+ eerror "Please edit /etc/conf.d/deluge-web" |
160 |
+ eerror "Your user has to exist!" |
161 |
+ return 1 |
162 |
+ fi |
163 |
+ if [ "${DELUGE_WEB_USER%:*}" = "${DELUGE_WEB_USER}" ] ; then |
164 |
+ return 0 |
165 |
+ else |
166 |
+ if ! getent group "${DELUGE_WEB_USER#*:}" >/dev/null ; then |
167 |
+ eerror "Please edit /etc/conf.d/deluge-web" |
168 |
+ eerror "Your group has to exist too!" |
169 |
+ return 1 |
170 |
+ fi |
171 |
+ fi |
172 |
+ return 0 |
173 |
+} |
174 |
+ |
175 |
+start() { |
176 |
+ checkconfig || return $? |
177 |
+ if [ "${DELUGE_WEB_HOME}" = "" ] ; then |
178 |
+ DELUGE_WEB_USER_HOME=$(getent passwd "${DELUGE_WEB_USER%:*}" | cut -d ':' -f 6) |
179 |
+ else |
180 |
+ DELUGE_WEB_USER_HOME=${DELUGE_WEB_HOME} |
181 |
+ fi |
182 |
+ ebegin "Starting Deluge-Web" |
183 |
+ start-stop-daemon --start --background --pidfile \ |
184 |
+ /run/deluge-web.pid --make-pidfile \ |
185 |
+ --exec /usr/bin/deluge-web --user "${DELUGE_WEB_USER%:*}" \ |
186 |
+ -e HOME="${DELUGE_WEB_USER_HOME}" -- --do-not-daemonize ${DELUGE_WEB_OPTS} |
187 |
+ eend $? |
188 |
+} |
189 |
+ |
190 |
+stop() { |
191 |
+ ebegin "Stopping Deluge-Web" |
192 |
+ start-stop-daemon --stop --user "${DELUGE_WEB_USER%:*}" \ |
193 |
+ --pidfile /run/deluge-web.pid |
194 |
+ eend $? |
195 |
+} |