commit: 35ebdaf0752bac87a599f52f116f0109419ebf0b
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Jan 21 06:09:56 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 05:54:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ebdaf0
net-p2p/qbittorrent: drop acct-* dependencies to USE=webui
The relevant accounts are tied to use of qbittorrent-nox, the daemonized
system service with systemd/openrc service files that launch as the
created user accounts. It is totally unneeded by purely USE=gui users
(the default configuration) as that simply runs in the context of the
logged in desktop user.
While we are at it, ensure the openrc service files are only installed
for USE=webui as well. The service files attempt to run qbittorrent-nox,
and for that very reason the upstream systemd unit is only installed for
USE=webui. The openrc services stick out like a sore thumb.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...bittorrent-9999.ebuild => qbittorrent-4.5.5-r2.ebuild} | 15 ++++++++++-----
...ittorrent-4.6.2.ebuild => qbittorrent-4.6.2-r1.ebuild} | 15 ++++++++++-----
net-p2p/qbittorrent/qbittorrent-9999.ebuild | 13 +++++++++----
3 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
b/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild
similarity index 92%
copy from net-p2p/qbittorrent/qbittorrent-9999.ebuild
copy to net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild
index d2fd716fffa9..fb5b46da02b2 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="|| ( gui webui )"
RDEPEND="
>=dev-libs/openssl-1.1.1:=
- >=net-libs/libtorrent-rasterbar-1.2.19:=
+ >=net-libs/libtorrent-rasterbar-1.2.18:=
>=sys-libs/zlib-1.2.11
virtual/libiconv
gui? (
@@ -48,8 +48,11 @@ RDEPEND="
dev-qt/qtsql:5[sqlite]
dev-qt/qtxml:5
)
- acct-group/qbittorrent
- acct-user/qbittorrent"
+ webui? (
+ acct-group/qbittorrent
+ acct-user/qbittorrent
+ )
+"
DEPEND="
${RDEPEND}
dev-libs/boost
@@ -132,6 +135,8 @@ src_install() {
multibuild_foreach_variant cmake_src_install
einstalldocs
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ if use webui; then
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ fi
}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.6.2.ebuild
b/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild
similarity index 93%
rename from net-p2p/qbittorrent/qbittorrent-4.6.2.ebuild
rename to net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild
index f3b8bfcb67b6..60d5656adf61 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.6.2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild
@@ -24,8 +24,6 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( gui webui )"
RDEPEND="
- acct-group/qbittorrent
- acct-user/qbittorrent
>=dev-libs/openssl-1.1.1:=
>=net-libs/libtorrent-rasterbar-1.2.19:=
>=sys-libs/zlib-1.2.11
@@ -47,7 +45,12 @@ RDEPEND="
>=dev-qt/qtbase-6.2:6[dbus?,gui,widgets]
>=dev-qt/qtsvg-6.2:6
)
- )"
+ )
+ webui? (
+ acct-group/qbittorrent
+ acct-user/qbittorrent
+ )
+"
DEPEND="
${RDEPEND}
>=dev-libs/boost-1.71
@@ -126,6 +129,8 @@ src_install() {
multibuild_foreach_variant cmake_src_install
einstalldocs
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ if use webui; then
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ fi
}
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index d2fd716fffa9..7c839c086c0b 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -48,8 +48,11 @@ RDEPEND="
dev-qt/qtsql:5[sqlite]
dev-qt/qtxml:5
)
- acct-group/qbittorrent
- acct-user/qbittorrent"
+ webui? (
+ acct-group/qbittorrent
+ acct-user/qbittorrent
+ )
+"
DEPEND="
${RDEPEND}
dev-libs/boost
@@ -132,6 +135,8 @@ src_install() {
multibuild_foreach_variant cmake_src_install
einstalldocs
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ if use webui; then
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ fi
}
