From 5355a4a5f598b06ac8a91c9a90bfb9918c87cc08 Mon Sep 17 00:00:00 2001 From: Alexander Kurakin Date: Sat, 3 May 2025 23:21:18 +0300 Subject: [PATCH] net-p2p/deluge: sync Closes: https://bugs.gentoo.org/955365 Bug: https://bugs.gentoo.org/888183 Signed-off-by: Alexander Kurakin Closes: https://github.com/gentoo/gentoo/pull/41921 Signed-off-by: Joonas Niilola --- net-p2p/deluge/deluge-9999.ebuild | 10 ++++++---- net-p2p/deluge/files/deluge-web.service-3 | 10 ---------- 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 net-p2p/deluge/files/deluge-web.service-3 diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index 85901ef59e67a..797e4af87e2a8 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 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 ~riscv" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi LICENSE="GPL-2" @@ -127,7 +127,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 @@ -152,7 +152,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-3 b/net-p2p/deluge/files/deluge-web.service-3 deleted file mode 100644 index 5e0049e7ac23f..0000000000000 --- a/net-p2p/deluge/files/deluge-web.service-3 +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Deluge WebUI -Documentation=man:deluge-web -After=deluged.service - -[Service] -ExecStart=/usr/bin/deluge-web -d -c ${DELUGED_HOME} ${DELUGED_OPTS} - -[Install] -WantedBy=multi-user.target