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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7E6B15808D for ; Tue, 19 Apr 2022 20:52:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C13C6E087E; Tue, 19 Apr 2022 20:52:11 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20F64E087E for ; Tue, 19 Apr 2022 20:52:10 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E91ED3416CE for ; Tue, 19 Apr 2022 20:52:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60807287 for ; Tue, 19 Apr 2022 20:52:08 +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: <1650401520.0f1d8f865009ffbd7e822f7deefc022e911aab5e.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.4.2-r1.ebuild net-p2p/qbittorrent/qbittorrent-4.4.2-r2.ebuild X-VCS-Directories: net-p2p/qbittorrent/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0f1d8f865009ffbd7e822f7deefc022e911aab5e X-VCS-Branch: master Date: Tue, 19 Apr 2022 20:52:08 +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: 7be1b1b8-7440-4461-9769-2e4118e695f5 X-Archives-Hash: 7785ab602a733c846e685b5b387f8dbd commit: 0f1d8f865009ffbd7e822f7deefc022e911aab5e Author: Sam James gentoo org> AuthorDate: Tue Apr 19 20:51:39 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 19 20:52:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1d8f86 net-p2p/qbittorrent: refine webui/gui logic Closes: https://bugs.gentoo.org/839531 Thanks-to: maria Signed-off-by: Sam James gentoo.org> ...-4.4.2-r1.ebuild => qbittorrent-4.4.2-r2.ebuild} | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/net-p2p/qbittorrent/qbittorrent-4.4.2-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.4.2-r2.ebuild similarity index 84% rename from net-p2p/qbittorrent/qbittorrent-4.4.2-r1.ebuild rename to net-p2p/qbittorrent/qbittorrent-4.4.2-r2.ebuild index b64788d0b71b..75754bfe9170 100644 --- a/net-p2p/qbittorrent/qbittorrent-4.4.2-r1.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-4.4.2-r2.ebuild @@ -21,7 +21,8 @@ fi LICENSE="GPL-2" SLOT="0" IUSE="+dbus +gui webui" -REQUIRED_USE="dbus? ( gui )" +REQUIRED_USE="dbus? ( gui ) + || ( gui webui )" RDEPEND=" >=dev-libs/boost-1.65.0-r1:= @@ -47,7 +48,6 @@ DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO ) src_prepare() { MULTIBUILD_VARIANTS=( base ) - use gui && MULTIBUILD_VARIANTS+=( gui ) use webui && MULTIBUILD_VARIANTS+=( webui ) multibuild_foreach_variant cmake_src_prepare @@ -73,12 +73,16 @@ src_configure() { # We do these in multibuild, see bug #839531 for why # Fedora has to do the same thing. - -DGUI=OFF - -DWEBUI=OFF + -DGUI=$(usex gui) ) - if [[ ${MULTIBUILD_VARIANT} != base ]] ; then - mycmakeargs+=( -D${MULTIBUILD_VARIANT^^}=$(usex ${MULTIBUILD_VARIANT}) ) + if [[ ${MULTIBUILD_VARIANT} == webui ]] ; then + mycmakeargs+=( + -DGUI=OFF + -DWEBUI=ON + ) + else + mycmakeargs+=( -DWEBUI=OFF ) fi cmake_src_configure @@ -94,5 +98,10 @@ src_compile() { src_install() { multibuild_foreach_variant cmake_src_install + if ! use webui ; then + # No || die deliberately as it doesn't always exist + rm "${ED}/$(systemd_get_systemunitdir)"/qbittorrent-nox*.service + fi + einstalldocs }