diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2022-10-05 14:47:06 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2022-10-05 14:49:11 -0400 |
| commit | d5c918f620f0ba3312ed83b2a9cd1c0c59f5a443 (patch) | |
| tree | 474d9267d2564d8b0f603f19a12b63c07f59d0df /net-p2p | |
| parent | app-text/poppler: add 22.10.0 (diff) | |
| download | gentoo-d5c918f620f0ba3312ed83b2a9cd1c0c59f5a443.tar.gz gentoo-d5c918f620f0ba3312ed83b2a9cd1c0c59f5a443.tar.bz2 gentoo-d5c918f620f0ba3312ed83b2a9cd1c0c59f5a443.zip | |
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 <floppym@gentoo.org>
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/qbittorrent/qbittorrent-4.4.5-r1.ebuild | 27 | ||||
| -rw-r--r-- | 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 } |