summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Pedroni <paolo.pedroni@iol.it>2022-12-27 15:38:22 +0100
committerJoonas Niilola <juippis@gentoo.org>2023-01-12 16:41:38 +0200
commit0fe44f7a1d0009f74cfe5cd7e9d8495859c5052a (patch)
tree1d7f3ea18ebd9b54d1c51a62cedb92426f4b6526 /net-p2p
parentapp-crypt/nitrocli: Use cargo install for shell-complete (diff)
downloadgentoo-0fe44f7a1d0009f74cfe5cd7e9d8495859c5052a.tar.gz
gentoo-0fe44f7a1d0009f74cfe5cd7e9d8495859c5052a.tar.bz2
gentoo-0fe44f7a1d0009f74cfe5cd7e9d8495859c5052a.zip
net-p2p/deluge: Fix deluge-web systemd service unit
Also clarify systemd service usage and drop old. Closes: https://bugs.gentoo.org/888183 Signed-off-by: Paolo Pedroni <paolo.pedroni@iol.it> Closes: https://github.com/gentoo/gentoo/pull/28852 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/deluge/deluge-2.1.1-r2.ebuild (renamed from net-p2p/deluge/deluge-2.1.1.ebuild)12
-rw-r--r--net-p2p/deluge/files/deluge-web.service-410
2 files changed, 18 insertions, 4 deletions
diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1-r2.ebuild
index 6e8715c9404e..e30912c37127 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
else
SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
fi
LICENSE="GPL-2"
@@ -64,6 +64,8 @@ RDEPEND="
')
"
+PATCHES=( "${FILESDIR}/${P}-twisted-22.10.patch" )
+
distutils_enable_tests pytest
python_prepare_all() {
@@ -131,7 +133,7 @@ python_install_all() {
if use webinterface; then
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_newunit "${FILESDIR}/deluge-web.service-4" deluge-web.service
systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
else
rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
@@ -156,7 +158,9 @@ pkg_postinst() {
elog
elog "To start the daemon either run 'deluged' as user"
elog "or modify /etc/conf.d/deluged and run"
- elog "/etc/init.d/deluged start as root"
+ elog "'/etc/init.d/deluged start' as root if you use OpenRC"
+ elog "or"
+ elog "'systemctl start deluged.service' as root if you use systemd"
elog "You can still use deluge the old way"
elog
elog "Systemd unit files for deluged and deluge-web no longer source"
diff --git a/net-p2p/deluge/files/deluge-web.service-4 b/net-p2p/deluge/files/deluge-web.service-4
new file mode 100644
index 000000000000..9ebfcbc84745
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.service-4
@@ -0,0 +1,10 @@
+[Unit]
+Description=Deluge WebUI
+Documentation=man:deluge-web
+After=deluged.service
+
+[Service]
+ExecStart=/usr/bin/deluge-web -d -c ${DELUGE_WEB_HOME} ${DELUGE_WEB_OPTS}
+
+[Install]
+WantedBy=multi-user.target