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 CC69F158094 for ; Wed, 5 Oct 2022 18:49:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CA1AE08E5; Wed, 5 Oct 2022 18:49:16 +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 03D6BE08E5 for ; Wed, 5 Oct 2022 18:49:16 +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 28AEE340CB6 for ; Wed, 5 Oct 2022 18:49:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 638075DD for ; Wed, 5 Oct 2022 18:49:13 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1664995751.d5c918f620f0ba3312ed83b2a9cd1c0c59f5a443.floppym@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.5-r1.ebuild net-p2p/qbittorrent/qbittorrent-9999.ebuild X-VCS-Directories: net-p2p/qbittorrent/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: d5c918f620f0ba3312ed83b2a9cd1c0c59f5a443 X-VCS-Branch: master Date: Wed, 5 Oct 2022 18:49:13 +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: ff537ba8-a29a-4fc9-94ac-4cb621bec62a X-Archives-Hash: 84b7a1ea20f59bf93582e2dffbfbe092 commit: d5c918f620f0ba3312ed83b2a9cd1c0c59f5a443 Author: Mike Gilbert gentoo org> AuthorDate: Wed Oct 5 18:47:06 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Oct 5 18:49:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c918f6 net-p2p/qbittorrent: rework DBUS and SYSTEMD options The DBUS feature is only relevant when GUI=ON. The SYSTEMD feature is only relevant when GUI=OFF. Signed-off-by: Mike Gilbert gentoo.org> net-p2p/qbittorrent/qbittorrent-4.4.5-r1.ebuild | 27 ++++++++++++------------- net-p2p/qbittorrent/qbittorrent-9999.ebuild | 27 ++++++++++++------------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/net-p2p/qbittorrent/qbittorrent-4.4.5-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.4.5-r1.ebuild index 86809760e4f7..0e71f8eb646d 100644 --- a/net-p2p/qbittorrent/qbittorrent-4.4.5-r1.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-4.4.5-r1.ebuild @@ -56,15 +56,9 @@ src_prepare() { src_configure() { multibuild_src_configure() { local mycmakeargs=( - -DDBUS=$(usex dbus) - # musl lacks execinfo.h -DSTACKTRACE=$(usex !elibc_musl) - # We always want to install unit files - -DSYSTEMD=ON - -DSYSTEMD_SERVICES_INSTALL_DIR=$(systemd_get_systemunitdir) - # More verbose build logs are preferable for bug reports -DVERBOSE_CONFIGURE=ON @@ -77,9 +71,20 @@ src_configure() { if [[ ${MULTIBUILD_VARIANT} == gui ]]; then # We do this in multibuild, see bug #839531 for why. # Fedora has to do the same thing. - mycmakeargs+=( -DGUI=ON ) + mycmakeargs+=( + -DGUI=ON + -DDBUS=$(usex dbus) + -DSYSTEMD=OFF + ) else - mycmakeargs+=( -DGUI=OFF ) + mycmakeargs+=( + -DGUI=OFF + -DDBUS=OFF + # The systemd service calls qbittorrent-nox, which is only + # installed when GUI=OFF. + -DSYSTEMD=ON + -DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)" + ) fi cmake_src_configure @@ -94,11 +99,5 @@ src_compile() { src_install() { multibuild_foreach_variant cmake_src_install - - if ! use webui ; then - # No || die deliberately as it doesn't always exist - rm "${D}/$(systemd_get_systemunitdir)"/qbittorrent-nox*.service - fi - einstalldocs } diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild index dd26453408e2..c6292efff901 100644 --- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild @@ -57,15 +57,9 @@ src_prepare() { src_configure() { multibuild_src_configure() { local mycmakeargs=( - -DDBUS=$(usex dbus) - # musl lacks execinfo.h -DSTACKTRACE=$(usex !elibc_musl) - # We always want to install unit files - -DSYSTEMD=ON - -DSYSTEMD_SERVICES_INSTALL_DIR=$(systemd_get_systemunitdir) - # More verbose build logs are preferable for bug reports -DVERBOSE_CONFIGURE=ON @@ -80,9 +74,20 @@ src_configure() { if [[ ${MULTIBUILD_VARIANT} == gui ]] ; then # We do this in multibuild, see bug #839531 for why. # Fedora has to do the same thing. - mycmakeargs+=( -DGUI=ON ) + mycmakeargs+=( + -DGUI=ON + -DDBUS=$(usex dbus) + -DSYSTEMD=OFF + ) else - mycmakeargs+=( -DGUI=OFF ) + mycmakeargs+=( + -DGUI=OFF + -DDBUS=OFF + # The systemd service calls qbittorrent-nox, which is only + # installed when GUI=OFF. + -DSYSTEMD=ON + -DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)" + ) fi cmake_src_configure @@ -106,11 +111,5 @@ src_test() { src_install() { multibuild_foreach_variant cmake_src_install - - if ! use webui ; then - # No || die deliberately as it doesn't always exist - rm "${D}/$(systemd_get_systemunitdir)"/qbittorrent-nox*.service - fi - einstalldocs }