gentoo auto-resync : 24:08:2022 - 02:45:57

4 files changed, 133 insertions, 10 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index e0b1be99b72a..be1614123f44 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index d11203a4dc16..d0e5f36309d0 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,7 +1,9 @@
 DIST qbittorrent-4.3.9.tar.gz 8510414 BLAKE2B de98aff6d81f43c3ad87f6c5f800a4488e18173fb96713d0a2420cf4d4708c9b1f2f54c8d0aa566e7738b4f94d192aad9f0196a05d43724582ef81833901727f SHA512 ec33f67895fbf47acc2f79d9c9e16db8b96c756cf493b76eb24b90e13a790a709104ea9aa378ee111d8c38b605bed5192b366d1917bbf160b21aa2ae3aacd2d1
 DIST qbittorrent-4.4.3.1.tar.gz 7736308 BLAKE2B 9177f0c629418a5f9e7f117b7d1f990181ef910193fed9763f2137cbc91c9de07ad96884d57e96782b5a2f6089fe73d3fab0a2f2f54f72dd8c2cec00dd179e5f SHA512 e3d63c4090e27387f4a5524d0daab26eab70f70ef81ad607e9661e128ccccbf33f2d240cd219bbb1fb138d6e78493ce73055d5128bf888e0ad3949922774efba
+DIST qbittorrent-4.4.4.tar.gz 7738480 BLAKE2B 2a3157a732fda6eaff809d3ea717ebcc2cb7f4364cc3209bd1836196541e83cf8c7430b32037a6a6c4f517d17edb576dd80c834185d7cb764567bd5ce699bd52 SHA512 3bd26021f45287ff5b6c9a1629ff470204121c4056d452a5c00bc94b69a198093127916d33797b357eaacdb9ffd01d0de13daecb7503088cde440d5e4895ec3e
 EBUILD qbittorrent-4.3.9.ebuild 1374 BLAKE2B 50f1b1faee3b77468c8ce4b256be7e1ee9e302a7df26e4fa35e3e4dbeb2c12bcd60e271ea1fd5d0dc81e62ca04f65da672e7a4db5ec4af06c56995611dcb554c SHA512 8cd9ff1452e4fd6122e559fea1b147d34cb8ac7b2337ebaf3fdd536fb1cadb88ee8feb29fb409c0312341e7a37491ace10611ad1dc28cab41eef279a61fe8e43
 EBUILD qbittorrent-4.4.3.1-r1.ebuild 2364 BLAKE2B e46f077837b36cf46aa2ace0c840a166aed5fb8fb93570e92488291c92d28dd83b9ae96667b915ae58e3bed0283a9100576e98bc1461c4f3a3c3db2465c8e825 SHA512 70523c78dab8f372d668822d9c63ae6ff94fa3c71530574bf1ef140bddb085f34b75906872b9eb646bbbe4e4c4650cabc07dfdb26f39b8fec58f4e2002ee0a83
 EBUILD qbittorrent-4.4.3.1.ebuild 2258 BLAKE2B b51c4a22876bc01c97ac3c148b1ce4661d5462bd477d51ff62cd8572a69ab323624355f95f8345c4436929be618bdfcf4858a7f6b110588e16b3bd713c73ad61 SHA512 840e67df63c3daa7bcf2144cab7e0f05ee9ff0e8def5807d6e86ac1c63ddd2f418054be0eeebb8f944fa9564327fc01ae9ac09e99d50ad40227aac34655bee42
-EBUILD qbittorrent-9999.ebuild 2268 BLAKE2B a3077d1ee4d59683384b1056a302304aed59ab73a8d5d67a751f647b5216788fff65d8fc5eef44d54e0d523023f53ddd70370d6ba36c4a8cf7e76fb11d0b64ff SHA512 41605d8de4a1028faad64cdc9d40272099c4670c49f634c0d317da7848c966f6df974cbffc51e27f3f46214481406ad334b436e5d40154f962ebb56a65e00ed9
+EBUILD qbittorrent-4.4.4.ebuild 2353 BLAKE2B 9a886942a323687fb7eee9e3a5e5a91dd82f7d79cdb0efe8e7e3578e70f92810e7737e1802670e034257a69c1eda439a548d90ccbfb3518c4967bff0fcfa42ff SHA512 0365a31e556426e7e368294a7fd99d8e1d5cfc3bf67384cdd799564d3ea46317f8256272db5231402221628055eaa530e06a7da73b29c7da18f650716a0172bc
+EBUILD qbittorrent-9999.ebuild 2548 BLAKE2B 327dc0f6f1d58cf85386daf40ffe063a5f2451a59b4980ffc762b513180d5e95021051b7d9a3924b7f7c49f09022932410f5fe8c3445c85556fdda833fcd5770 SHA512 3cb6eff8e1e06256f76c86fe89f472757732c6df3f69403118aefe4f2d83e6ae61f0cc6e908bb1f14c0fd9be70f4d230cdaa0e82a9acaaaa21b2a118d5985b5f
 MISC metadata.xml 453 BLAKE2B 0a68996aacf4ff1e56423417f8808bb66aa9563aaa3ef87c863539edd8173f32cc4a1b0061a5c9ecd63801c51ec52c54bd61ffcd869fc74dc24c2b042ec218d5 SHA512 90d52e221f153737c99b353a052683e0340f098f773b28e0d5b9d0c729b747beedadb4193c45a1f4c3df998436d194e089434aa621421bf127d049d90a14a434
diff --git a/net-p2p/qbittorrent/qbittorrent-4.4.4.ebuild b/net-p2p/qbittorrent/qbittorrent-4.4.4.ebuild
new file mode 100644
index 000000000000..15b1ff95a991
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.4.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild systemd xdg
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"
+	inherit git-r3
+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 )
+	|| ( gui webui )"
+
+RDEPEND="
+	>=dev-libs/boost-1.65.0-r1:=
+	>=dev-libs/openssl-1.1.1:=
+	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-1.2.11
+	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_prepare() {
+	MULTIBUILD_VARIANTS=( base )
+	use webui && MULTIBUILD_VARIANTS+=( webui )
+
+	cmake_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
+
+			# Not yet in ::gentoo
+			-DQT6=OFF
+
+			# We do these in multibuild, see bug #839531 for why.
+			# Fedora has to do the same thing.
+			-DGUI=$(usex gui)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == webui ]] ; then
+			mycmakeargs+=(
+				# Need to specify GUI here to allow webui settings
+				# to appear in the GUI. bug #864731.
+				-DGUI=$(usex gui)
+				-DWEBUI=ON
+			)
+		else
+			mycmakeargs+=( -DWEBUI=OFF )
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant multibuild_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_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 2fb87e1afc1c..aa762be794a3 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -6,33 +6,33 @@ EAPI=8
 inherit cmake multibuild systemd xdg
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org
-	  https://github.com/qbittorrent"
+HOMEPAGE="https://www.qbittorrent.org"
 
 if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"
 	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}"
+	S="${WORKDIR}"/qBittorrent-release-${PV}
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+dbus +gui webui"
+IUSE="+dbus +gui test webui"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="dbus? ( gui )
 	|| ( gui webui )"
 
 RDEPEND="
-	>=dev-libs/boost-1.65.0-r1:=
-	dev-libs/openssl:=
+	>=dev-libs/boost-1.71:=
+	>=dev-libs/openssl-1.1.1:=
 	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
+	>=sys-libs/zlib-1.2.11
 	dbus? ( dev-qt/qtdbus:5 )
 	gui? (
 		dev-libs/geoip
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md )
 
 src_prepare() {
 	MULTIBUILD_VARIANTS=( base )
@@ -74,10 +74,14 @@ src_configure() {
 			# We do these in multibuild, see bug #839531 for why.
 			# Fedora has to do the same thing.
 			-DGUI=$(usex gui)
+
+			-DTESTING=$(usex test)
 		)
 
 		if [[ ${MULTIBUILD_VARIANT} == webui ]] ; then
 			mycmakeargs+=(
+				# Need to specify GUI here to allow webui settings
+				# to appear in the GUI. bug #864731.
 				-DGUI=$(usex gui)
 				-DWEBUI=ON
 			)
@@ -95,6 +99,15 @@ src_compile() {
 	multibuild_foreach_variant cmake_src_compile
 }
 
+src_test() {
+	qbittorrent_run_tests() {
+		cd "${BUILD_DIR}"/test || die
+		ctest . || die
+	}
+
+	multibuild_foreach_variant qbittorrent_run_tests
+}
+
 src_install() {
 	multibuild_foreach_variant cmake_src_install