commit: 3398ad32af36f5da298a8dfabe5fd3f180ba3e8e
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Jan 21 07:06:47 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 05:54:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3398ad32
net-p2p/qbittorrent: add back required USE
In commit 6b33e72d8933aca72a03b23870178adc55ec3998, the statement
"enabling the dbus USE flag requires enabling the gui USE flag" was
dropped from the REQUIRED_USE variable, with the following reasoning:
> DBus support is only enabled when GUI is enabled.
This is semantically problematic because it means that portage *thinks*
USE="dbus -gui" produces a different binary than USE="-dbus -gui" even
though they are in reality the same.
On the flip side: unbinding these means that people who set USE="-gui"
will get a constraint violation until they also set -dbus, since it is
by default enabled. But "gui" is also default-enabled, so it just means
that users disabling one have to disable both at the same time.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild | 4 +++-
net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild | 4 +++-
net-p2p/qbittorrent/qbittorrent-9999.ebuild | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild
b/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild
index fb5b46da02b2..38a602fd3418 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild
@@ -21,7 +21,9 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="+dbus +gui qt6 test webui systemd"
RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gui webui )"
+REQUIRED_USE="|| ( gui webui )
+ dbus? ( gui )
+"
RDEPEND="
>=dev-libs/openssl-1.1.1:=
diff --git a/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild
b/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild
index 60d5656adf61..aea6929464d7 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild
@@ -21,7 +21,9 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="+dbus +gui qt6 systemd test webui"
RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gui webui )"
+REQUIRED_USE="|| ( gui webui )
+ dbus? ( gui )
+"
RDEPEND="
>=dev-libs/openssl-1.1.1:=
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 7c839c086c0b..c49dc5560c20 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -21,7 +21,9 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="+dbus +gui qt6 test webui systemd"
RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gui webui )"
+REQUIRED_USE="|| ( gui webui )
+ dbus? ( gui )
+"
RDEPEND="
>=dev-libs/openssl-1.1.1:=
