gentoo resync : 06.04.2022

11 files changed, 41 insertions, 275 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index e4e02b098049..088ea590993b 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 6e705c93ae7d..db9acc6141ef 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -2,6 +2,5 @@ AUX gtk-gnutella-1.2.1-glibc234.patch 1881 BLAKE2B 4f4ce21452694eefcbf2c9e70d4ae
 DIST gtk-gnutella-1.2.1.tar.gz 25055800 BLAKE2B 09f68979bc4df130e2b7b4a78017c2834feab1173d6242fe07856be038b9c671609fee7a7ec270fd6f9592a2fb2bfa0bf8a08472da0f41f6e3dc2dfaafd5ed58 SHA512 e53c8e0f7d11f699e9eb77546f3d6ca240ee9fa92e8817af4631250d86714b97eb36fbcd83e46d8429cbd12532c9c9a343a2ba69eba6deda4bc9c5610e98efc8
 DIST gtk-gnutella-1.2.2.tar.gz 26708793 BLAKE2B 9b8c1600914f5679c017929afa6d1f508734b21d95231c15588c64d9b1e9185ddb82ee26478d5d5d34c715fd475ccfe1e65b4b96ed4acc271444d21317013630 SHA512 d4825bb765d9b73b24d1dc7238a31c5e78c9adb7c765b0b913d4fce1467fb3655ac3214381748bca20fd3e02345ba0583d591e2177299d5130951808cd7bd325
 EBUILD gtk-gnutella-1.2.1-r1.ebuild 2004 BLAKE2B 1b99506811c773d08c2ca6790f092a8d8cc93ece606c406273f4f6dfd4d58bbb4cd50e0cb98b4f79ece7904f4ab601ce2408c76fd0f58bcaac1c3a6f5628c196 SHA512 f3cdcee9ce2c58f0c48124caf128e86ecd59960acf2525569d2791f89fbfa1246b3c864ccdd4ffabb44c67cb2eedab7753eb86618fedeadb79e4ec0ac5ce0703
-EBUILD gtk-gnutella-1.2.1.ebuild 1957 BLAKE2B 63bbc55dc17bd5ec75700ee418e39805f41c4dd092fd97769ca7c90879a3e0612a7cebc871337208e6f9ffaece7ddc20af6f88e2673de0b007e73f190984f60c SHA512 dda6cd29fb30418ee4a6055870c5085333e3fc259720e03366ff629cdba2f0af57959e498de0371ecf75ff1b80558902edfbef57aad32623af650a9f139474be
 EBUILD gtk-gnutella-1.2.2.ebuild 1961 BLAKE2B 63beb42dcb0828cd17c652a52d3880f62ce9ec3d708b94aeab80f37a858d2283f5c212abad91f1a3ae18ef713e0425a4488312db67a35af3ea4b71b1bb9a86fd SHA512 de1f0d91a88722b04f56364cbb8006ad6db7b2b40c1e084ec55ed22fe3567a46f2c3da733aeb47a6736817bc1a0e000cea941444783b1c1a3e27810258e28cee
 MISC metadata.xml 300 BLAKE2B e9ffeb0b3d0f0d277f266cc32ed360a56a1cc6c3201e309d091098f476a19fe534d224c8c941c3f954ef6c4b5b27cd526bd834b893a39fbb5ada5bb6a776e689 SHA512 d54f62330468cb7be81b4f1d465196cf17e96f6688e7c754b9c4a01445eb0228e88726624f0087307a107f00181fcc9114fb8df94c8cb8620d9340cf38f7e9f0
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1.ebuild
deleted file mode 100644
index c81ce2d3af4e..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic strip-linguas toolchain-funcs
-
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="https://github.com/gtk-gnutella/gtk-gnutella/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="CC-BY-SA-4.0 GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	dev-libs/glib:2
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
-	dbus? ( >=sys-apps/dbus-0.35.2 )
-	ssl? ( >=net-libs/gnutls-2.2.5 )
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	filter-flags -flto
-	strip-linguas -i po
-
-	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-	for ling in ${LINGUAS}; do
-		echo $ling >> po/LINGUAS
-	done
-
-	default
-}
-
-src_configure() {
-	# There is no option to turn off optimization through the build.sh
-	# script.
-	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
-
-	# The build script does not support the equivalent --enable
-	# options so we must construct the configuration by hand.
-
-	local myconf
-
-	if ! use nls; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if ! use dbus; then
-		myconf="${myconf} --disable-dbus"
-	fi
-
-	if ! use ssl; then
-		myconf="${myconf} --disable-gnutls"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --gtk2"
-	else
-		myconf="${myconf} --topless"
-	fi
-
-	./build.sh \
-		--configure-only \
-		--prefix="/usr" \
-		--cc="$(tc-getCC)" \
-		${myconf}
-}
-
-src_compile() {
-	# Build system is not parallel-safe, bug 500760
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	emake INSTALL_PREFIX="${D}" install
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Touch the symbols file into the future to avoid warnings from
-	# gtk-gnutella later on, since we will most likely strip the binary.
-	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
-}
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 472c5a271de9..11968f7e07b4 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,10 +1,10 @@
 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.0.tar.gz 9037875 BLAKE2B b3789151a0e8b75bebecd84edcb5d75a1cf82674a5984c0ac8bb85d73dc90285fc7109b11ba593cd721fc4a45e87a69e00e85a47d79ed87423e538f56f2334c8 SHA512 7b1d4d45884d90bec14a28f01c9bdab0c9e2af496ade219393f4ccb14b9bb2901fc043407186da0efa1176f7fc9d1b1478864588e3869e363eb0eb35e5fe5c3f
 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
 EBUILD qbittorrent-4.3.9.ebuild 1374 BLAKE2B 50f1b1faee3b77468c8ce4b256be7e1ee9e302a7df26e4fa35e3e4dbeb2c12bcd60e271ea1fd5d0dc81e62ca04f65da672e7a4db5ec4af06c56995611dcb554c SHA512 8cd9ff1452e4fd6122e559fea1b147d34cb8ac7b2337ebaf3fdd536fb1cadb88ee8feb29fb409c0312341e7a37491ace10611ad1dc28cab41eef279a61fe8e43
-EBUILD qbittorrent-4.4.0-r1.ebuild 1399 BLAKE2B a6b232ba882073348baa886f7a2700fbbd1eb5085e3e2261e332838758647f750fcf15697f9285a3a724ddd3e8c12298e5b980c4455299754197892e3aa3b63c SHA512 a20c26fba516a82edb6e3941ffe71d766f9a10680f7e5b58b4d22e6931c4a655720f01f43d770b3300b01bda2df1e7e73aeafde2896cd01e1fc5457c69517637
 EBUILD qbittorrent-4.4.1-r1.ebuild 1557 BLAKE2B ed43407db9273772656dfedbaf8d09e320c193482938c271e4655852fb0badf82f7647b1255c2660a9371dca00644bab4e401be666e7f87587a9f1f8e17cae48 SHA512 b305563d9126c1aa6916d8efbe2d256569b5a9207baa4676a3089fec2214682995978a14aea04e679dbc5b01eaaf826ab5123f0272e71db2935a41dbfadf33d7
+EBUILD qbittorrent-4.4.2.ebuild 1557 BLAKE2B ed43407db9273772656dfedbaf8d09e320c193482938c271e4655852fb0badf82f7647b1255c2660a9371dca00644bab4e401be666e7f87587a9f1f8e17cae48 SHA512 b305563d9126c1aa6916d8efbe2d256569b5a9207baa4676a3089fec2214682995978a14aea04e679dbc5b01eaaf826ab5123f0272e71db2935a41dbfadf33d7
 EBUILD qbittorrent-9999.ebuild 1557 BLAKE2B ed43407db9273772656dfedbaf8d09e320c193482938c271e4655852fb0badf82f7647b1255c2660a9371dca00644bab4e401be666e7f87587a9f1f8e17cae48 SHA512 b305563d9126c1aa6916d8efbe2d256569b5a9207baa4676a3089fec2214682995978a14aea04e679dbc5b01eaaf826ab5123f0272e71db2935a41dbfadf33d7
 MISC metadata.xml 453 BLAKE2B 0a68996aacf4ff1e56423417f8808bb66aa9563aaa3ef87c863539edd8173f32cc4a1b0061a5c9ecd63801c51ec52c54bd61ffcd869fc74dc24c2b042ec218d5 SHA512 90d52e221f153737c99b353a052683e0340f098f773b28e0d5b9d0c729b747beedadb4193c45a1f4c3df998436d194e089434aa621421bf127d049d90a14a434
diff --git a/net-p2p/qbittorrent/qbittorrent-4.4.0-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.4.2.ebuild
index d95a557bc835..85869e0799fd 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.4.0-r1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit xdg-utils
+inherit cmake systemd xdg
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="https://www.qbittorrent.org
@@ -20,50 +20,55 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+dbus debug webui +X"
-REQUIRED_USE="dbus? ( X )"
+IUSE="+dbus +gui webui"
+REQUIRED_USE="dbus? ( gui )"
 
 RDEPEND="
-	>=dev-libs/boost-1.62.0-r1:=
+	>=dev-libs/boost-1.65.0-r1:=
+	dev-libs/openssl:=
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtxml:5
 	dev-qt/qtsql:5
-	>=net-libs/libtorrent-rasterbar-1.2.12:0=
+	dev-qt/qtxml:5
+	>=net-libs/libtorrent-rasterbar-1.2.14:=
 	sys-libs/zlib
 	dbus? ( dev-qt/qtdbus:5 )
-	X? (
+	gui? (
 		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"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5
+	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)
-}
+	local mycmakeargs=(
+		-DDBUS=$(usex dbus)
+		-DGUI=$(usex gui)
+		-DWEBUI=$(usex webui)
 
-src_install() {
-	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
-	einstalldocs
-}
+		# 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
 
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
+		# Not yet in ::gentoo
+		-DQT6=OFF
+	)
+
+	cmake_src_configure
 }
 
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
+src_install() {
+	cmake_src_install
+	einstalldocs
 }
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 020d59814ff2..cc9c4baa64f1 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -4,6 +4,6 @@ AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
-EBUILD transmission-3.00-r1.ebuild 3256 BLAKE2B 0915f1e91b5925f74f94d8d20835979eda34f2a0f7564a0297b7456ef31f00d0a518c46fc2e60e2522108c16e4387b5808e5a6aae8eac12c3239f27ed9ced5db SHA512 b04509dbeb7de35adc96fc06777d7963536346f1d24b0805390448a99fe43d430072d3336614bb714d3bbab69cac1602d3251ffa314289f015146aa4d514055e
-EBUILD transmission-9999.ebuild 3266 BLAKE2B cac1d2d3b7e303266fb41f4be9f2df121dc975aed85b07a315f1d426cbbee179c22f95c8b821f50356046b06f1e1734d72f3465e3bd2932f786e3df60810848d SHA512 ffcb4ef1dafda19ac365728c430ae8a5fe46b06058a23bda2de81253541711bc7734e26965d1e73f8f578bc8dd96c620d1bc7f4ddcb0f41419f885baa2323e46
+EBUILD transmission-3.00-r1.ebuild 3221 BLAKE2B 2f1e00ac4ed9b4ea681b34a7cb96d26ba0838f6d179bf83df3bf456cb4e97332e8298c160d6be3df76aced2aa70f36e9580766e6a2ced7533fd47b999f3b968e SHA512 6f87a0be3c0d505b0123dddf18a0ef90a604dc8c7b633cc950351df2a3f43050f1c2640057f563360128b58dba48eebe58ae1d06be16697b254bce73d0e00f34
+EBUILD transmission-9999.ebuild 3224 BLAKE2B 73f74f312702530a3c8deb12c6dfa6c9eb02e252e612bbb43a0010553c620ddc8a138f536b4a9848e638355fd9dc82dd7edfc74a41ece6eacab10ce600c10c47 SHA512 97234ce8d308ab13bc418332025ecc0dcd992245c9766904551381535301c98c18db39c6f7d1fccc46a807b4074d97eb505c70ee85ff44f945d1c2bd305fadd5
 MISC metadata.xml 564 BLAKE2B 708f42109f5c57d776242ad935684b78a7f6cc72c439e2bb76d2fb29fb770f5054c6765df0665244c650bc930eeb312957f4749967a9b2771b8a6d032767d3b0 SHA512 22f2e75b57b24f1367cdcfe28600cfa09dab9d741ff1ab84a25052dc455272b9d9d6d62d297bdbd23e9955d41cabb540f0348c0554c465371e81175525be1ddb
diff --git a/net-p2p/transmission/transmission-3.00-r1.ebuild b/net-p2p/transmission/transmission-3.00-r1.ebuild
index 6198bf9dfff7..bf200a7a2c74 100644
--- a/net-p2p/transmission/transmission-3.00-r1.ebuild
+++ b/net-p2p/transmission/transmission-3.00-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2006-2021 Gentoo Authors
+# Copyright 2006-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
@@ -32,7 +32,6 @@ BDEPEND="${ACCT_DEPEND}
 	virtual/pkgconfig
 	nls? (
 		gtk? (
-			dev-util/intltool
 			sys-devel/gettext
 		)
 		qt5? (
@@ -68,7 +67,6 @@ DEPEND="${COMMON_DEPEND}
 	nls? (
 		virtual/libintl
 		gtk? (
-			dev-util/intltool
 			sys-devel/gettext
 		)
 		qt5? (
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index 263035fd7e17..07d9d10d6c58 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2006-2021 Gentoo Authors
+# Copyright 2006-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,6 @@ BDEPEND="${ACCT_DEPEND}
 	virtual/pkgconfig
 	nls? (
 		gtk? (
-			dev-util/intltool
 			sys-devel/gettext
 		)
 		qt5? (
@@ -68,7 +67,6 @@ DEPEND="${COMMON_DEPEND}
 	nls? (
 		virtual/libintl
 		gtk? (
-			dev-util/intltool
 			sys-devel/gettext
 		)
 		qt5? (
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 8c24bb0754b0..fc4547fa3d63 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -10,6 +10,5 @@ AUX vuze-5.7.6.0-commons-lang.patch 7613 BLAKE2B 00df394b0dddd442b693251d29a3bfd
 AUX vuze-5.7.6.0-log4j-12-api.patch 5749 BLAKE2B 87a63f03103e15a0a6d3ec6a44ef678c00b679ff205ce56d821676188a2042f8933b3dc9cdd623a89b1f5d225e1c94c29fe4b6ada7769ab3ccfab589c961518d SHA512 ded2cce1292e0cff747ed1e0209ab5f5728e5a2ac5d8f7037edba2380ca32e02fa6ae4f66f27780381ac53f347d0957ba04cf0cda468f54bf97769c8fcf3601c
 AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
 DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5
-EBUILD vuze-5.7.6.0-r1.ebuild 4068 BLAKE2B 1df51a38b5663a9869e2f572341cc0e7ddddfe5544ce659ea5f7419921349e83663f62fa52dfc3f3b72d6047b03a5e7975c583de619d765de1467e0d7810f2b1 SHA512 3d31e3b0bb898524720a4807762bbb17df573f0f6886ed5dd930c6a3be22f064355d86f09c6d4ff0dba7b0a08ca32bf53508799eff15a0e5cd9a4a2c8f02adb4
-EBUILD vuze-5.7.6.0-r2.ebuild 4098 BLAKE2B 04dfbae72fad9888e0afb25dbaec305c425ab180d5fcfc5e1ecd170fea5c7fe126ff1b25e59f8fa1d2a70b08d88eba09af4eef3a3c92cdf5fed416eb3ba7454d SHA512 1410ebef22239adfce4672496698aa33abf94472376c778646d7b607c47da43aaca130f8538394a1d13d6b3257103d77bba1fb8b6dd78ac77f11adff30f256fc
+EBUILD vuze-5.7.6.0-r2.ebuild 4096 BLAKE2B e15647da511f1e401a347ce00fe3729ba0ac4746faa2b978d159a3d65c479183c2a7d70c338532ee48bac0e8dcd044ab1be03c9f76c448330bdae5f31813e4c8 SHA512 757c168467002b4795c80d59b75e7facd8360c4137fe6e01c9e963c920c347551237abed5dfe416d177aa53198175360c1d66baaf62cab5ab759e0346b5a79cc
 MISC metadata.xml 314 BLAKE2B 6e8758ffb95e1641ddb121951555ed9a9da59d48688db9bc51cf9d2d02574faddf35d874a9ca901e73f47bf456221bd8b5f2035b3e789ea13196a8c2c58b03c4 SHA512 bf06d56995ee3bb79073d3c12ed3486126dc336dc77d0fb86a6fb3229596df39836e0f0682128b883c66eb02061aff512ef64299f6cd2067bb10bd6c7f63527e
diff --git a/net-p2p/vuze/vuze-5.7.6.0-r1.ebuild b/net-p2p/vuze/vuze-5.7.6.0-r1.ebuild
deleted file mode 100644
index a26544780ba1..000000000000
--- a/net-p2p/vuze/vuze-5.7.6.0-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit desktop edos2unix java-pkg-2 java-ant-2 xdg-utils
-
-MY_PV=$(ver_rs 1- "")
-MY_SRC="Vuze_${MY_PV}"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# bundles parts of http://www.programmers-friend.org/
-# bundles bcprov - 1.37 required but not in the tree
-CDEPEND="
-	dev-java/log4j:0
-	dev-java/swt:3.8[cairo]
-	dev-java/commons-cli:1
-	dev-java/commons-text:0
-	dev-java/json-simple:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-# does not compile with java 11, uses classes deprecated even in java 8
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	virtual/jdk:1.8"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0.0-java5.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
-	"${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
-	"${FILESDIR}"/${PN}-5.7.6.0-commons-lang.patch
-)
-
-src_unpack() {
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	unpack ${A}
-
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	if [[ -f build.xml ]]; then
-		die "upstream has build.xml again, don't overwrite"
-	fi
-	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
-}
-
-src_prepare() {
-	# upstream likes randomly changing a subset of files to CRLF every release
-	edos2unix $(find "${S}" -type f -name "*.java")
-
-	default
-
-	# OSX / Windows
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	# Tree2 file does not compile on linux
-	rm -rf "${S}"/org/eclipse || die
-	# Bundled apache
-	rm -rf "${S}"/org/apache || die
-	# Bundled json
-	rm -rf "${S}"/org/json || die
-	# Bundled bcprov
-	# currently disabled - requires bcprov 1.37
-	#rm -rf "${S}"/org/bouncycastle || die
-
-	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-	mkdir -p "${S}"/build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1,commons-text"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="256"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	use sparc && mem="320"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates"
-	echo
-	elog "Vuze was formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration options will be"
-	elog "placed in '~/.azureus/gentoo.config'."
-	elog
-	elog "If you need to change some startup options, you should modify this file"
-	elog "rather than the startup script.  You can enable the console UI by"
-	elog "editing this config file."
-	echo
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild b/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
index ef361936f70a..476d04539447 100644
--- a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
+++ b/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # bundles parts of http://www.programmers-friend.org/
 # bundles bcprov - 1.37 required but not in the tree