gentoo resync : 29.12.2022

6 files changed, 56 insertions, 244 deletions

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 92523ecd5b59..0ff73a76a16a 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,11 +1,6 @@
-DIST qbittorrent-4.3.8.tar.gz 8506355 BLAKE2B e59be1556ad0be697e32d69d890115df6ce20a46f883a9060994558db02f06cf87fbf68a17e6317e1b5819af523281bdd8cfdcc8ae68a0d707a238023dcc7840 SHA512 bb03f27f0807dfac867ddf5a6fcec1687946068a7e7d88483f0ded34d7279aa0d3324fe25f23c22ce80ee98437d8914229c5969ea8849eed1d4ad68e031601e2
 DIST qbittorrent-4.3.9.tar.gz 8510414 BLAKE2B de98aff6d81f43c3ad87f6c5f800a4488e18173fb96713d0a2420cf4d4708c9b1f2f54c8d0aa566e7738b4f94d192aad9f0196a05d43724582ef81833901727f SHA512 ec33f67895fbf47acc2f79d9c9e16db8b96c756cf493b76eb24b90e13a790a709104ea9aa378ee111d8c38b605bed5192b366d1917bbf160b21aa2ae3aacd2d1
-DIST qbittorrent-4.4.1.tar.gz 9090594 BLAKE2B 1b0d4900352c069177913a2ef66bd986a45d13d52f191b824a4dbd38d84b037a7410a9c71cf487d537a5ce70b00e8f695c20acd85ede963731a84f39c9b8ee5c SHA512 155e0394e1599fbbae4b03fc39a13085eb4f797fdf7ff45d2c552c66cdb523e146b77da4fa0f14d6b5b64e3b56f9da7163fd544811a40a9a787848007bfbd0a6
-DIST qbittorrent-4.4.2.tar.gz 9197188 BLAKE2B 719ca031b1a5523cd29582d7d57ac48e5d3cfb8b1c62e23f01d116897e7753cda204a0dc401f364860eba750371f41178d87ae6d1f43241506868d90a8bc9e32 SHA512 55656fb5fd282a3ed0e703b9b47ec9733a70cf6242cae956a5b2487ef2aeb88a04bf5d37c8fa88554edf95ab0821b76ebebb53e8fc43dc5889f8c730075d6e26
-EBUILD qbittorrent-4.3.8.ebuild 1374 BLAKE2B 1fcc975df8e24e9fd47e035247e0e8e81222a3c76059de959547845fdc2ebf14f003c3c31ff64049d58fab86f3bc4330d195c32a630463b9ba97cdf1c9488509 SHA512 f4d303fe3e71e8b734cf42f136d71c863ac89ea91d3ae68e0a112c77e4a296f27168d551a7ec1c9cfcd06ca974ecb84f3dbcda5aa19b33efa82f897232ebfa56
+DIST qbittorrent-4.4.3.1.tar.gz 7736308 BLAKE2B 9177f0c629418a5f9e7f117b7d1f990181ef910193fed9763f2137cbc91c9de07ad96884d57e96782b5a2f6089fe73d3fab0a2f2f54f72dd8c2cec00dd179e5f SHA512 e3d63c4090e27387f4a5524d0daab26eab70f70ef81ad607e9661e128ccccbf33f2d240cd219bbb1fb138d6e78493ce73055d5128bf888e0ad3949922774efba
 EBUILD qbittorrent-4.3.9.ebuild 1374 BLAKE2B 50f1b1faee3b77468c8ce4b256be7e1ee9e302a7df26e4fa35e3e4dbeb2c12bcd60e271ea1fd5d0dc81e62ca04f65da672e7a4db5ec4af06c56995611dcb554c SHA512 8cd9ff1452e4fd6122e559fea1b147d34cb8ac7b2337ebaf3fdd536fb1cadb88ee8feb29fb409c0312341e7a37491ace10611ad1dc28cab41eef279a61fe8e43
-EBUILD qbittorrent-4.4.1-r1.ebuild 1557 BLAKE2B ed43407db9273772656dfedbaf8d09e320c193482938c271e4655852fb0badf82f7647b1255c2660a9371dca00644bab4e401be666e7f87587a9f1f8e17cae48 SHA512 b305563d9126c1aa6916d8efbe2d256569b5a9207baa4676a3089fec2214682995978a14aea04e679dbc5b01eaaf826ab5123f0272e71db2935a41dbfadf33d7
-EBUILD qbittorrent-4.4.2-r2.ebuild 2286 BLAKE2B de28d34fe010d18f1151919062279aa4886cb5d6f21c47a55af6995e230fad8df0b733ff2b51f66bcc0f59296a3235575da63f0d121adf695e3a6e6993605221 SHA512 11e45fa7963e3211de69caba0e15d6c2959cbe2cf70e3f11c2c11e6ecd1d1e5dcd3cec5551891e6f933fadd5204738b7bc8eaa64c1cf1db14e5379939a2cf4e1
-EBUILD qbittorrent-4.4.2.ebuild 1557 BLAKE2B ed43407db9273772656dfedbaf8d09e320c193482938c271e4655852fb0badf82f7647b1255c2660a9371dca00644bab4e401be666e7f87587a9f1f8e17cae48 SHA512 b305563d9126c1aa6916d8efbe2d256569b5a9207baa4676a3089fec2214682995978a14aea04e679dbc5b01eaaf826ab5123f0272e71db2935a41dbfadf33d7
-EBUILD qbittorrent-9999.ebuild 1557 BLAKE2B ed43407db9273772656dfedbaf8d09e320c193482938c271e4655852fb0badf82f7647b1255c2660a9371dca00644bab4e401be666e7f87587a9f1f8e17cae48 SHA512 b305563d9126c1aa6916d8efbe2d256569b5a9207baa4676a3089fec2214682995978a14aea04e679dbc5b01eaaf826ab5123f0272e71db2935a41dbfadf33d7
+EBUILD qbittorrent-4.4.3.1.ebuild 2260 BLAKE2B d92c164d05d5304d1dca09e860522ac89ce734d6acb9f80f404123445bd343ceb6b2fac631fed9990319f99fe66ef1f0e80ced31b37542703472db338cf6bcdd SHA512 bf9a9d9ddc273efa22dd1f5abc6683968f35d8bb7883af7233bbc444103c4d863e8d8c8424c32453ea9355d7b58c6eaec02c8aede50fb5e61499745ed87bd934
+EBUILD qbittorrent-9999.ebuild 2260 BLAKE2B d92c164d05d5304d1dca09e860522ac89ce734d6acb9f80f404123445bd343ceb6b2fac631fed9990319f99fe66ef1f0e80ced31b37542703472db338cf6bcdd SHA512 bf9a9d9ddc273efa22dd1f5abc6683968f35d8bb7883af7233bbc444103c4d863e8d8c8424c32453ea9355d7b58c6eaec02c8aede50fb5e61499745ed87bd934
 MISC metadata.xml 453 BLAKE2B 0a68996aacf4ff1e56423417f8808bb66aa9563aaa3ef87c863539edd8173f32cc4a1b0061a5c9ecd63801c51ec52c54bd61ffcd869fc74dc24c2b042ec218d5 SHA512 90d52e221f153737c99b353a052683e0340f098f773b28e0d5b9d0c729b747beedadb4193c45a1f4c3df998436d194e089434aa621421bf127d049d90a14a434
diff --git a/net-p2p/qbittorrent/qbittorrent-4.3.8.ebuild b/net-p2p/qbittorrent/qbittorrent-4.3.8.ebuild
deleted file mode 100644
index d0e79dd35b23..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.3.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org
-	  https://github.com/qbittorrent"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-	S="${WORKDIR}/qBittorrent-release-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus debug webui +X"
-REQUIRED_USE="dbus? ( X )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62.0-r1:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.2.12:0=
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		dev-libs/geoip
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-src_configure() {
-	econf \
-	$(use_enable dbus qt-dbus) \
-	$(use_enable debug) \
-	$(use_enable webui) \
-	$(use_enable X gui)
-}
-
-src_install() {
-	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.4.1-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.4.1-r1.ebuild
deleted file mode 100644
index 85869e0799fd..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd xdg
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org
-	  https://github.com/qbittorrent"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	S="${WORKDIR}/qBittorrent-release-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus +gui webui"
-REQUIRED_USE="dbus? ( gui )"
-
-RDEPEND="
-	>=dev-libs/boost-1.65.0-r1:=
-	dev-libs/openssl:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.2.14:=
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	gui? (
-		dev-libs/geoip
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex gui)
-		-DWEBUI=$(usex webui)
-
-		# 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
-
-		# Not yet in ::gentoo
-		-DQT6=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	einstalldocs
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.4.2.ebuild b/net-p2p/qbittorrent/qbittorrent-4.4.2.ebuild
deleted file mode 100644
index 85869e0799fd..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.4.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd xdg
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org
-	  https://github.com/qbittorrent"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	S="${WORKDIR}/qBittorrent-release-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus +gui webui"
-REQUIRED_USE="dbus? ( gui )"
-
-RDEPEND="
-	>=dev-libs/boost-1.65.0-r1:=
-	dev-libs/openssl:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.2.14:=
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	gui? (
-		dev-libs/geoip
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex gui)
-		-DWEBUI=$(usex webui)
-
-		# 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
-
-		# Not yet in ::gentoo
-		-DQT6=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	einstalldocs
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.4.2-r2.ebuild b/net-p2p/qbittorrent/qbittorrent-4.4.3.1.ebuild
index 159cdd733aa3..e66a7bbca615 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.4.2-r2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.4.3.1.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
 	MULTIBUILD_VARIANTS=( base )
 	use webui && MULTIBUILD_VARIANTS+=( webui )
 
-	multibuild_foreach_variant cmake_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -71,7 +71,7 @@ src_configure() {
 			# Not yet in ::gentoo
 			-DQT6=OFF
 
-			# We do these in multibuild, see bug #839531 for why
+			# We do these in multibuild, see bug #839531 for why.
 			# Fedora has to do the same thing.
 			-DGUI=$(usex gui)
 		)
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 85869e0799fd..e66a7bbca615 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake systemd xdg
+inherit cmake multibuild systemd xdg
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="https://www.qbittorrent.org
@@ -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:=
@@ -45,30 +46,62 @@ BDEPEND="dev-qt/linguist-tools:5
 
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 
+src_prepare() {
+	MULTIBUILD_VARIANTS=( base )
+	use webui && MULTIBUILD_VARIANTS+=( webui )
+
+	cmake_src_prepare
+}
+
 src_configure() {
-	local mycmakeargs=(
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex gui)
-		-DWEBUI=$(usex webui)
+	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)
 
-		# musl lacks execinfo.h
-		-DSTACKTRACE=$(usex !elibc_musl)
+			# More verbose build logs are preferable for bug reports
+			-DVERBOSE_CONFIGURE=ON
 
-		# We always want to install unit files
-		-DSYSTEMD=ON
-		-DSYSTEMD_SERVICES_INSTALL_DIR=$(systemd_get_systemunitdir)
+			# Not yet in ::gentoo
+			-DQT6=OFF
 
-		# More verbose build logs are preferable for bug reports
-		-DVERBOSE_CONFIGURE=ON
+			# We do these in multibuild, see bug #839531 for why.
+			# Fedora has to do the same thing.
+			-DGUI=$(usex gui)
+		)
 
-		# Not yet in ::gentoo
-		-DQT6=OFF
-	)
+		if [[ ${MULTIBUILD_VARIANT} == webui ]] ; then
+			mycmakeargs+=(
+				-DGUI=OFF
+				-DWEBUI=ON
+			)
+		else
+			mycmakeargs+=( -DWEBUI=OFF )
+		fi
 
-	cmake_src_configure
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant multibuild_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
 }
 
 src_install() {
-	cmake_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
 }