commit: 936cbb8989896a81360d60b4a502de31ca842406 Author: Filip Kobierski <fkobi <AT> pm <DOT> me> AuthorDate: Fri Sep 19 22:29:28 2025 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Mon Sep 22 19:16:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936cbb89
net-p2p/qbittorrent: sync live Signed-off-by: Filip Kobierski <fkobi <AT> pm.me> Part-of: https://github.com/gentoo/gentoo/pull/42267 Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> net-p2p/qbittorrent/qbittorrent-9999.ebuild | 38 ++++++++++++----------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild index dfdb78a22364..a4af32da4fe5 100644 --- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild @@ -24,7 +24,7 @@ fi LICENSE="GPL-2+-with-openssl-exception GPL-3+-with-openssl-exception" SLOT="0" -IUSE="+dbus +gui systemd test webui" +IUSE="+dbus +gui test webui" RESTRICT="!test? ( test )" REQUIRED_USE=" || ( gui webui ) @@ -33,9 +33,9 @@ REQUIRED_USE=" RDEPEND=" >=dev-libs/openssl-3.0.2:= - >=net-libs/libtorrent-rasterbar-1.2.19:= - >=sys-libs/zlib-1.2.11 >=dev-qt/qtbase-6.5:6[network,ssl,sql,sqlite,xml] + >=net-libs/libtorrent-rasterbar-2.0.10:= + >=sys-libs/zlib-1.2.11 gui? ( >=dev-qt/qtbase-6.5:6[dbus?,gui,widgets] >=dev-qt/qtsvg-6.5:6 @@ -56,28 +56,24 @@ BDEPEND+=" DOCS=( AUTHORS Changelog {CONTRIBUTING,README}.md ) -src_prepare() { - MULTIBUILD_VARIANTS=() - use gui && MULTIBUILD_VARIANTS+=( gui ) - use webui && MULTIBUILD_VARIANTS+=( nogui ) - - cmake_src_prepare -} - src_configure() { + MULTIBUILD_VARIANTS=( + $(usev gui) + $(usev webui nogui) + ) + my_src_configure() { local mycmakeargs=( - # musl lacks execinfo.h - -DSTACKTRACE=$(usex !elibc_musl) - # More verbose build logs are preferable for bug reports - -DVERBOSE_CONFIGURE=ON - -DWEBUI=$(usex webui) + -DVERBOSE_CONFIGURE=ON # for bug reports + -DSTACKTRACE=$(usex !elibc_musl) # musl lacks execinfo.h -DTESTING=$(usex test) + -DWEBUI=$(usex webui) ) + # upstream supports building just gui or nogui + # so we build the project twice (see #839531 for details) + # Fedora does the same: https://src.fedoraproject.org/rpms/qbittorrent 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 -DDBUS=$(usex dbus) @@ -87,11 +83,7 @@ src_configure() { mycmakeargs+=( -DGUI=OFF -DDBUS=OFF - ) - - use systemd && mycmakeargs+=( - # The systemd service calls qbittorrent-nox, which is only - # installed when GUI=OFF. + # The systemd service calls qbittorrent-nox, built only when GUI=OFF. -DSYSTEMD=ON -DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)" )
