From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AFE3F15838C for ; Mon, 22 Jan 2024 05:55:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A889FE29FD; Mon, 22 Jan 2024 05:55:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8CFB1E29FD for ; Mon, 22 Jan 2024 05:55:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C72D13430BB for ; Mon, 22 Jan 2024 05:55:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6427D14B6 for ; Mon, 22 Jan 2024 05:55:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705902889.3398ad32af36f5da298a8dfabe5fd3f180ba3e8e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild net-p2p/qbittorrent/qbittorrent-9999.ebuild X-VCS-Directories: net-p2p/qbittorrent/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3398ad32af36f5da298a8dfabe5fd3f180ba3e8e X-VCS-Branch: master Date: Mon, 22 Jan 2024 05:55:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0f4229b3-72fe-4d4f-897d-24a0ef24c30a X-Archives-Hash: 24c779f08999f7daf16c1e3403bb1ffa commit: 3398ad32af36f5da298a8dfabe5fd3f180ba3e8e Author: Eli Schwartz gmail com> AuthorDate: Sun Jan 21 07:06:47 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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:=