net-p2p/qbittorrent: cleanups, version bump and adopt

net-p2p/qbittorrent/Manifest

@@ -1,6 +1,9 @@
 DIST qbittorrent-4.5.2.tar.gz 8890525 BLAKE2B 48585b703ce6edf862ea3c8cfad6cab2edcb65a138c6e8d232322b4f4fd682c87447ff11d29c04c26b5623e730ab9a1ce0496456b3ba6122f97913bd92b86790 SHA512 e900a1c5f0f70163463557aec3de0d31394fac56cfed91ea53ee5cf852cce4b2998bf79be60fc547c1c34a1658378f3ed9dbfb30aae5a772b85d819c7e7ce458
 DIST qbittorrent-4.5.4.tar.gz 8791236 BLAKE2B 70b3194d6c4819655998406e0a13d22f3a5068e724048010daebd83d8b8db9e17daee943ca8dabaacd92a0fbc5249257de6d175b35287c748dc2d15395bd71fc SHA512 2e7988922137c9fade99e90236cc0c5b8b30f09021472f8ffc9048a7a2d989925eed7bfab4d79c93ca7d0f21acfde2e7feee5e6c43b557bf2c6f472fd52fbcea
 DIST qbittorrent-4.5.5.tar.gz 8802492 BLAKE2B 1d20d7900b5b65603c5cf13452fb5aebe396473290d4904641b78867c5345d783482c46edc7042a2e86e79afd790e8c470df62131595eba288f195cc5e716eec SHA512 8b5c2654b3bc03c0b4de77e8388ee543c3892ef9453749ea737aaee999a16d50bd1b30ebe0519a86d7ab8ffc6224d7d9cf678464aebf96433cd71dd57b46dd53
-DIST qbittorrent-4.6.0.tar.gz 9024538 BLAKE2B 5addeee21c9a5f05ca4b33a908c6480948dd22cc03524baf8f06429c2f1abb3c88115a53d434023e379561dda27ae43336068071c7f92949c550f6f8b4336a87 SHA512 217b3efe9c8e98eb5c9457d9aede91034b27f85a57ff93d57f51485b5224e85c63b51645b3f5126a51e48894d5065ed2ae3929dcabfcbbe6b036270286ffef3a
-DIST qbittorrent-4.6.1.tar.gz 9054911 BLAKE2B ace2f102f21287d7005fdd383bd44bed17894ad370ec7782684669f07c537e0c773acc90e89105794c02c023a4116dbe00fc99ba4ffae49c18159854baca9e5d SHA512 ed6db8174562cd2b96fec1e0c1532a65507cb7034841c9424f654a33866cbf9edc5974f101f0c01cd6c8fd7d76380b4252c4a804ee9776b34ec8ad1b386bdcd1
-DIST qbittorrent-4.6.2.tar.gz 9058275 BLAKE2B b55de1ab7cd08fe4ee6d89eb269b884abea6cb478cc65f74a8e2f718f16919248d7e7cf01f10b5c4065d978d5ad906a60320c336a5cda8beeae7d4fe8cc6c25d SHA512 04977ae048a7f377b5d6a3091b93bbb84b085be9fb48a4096104fd00b77aaf41c8e62f6b527e69a92ce2ab604e95a91222d5f286b9219d094777833c302418e4
+DIST qbittorrent-4.5.5.tar.xz 4352524 BLAKE2B 16252e43ca7dc5090bd385079ee2116cb03945808a0a5150ff9fa3573f31eab1ecfa9daff4bb1fd250373b282fb38902c169d412f5c24588eececd2446b8f988 SHA512 178e41d97067f94ff9d24cc62a24178c260116c1e4d6a12785fcb392d8391664c9ae054b46c623510a11c3ee753ae115fbfc40db09ddc4dc218c4b28942062ea
+DIST qbittorrent-4.5.5.tar.xz.asc 849 BLAKE2B d9d3d18c0c26898eccbad2c92b62f4f72f71f132cfbad5aa7ecefe0bde70f1e5890a2b6051178e98eacafb770a58ec3f55d6d0f5d29c5c32ffc33b4b47667b54 SHA512 3a7215d711fa89e88c47cebdfed57d059dad93836b2dd75b89e39ea46c97820212efb01334eee6149adca3b8dc0eec88f0be6ed71fca8764871428a992409d66
+DIST qbittorrent-4.6.2.tar.xz 4506224 BLAKE2B 74c2fa8ffdb6e0787559e943dd6e2c4d09b4d6bc6c72db01e47a001a99599bf7d6b12c0cd954b8db3bdacd2db5bb445d28e04d6abe6114b05242c3f5b5b2b56d SHA512 e4363a30bd722d4bd8144c484830caad5610ca273d40395e593e5b37b94f11f4a786481a770b847ee24517cb355d9bc2e27d07f2c66d4e852d1061a8edb7a75f
+DIST qbittorrent-4.6.2.tar.xz.asc 849 BLAKE2B 639dc8a75a926c9ec7ff42e52c93d33aa5494b6c64848778ad885d059c0272239c92fa935bcdab6477c4a20329d2c7538bdb9df5893a5e4264a604e264ed911e SHA512 ced33ae194a18c82c39318c07f160d5cc4a4f7ebebffb03cb16a555e4f277ad8d1305ec0e7c476bb51c5c50004501dbde6a729d05f1b557138414bab52ee21f9
+DIST qbittorrent-4.6.3.tar.xz 4512004 BLAKE2B b97022d2380e4cc1c4fdd06e7365136978f64b3ed98a4521e34197dcfa86c6e4032e0f9f7de1310a100a924f9a5250b145236d87f28317c4a79fe5d130d858b6 SHA512 13a7952bc8d0e57c24fcfb00ab8c7e5a1fdcb9c4755cb50f7f6b94a5cb01657e3b21996ff581366d957eaa36d90e14003c544c2376150d6041f14f42c4a03adc
+DIST qbittorrent-4.6.3.tar.xz.asc 849 BLAKE2B 34f61400fd340dd3770c600e57be36a434c5fcfed1d2d8ad9e050e7112a141f7aec3e6f94d3bcd7a893a7969344f6d7120aa908a3c8ed9451a475bd25a98a53a SHA512 0d2420be78fd66a7f1e0e8797f73fcbe462f08640adbc0c681f9321423eefb7805d3267ab144e8934f00a7ebeac0931f16c9fef199196e222b57a0153916696e

net-p2p/qbittorrent/metadata.xml

@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>eschwartz93@gmail.com</email>
+		<name>Eli Schwartz</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="webui">
 			Install qBittorrent Web UI (qbittorrent-nox) and systemd/OpenRC service

net-p2p/qbittorrent/qbittorrent-4.6.1.ebuild → net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild

@@ -1,9 +1,9 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake edo multibuild systemd xdg
+inherit cmake edo multibuild systemd verify-sig xdg
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="https://www.qbittorrent.org"
@@ -12,30 +12,28 @@ 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"
+	SRC_URI="
+		mirror://sourceforge/qbittorrent/${P}.tar.xz
+		verify-sig? ( mirror://sourceforge/qbittorrent/${P}.tar.xz.asc )
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/qBittorrent-release-${PV}
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+dbus +gui qt6 systemd test webui"
+IUSE="+dbus +gui qt6 test webui systemd"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gui webui )"
+REQUIRED_USE="|| ( gui webui )
+	dbus? ( gui )
+"
 
 RDEPEND="
-	acct-group/qbittorrent
-	acct-user/qbittorrent
 	>=dev-libs/openssl-1.1.1:=
 	>=net-libs/libtorrent-rasterbar-1.2.18:=
 	>=sys-libs/zlib-1.2.11
-	qt6? ( dev-qt/qtbase:6[network,ssl,sql,sqlite,xml] )
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtxml:5
-	)
 	gui? (
 		!qt6? (
 			dev-qt/qtgui:5
@@ -47,14 +45,26 @@ RDEPEND="
 			dev-qt/qtbase:6[dbus?,gui,widgets]
 			dev-qt/qtsvg:6
 		)
-	)"
+	)
+	qt6? ( dev-qt/qtbase:6[network,ssl,sql,sqlite,xml(+)] )
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtxml:5
+	)
+	webui? (
+		acct-group/qbittorrent
+		acct-user/qbittorrent
+	)
+"
 DEPEND="
 	${RDEPEND}
 	dev-libs/boost
 	test? (
 		!qt6? ( dev-qt/qttest:5 )
 	)"
-BDEPEND="
+BDEPEND+="
 	!qt6? ( dev-qt/linguist-tools:5 )
 	qt6? ( dev-qt/qttools:6[linguist] )
 	virtual/pkgconfig"
@@ -74,10 +84,14 @@ src_configure() {
 		local mycmakeargs=(
 			# musl lacks execinfo.h
 			-DSTACKTRACE=$(usex !elibc_musl)
+
 			# More verbose build logs are preferable for bug reports
 			-DVERBOSE_CONFIGURE=ON
+
 			-DQT6=$(usex qt6)
+
 			-DWEBUI=$(usex webui)
+
 			-DTESTING=$(usex test)
 		)
 
@@ -115,6 +129,8 @@ src_compile() {
 
 src_test() {
 	my_src_test() {
+		# cmake does not detect tests by default, if you use enable_testing
+		# in a subdirectory instead of the root CMakeLists.txt
 		cd "${BUILD_DIR}"/test || die
 		edo ctest .
 	}
@@ -126,6 +142,8 @@ src_install() {
 	multibuild_foreach_variant cmake_src_install
 	einstalldocs
 
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	if use webui; then
+		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	fi
 }

net-p2p/qbittorrent/qbittorrent-4.6.2.ebuild → net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake edo multibuild systemd xdg
+inherit cmake edo multibuild systemd verify-sig xdg
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="https://www.qbittorrent.org"
@@ -12,20 +12,25 @@ 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"
+	SRC_URI="
+		mirror://sourceforge/qbittorrent/${P}.tar.xz
+		verify-sig? ( mirror://sourceforge/qbittorrent/${P}.tar.xz.asc )
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/qBittorrent-release-${PV}
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+dbus +gui qt6 systemd test webui"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gui webui )"
+REQUIRED_USE="|| ( gui webui )
+	dbus? ( gui )
+"
 
 RDEPEND="
-	acct-group/qbittorrent
-	acct-user/qbittorrent
 	>=dev-libs/openssl-1.1.1:=
 	>=net-libs/libtorrent-rasterbar-1.2.19:=
 	>=sys-libs/zlib-1.2.11
@@ -47,14 +52,19 @@ RDEPEND="
 			>=dev-qt/qtbase-6.2:6[dbus?,gui,widgets]
 			>=dev-qt/qtsvg-6.2:6
 		)
-	)"
+	)
+	webui? (
+		acct-group/qbittorrent
+		acct-user/qbittorrent
+	)
+"
 DEPEND="
 	${RDEPEND}
 	>=dev-libs/boost-1.71
 	test? (
 		!qt6? ( dev-qt/qttest:5 )
 	)"
-BDEPEND="
+BDEPEND+="
 	!qt6? ( dev-qt/linguist-tools:5 )
 	qt6? ( >=dev-qt/qttools-6.2:6[linguist] )
 	virtual/pkgconfig"
@@ -115,6 +125,8 @@ src_compile() {
 
 src_test() {
 	my_src_test() {
+		# cmake does not detect tests by default, if you use enable_testing
+		# in a subdirectory instead of the root CMakeLists.txt
 		cd "${BUILD_DIR}"/test || die
 		edo ctest .
 	}
@@ -126,6 +138,8 @@ src_install() {
 	multibuild_foreach_variant cmake_src_install
 	einstalldocs
 
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	if use webui; then
+		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	fi
 }

net-p2p/qbittorrent/qbittorrent-4.6.0.ebuild → net-p2p/qbittorrent/qbittorrent-4.6.3.ebuild

@@ -1,9 +1,9 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake edo multibuild systemd xdg
+inherit cmake edo multibuild systemd verify-sig xdg
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="https://www.qbittorrent.org"
@@ -12,51 +12,61 @@ 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"
+	SRC_URI="
+		mirror://sourceforge/qbittorrent/${P}.tar.xz
+		verify-sig? ( mirror://sourceforge/qbittorrent/${P}.tar.xz.asc )
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/qBittorrent-release-${PV}
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+dbus +gui qt6 systemd test webui"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gui webui )"
+REQUIRED_USE="|| ( gui webui )
+	dbus? ( gui )
+"
 
 RDEPEND="
-	acct-group/qbittorrent
-	acct-user/qbittorrent
 	>=dev-libs/openssl-1.1.1:=
-	>=net-libs/libtorrent-rasterbar-1.2.18:=
+	>=net-libs/libtorrent-rasterbar-1.2.19:=
 	>=sys-libs/zlib-1.2.11
-	virtual/libiconv
+	qt6? ( >=dev-qt/qtbase-6.2:6[network,ssl,sql,sqlite,xml] )
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtxml:5
+	)
 	gui? (
-		dev-libs/geoip
 		!qt6? (
 			dev-qt/qtgui:5
 			dev-qt/qtsvg:5
 			dev-qt/qtwidgets:5
-			dev-qt/qtcore:5
-			dev-qt/qtnetwork:5[ssl]
-			dev-qt/qtsql:5[sqlite]
-			dev-qt/qtxml:5
 			dbus? ( dev-qt/qtdbus:5 )
 		)
 		qt6? (
-			dev-qt/qtbase:6[dbus?,gui,widgets]
-			dev-qt/qtsvg:6
-			dev-qt/qtbase:6[network,ssl,sql,sqlite,xml(+)]
+			>=dev-qt/qtbase-6.2:6[dbus?,gui,widgets]
+			>=dev-qt/qtsvg-6.2:6
 		)
-	)"
+	)
+	webui? (
+		acct-group/qbittorrent
+		acct-user/qbittorrent
+	)
+"
 DEPEND="
 	${RDEPEND}
-	dev-libs/boost
+	>=dev-libs/boost-1.71
 	test? (
 		!qt6? ( dev-qt/qttest:5 )
 	)"
-BDEPEND="
+BDEPEND+="
 	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
+	qt6? ( >=dev-qt/qttools-6.2:6[linguist] )
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md )
@@ -115,6 +125,8 @@ src_compile() {
 
 src_test() {
 	my_src_test() {
+		# cmake does not detect tests by default, if you use enable_testing
+		# in a subdirectory instead of the root CMakeLists.txt
 		cd "${BUILD_DIR}"/test || die
 		edo ctest .
 	}
@@ -126,6 +138,8 @@ src_install() {
 	multibuild_foreach_variant cmake_src_install
 	einstalldocs
 
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	if use webui; then
+		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	fi
 }