gentoo auto-resync : 27:11:2024 - 02:00:00

5 files changed, 138 insertions, 112 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index f835aa7bfa55..af6aa783b97d 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/biglybt/Manifest b/net-p2p/biglybt/Manifest
index 1d8b0bb8dcf2..dc2bee79a149 100644
--- a/net-p2p/biglybt/Manifest
+++ b/net-p2p/biglybt/Manifest
@@ -3,8 +3,6 @@ AUX biglybt-3.2.0.0-disable-shared-plugins.patch 553 BLAKE2B b4844e817c76ddb03ac
 AUX biglybt-3.5.0.0-Entities.javadoc.patch 1378 BLAKE2B 0984fcc6d342a3b54129b0196611a9b76d3aad4e7fa0b8cba7d43ac8bb7102a92072e9e288a979f7a92cf1ac496868be863b51e9a1fb3b3d83aad7ae25a1d5eb SHA512 c7987683558224f7752dbdc91d10147c5a4fbe4c0a7db47a2dd495e728d3f8b2aa4c7ec5712163160a60431e5d043f86e4018becc63fe61f8909dcdd7201f41d
 AUX biglybt-3.6.0.0-disable-PluginUpdatePlugin.patch 1374 BLAKE2B 9f2e72b24e20db59ba57df5591e3a722b114b697f6bd4c872c5a2b41eae1310d03489c03c353748cb877735a698e3ee5bced62809ab2bf30f8bf7609be9e07a2 SHA512 dd4dc70157685acdcd0e4c4e61058367489ef4081fc027c858a31af85e5b84432d2146c7a4742ff644ae6bf79a60e2c08d5a68590829c66c008a490c9cb04247
 AUX biglybt-3.6.0.0-fix-ambiguous.patch 572 BLAKE2B 931cc112671559a05420be81ba41cbdfc40ff28ea255f1af7789ae558a7c8c7b7b8fe9f4d5fceea43a54eab0f2a0c6da4ff99ed97fb1c3a663ab7c5999316691 SHA512 38c49b47952832d9be3a793c0ab2f50051bbf729df51c8ce55308830d5982431b60b7a96cc1f9ebd4b4dec388d38b766e35562358fed50dbf345c3e8c79d995d
-DIST biglybt-3.6.0.0.tar.gz 43972902 BLAKE2B 76995d3d5f24f054690e609d2be7bd822f6c8573b6627bcf380c3a93be86265f4ca827c2991db65ef39c9f3f79b0cd8e0aebce492571a36bf237c95fc3d6cc54 SHA512 b56beb006ab813efa2ab2aff8563a04675e677ea70fe6ef72062e2d38ec753749b36740ae87f851739cb1389948a916273cb6ffb65758e651d0701a7f6237afd
 DIST biglybt-3.7.0.0.tar.gz 44021778 BLAKE2B 9ce54062b298d2e47f9fcc88a3fa8da935c7d3c4ad24f28cf2975300b78140b547e3e43c377cae50fd1276d49d53a43bc77e36957133dc6fe1fa7e301ebe80fe SHA512 815ce2f2b327de266650d9650dcbc539247dca2a8bce727ca0a4fc6eb7dfbcee770ffce04dd3b96aef458df1ee20ce39229f6a3d409725a532d081c82d4504bd
-EBUILD biglybt-3.6.0.0-r3.ebuild 3072 BLAKE2B 0ec4692ea5073d5fb19abf3c2d67645e70a96d97ac345f0916be33718bac21e54440aba0c43a2b2dad1569f859555f2ab25281cf370b30191a6d1fa71e886ced SHA512 7f54629997baf7b75923e7b642df95518ccbc9894cc7fce6421e4476f2ac63da000aaedb980e6cbfc90f32da2202acec87b9af1271bef9371811d50212d2fa70
 EBUILD biglybt-3.7.0.0.ebuild 3465 BLAKE2B 246efe53983202031a12f7ced0ad1e9dfdc6e8419fe766a5d8a8666e1ff2cb873c3733e79ad609fec0e5c12e36bdb31177160d481f21b917e0cd20345f38afe3 SHA512 152ef03ea7d4f11af5b9e84d04de35ebb7b0c7d4e05d1ed8143085e972fea5e476ef674393ef063dc8beb00e6f86f38aec98bccd0253bb966459ddbce0bd1689
 MISC metadata.xml 1037 BLAKE2B 94d91f9e0d91ba78bcbdf28871607f962f545850d100143f13b494a8326f4b6a2f275eafeede9965b06f6a2bf08129d6061eae843d73a37786bbd5cb94dca20c SHA512 df94d8b3acd4e6e801eee6243f22b0f01d782ee904b28b34519f5cab39ddde0acf676be1e975e24f19d5f3cffd833be6c7b0a5342c17dd6b8841d1b85a452b39
diff --git a/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild b/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild
deleted file mode 100644
index 05df130f4bb3..000000000000
--- a/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# No tests, #839681
-JAVA_PKG_IUSE="doc source"
-MAVEN_PROVIDES="com.${PN}:${PN}-core:${PV} com.${PN}:${PN}-ui:${PV}"
-
-inherit desktop java-pkg-2 java-pkg-simple optfeature xdg
-
-DESCRIPTION="Feature-filled Bittorrent client based on the Azureus open source project"
-HOMEPAGE="https://www.biglybt.com"
-SRC_URI="https://github.com/BiglySoftware/BiglyBT/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/BiglyBT-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	dev-java/commons-cli:0
-	dev-java/swt:4.27[cairo]
-"
-
-# Due to removal of AENameServiceDescriptor it would fail to start under jdk:1.8
-# StartServer ERROR: unable to bind to 127.0.0.1:6880 listening for passed torrent info: \
-# sun.net.spi.nameservice.NameServiceDescriptor: Provider com.biglybt.core.util.spi.AENameServiceDescriptor not found
-# Restricting to jdk:11 for https://bugs.gentoo.org/888859
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=(
-	CODING_GUIDELINES.md
-	CONTRIBUTING.md
-	ChangeLog.txt
-	README.md
-	TRANSLATE.md
-)
-
-JAVADOC_SRC_DIRS=( {core,uis}/src )
-
-PATCHES=(
-	"${FILESDIR}/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch"
-	"${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch"
-	"${FILESDIR}/biglybt-3.5.0.0-Entities.javadoc.patch"
-	"${FILESDIR}/biglybt-3.6.0.0-disable-PluginUpdatePlugin.patch"
-	"${FILESDIR}/biglybt-3.6.0.0-fix-ambiguous.patch"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	# AENameServiceDescriptor fails to compile with jdk >= 11
-	# "error: package sun.net.spi.nameservice does not exist"
-	# https://github.com/BiglySoftware/BiglyBT/pull/2611
-	rm -r core/src/com/biglybt/core/util/spi || die
-
-	cp -r core/{src,resources} || die
-	find core/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
-
-	cp -r uis/{src,resources} || die
-	find uis/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
-}
-
-src_compile() {
-	einfo "Compiling module \"core\""
-	JAVA_JAR_FILENAME="${PN}-core.jar"
-	JAVA_RESOURCE_DIRS="core/resources"
-	JAVA_SRC_DIR="core/src"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA="${PN}-core.jar"
-
-	einfo "Compiling module \"uis\""
-	JAVA_JAR_FILENAME="BiglyBT.jar"
-	JAVA_LAUNCHER_FILENAME="${PN}"
-	JAVA_MAIN_CLASS="com.${PN}.ui.Main"
-	JAVA_RESOURCE_DIRS="uis/resources"
-	JAVA_SRC_DIR="uis/src"
-	java-pkg-simple_src_compile
-
-	if use doc; then
-		einfo "Creating javadoc"
-		JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
-		ejavadoc
-	fi
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	make_desktop_entry "${PN}" BiglyBT "${PN}" "Network;FileTransfer"
-
-	if use source; then
-		java-pkg_dosrc "core/src/*"
-		java-pkg_dosrc "uis/src/*"
-	fi
-	default
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature_header "If you are using plugin proxies you might want to swap them for these native packages:"
-	optfeature "I2P SOCKS proxy" net-vpn/i2p net-vpn/i2pd
-	optfeature "TOR SOCKS proxy" net-vpn/tor
-}
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 3dc59cb686dc..37bd0f9b0d89 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -4,7 +4,10 @@ DIST qbittorrent-4.6.7.tar.xz 4539016 BLAKE2B 8565fdc298e5085b10b52442874ce2d9b9
 DIST qbittorrent-4.6.7.tar.xz.asc 849 BLAKE2B e63d1fc1c8c6b9a70551bd717a2614b8548bd93656b578f4289d720c2784508ca90971f995fa6c8b6dc26ed6a7f976d294e44d4e384bb3de30791f26ff930017 SHA512 820e329921d23409560fa2a2f3e714b233154783da5bb8fdcf7ed70c90df69d5140d8159f8d52dc1a9b5cc32306580a08e56c02b55f0e2b00c16cbf9f6982baa
 DIST qbittorrent-5.0.1.tar.xz 4539900 BLAKE2B c10c183750929da0a1c365668472495afcdc8e677e2cfc8693ade0bb5ad97c522eeb2a0f4ad81d4e997419ad58a596ad6ad0185273d2c0f2c920f1e7239a3326 SHA512 a7bbfb762f60bea9cb0fa3870753171fb6f946790da0e4125fa11d6c1cd6a7548307c506e9947e0676d0c66ee7cdbaefa80a513c436d2e0d0c6383bc390c12d2
 DIST qbittorrent-5.0.1.tar.xz.asc 849 BLAKE2B 881abc7bfb0b65da82e2f5fdaca4ee152b7dafcd11e425416244e682f94af8f68b6f365cc36361909179d9d867047a532efae54dc5454c371cef7b05c7dc8830 SHA512 a75860dcc9e1fc9162c7460b56723586d6ed434f01c2d4e628884e5146ef59d904c864eeff80753d374c2eeb86d59c90a954518b3a2b68d279787313fcfd8a96
+DIST qbittorrent-5.0.2.tar.xz 4544624 BLAKE2B 6e651f3aa4254344a9f41cf507154062ee829d34b7dff553d4745594a5d5f73e71af30bc525adb460c56e8e76afe73d1630dd5b9e8dfae75e0222501a0dde897 SHA512 1834a3bce051c1c707c4cf7282241a2985a4d090c69cc62d634033b3c85cac2421a16d510041e5961c31202ae8f304d726c320819591bc4a093d6fd39c80b517
+DIST qbittorrent-5.0.2.tar.xz.asc 849 BLAKE2B 50bf568304b894b228ea92ec4c63e9caa0c59bded5c1b16b034084364f1819816e6d437db64eaf670474e224184e9709acad089d522a54d78a12f8b5b19e6746 SHA512 33854f521881547177590c03be82a61d2eee13fd62a541287626c66b90f0f10e05bc7cbd085caa40d6ed3dcc7a8f585d0466d537e5ff5a50bc728d60d63f6519
 EBUILD qbittorrent-4.6.7.ebuild 3133 BLAKE2B 22bbb7549b402d91a0626f2bd0b55c88172777a3c6f5ea613970f8442102044a633535adcf8b031f9da0551a2ca3ebe2032264fb8547b0020e18273849a34b67 SHA512 2fe64e7c99bc8e9cad0a623073321d16b8cd7ce80b7dfce6c8dbede8fdf0bb0f46fb31e8be123f77ea10b924dd4bedc63ffe1f4044e4b02081bffef03463ad74
 EBUILD qbittorrent-5.0.1.ebuild 2936 BLAKE2B 45a4c9d302848f3f06bbf3847cdd2eeab8a6e75dc87f7b9c2a4a01c0aa3de812ab4550d92b5e138684adb69802415d1091813958ca06e7fb0432dd072315ec20 SHA512 b05cc99407d53b8f3886c6e5d91d175cfc0042e32f64d8030c16e2cf69a97198e9a7c19bee687c931a2c8854f06254c6b570f31a80ada8ee366e2802821d548b
+EBUILD qbittorrent-5.0.2.ebuild 2936 BLAKE2B 45a4c9d302848f3f06bbf3847cdd2eeab8a6e75dc87f7b9c2a4a01c0aa3de812ab4550d92b5e138684adb69802415d1091813958ca06e7fb0432dd072315ec20 SHA512 b05cc99407d53b8f3886c6e5d91d175cfc0042e32f64d8030c16e2cf69a97198e9a7c19bee687c931a2c8854f06254c6b570f31a80ada8ee366e2802821d548b
 EBUILD qbittorrent-9999.ebuild 2936 BLAKE2B 45a4c9d302848f3f06bbf3847cdd2eeab8a6e75dc87f7b9c2a4a01c0aa3de812ab4550d92b5e138684adb69802415d1091813958ca06e7fb0432dd072315ec20 SHA512 b05cc99407d53b8f3886c6e5d91d175cfc0042e32f64d8030c16e2cf69a97198e9a7c19bee687c931a2c8854f06254c6b570f31a80ada8ee366e2802821d548b
 MISC metadata.xml 870 BLAKE2B c6cd86df29112cf22aacaa1aeab2e7a89e079c3a69c20cda566b7f41cf3cf4927372634eb31c7eb98466bb7507d201ebddd11fe1dd7f3fbfb3c6bda7fcfdaf6b SHA512 e74f65416253e8ec68d1ca0062766eef5b2e040c1dcbee77675afb7c6ac9ccbcada48028ebc1db80783c22d58be0dad9fe2075ab9e350b359fab2c5b987cc040
diff --git a/net-p2p/qbittorrent/qbittorrent-5.0.2.ebuild b/net-p2p/qbittorrent/qbittorrent-5.0.2.ebuild
new file mode 100644
index 000000000000..e40ab0f8d98e
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-5.0.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake edo multibuild optfeature systemd verify-sig 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://downloads.sourceforge.net/qbittorrent/${P}.tar.xz
+		verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc )
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="+dbus +gui systemd test webui"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( gui webui )
+	dbus? ( gui )
+"
+
+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]
+	gui? (
+		>=dev-qt/qtbase-6.5:6[dbus?,gui,widgets]
+		>=dev-qt/qtsvg-6.5:6
+	)
+	webui? (
+		acct-group/qbittorrent
+		acct-user/qbittorrent
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-libs/boost-1.76
+"
+BDEPEND+="
+	>=dev-qt/qttools-6.5:6[linguist]
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md )
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use gui && MULTIBUILD_VARIANTS+=( gui )
+	use webui && MULTIBUILD_VARIANTS+=( nogui )
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	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)
+			-DTESTING=$(usex test)
+		)
+
+		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)
+				-DSYSTEMD=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DGUI=OFF
+				-DDBUS=OFF
+			)
+
+			use systemd && mycmakeargs+=(
+				# 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
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_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 .
+	}
+
+	multibuild_foreach_variant my_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+	einstalldocs
+
+	if use webui; then
+		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "I2P anonymyzing network support" net-vpn/i2pd net-vpn/i2p
+}