gentoo (leap year) resync : 29.02.2020

16 files changed, 191 insertions, 69 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 6c3bbdc69ed7..f219aaaf9b87 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 894232e09dbe..9a391dab3459 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,3 +1,4 @@
+AUX amule-2.3.2-Fixed-compilation-with-newer-bfd.patch 931 BLAKE2B 5506a79dfaa15578cee4da734ad27549a0c9c300acd7dc4c9dcf72148f464901a1939e013aa2acc347499ec4dbdb1aaada0730115498534b0a399d09c607d991 SHA512 7bcf505f9e5cdd0a7e282b7d35afa2277df6d5e359d8836cfbf41d10165ab859ca9ba896df171b50195d3a7acfe882bc4547254bc4ffb4774ea787e40e24a3dc
 AUX amule-2.3.2-cryptopp-6.patch 927 BLAKE2B 3be08b8219cebdaf252f21dd4a7e469d0371aa62a5ed9856c13d8772163c8f85cb7f19d9cf383e226276852c7acbb73ffdcc4f46a3e23118491154ddd47ca1da SHA512 fe07cdddf447d327ac517366449ec329d81f49ef327183eac36aca522db244732713837ac8c4d4ca0d92d648bd96dad670597b466e375324204427a381bc2b26
 AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876fe05c2b85a70e2d704ecb3dd14ec6fc47550d4a677fcdd071906b93c56652c133462d5065b5907564e91c092430e310e2dd8c2523 SHA512 6d98c1a78b16778ad94ef9d70e87fe7ded2228b101bdb961565c3f2a0f2687e55c97bd824e331b53cbd45fbafbfa5803ce4c2f1fa8e245a3ebc97cdd7f282b65
 AUX amule-2.3.2-fix-crash-closing-last-search-tab-1.patch 3620 BLAKE2B f6dbba7491472d1c15f2253ea94cb83681c4f745f6cbe8662d95daaa54f69ff3eee94e02a1d5d5d69cf303c55db5cfef630096750b6bfcc431d48e120cfca91f SHA512 752f2dc7590001d830da2aa211349a2e04601c76ab01620f741e57f8c7a05851e1a4a4cba2ec88167b8c8047b8c3bca1a120003ec85c1155d6b8e71bff05f42c
@@ -14,5 +15,6 @@ AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d854870
 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0
 DIST aMule-2.3.2.tar.xz 3895300 BLAKE2B cf1bce3a0fcd0c108e369b7aed257f067a4ce3ce2fd4e8509b577ac58f8bc52fbc9aabc5c703bc9111dd06ac011ee1f3756279b093b69bcaada106226493237a SHA512 3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016
 EBUILD amule-2.3.2-r2.ebuild 2340 BLAKE2B 9e1a34ed32160a724264302f954280dd014899efe2b767fe2b6850738e93960bea8ee84573365d0616554cb10444face37428b057e7f98efb2c69393d80efe27 SHA512 00d8da48dabec279688a50ad92c71fd74cefe44f66386fa170cc006f94373fd23fe627271ae598447063897371f37510e8ba7c38eb85e1ff761f6d43670fb224
-EBUILD amule-2.3.2-r4.ebuild 3018 BLAKE2B 9425d4949bd4bb98c369ec13407f2c299c269c6a38ac660d8d8fc23d42d145fc3274c9c0e81af41fdf97074107a82b0d4722897705d749195f074c9792bd0b56 SHA512 1ef3b5c99bc50a3ab2caac5bcb00ed6ae904a85820a0ca1a5f2d9b710bcca4bc9f9f6f382abc351a4723e3e13196fe9d12a63d9c859b6790da60bf23b49e9a14
+EBUILD amule-2.3.2-r4.ebuild 3084 BLAKE2B ff61a3177d3b47787a667b6309cf00a6b5d3aa8c3b31f8bf5c3c9941f1fa7d50ca6fcf17fd09c1c8751920702bfd9c26289784be612f8824848f553684b3a0a3 SHA512 a2668da7c097a98c07f1ee457fb02e006d2bb24d17ec70afb481a973a5b9b04c6a07866faa71eca76178a021af20c25526c093dd74a309c76c8c0f2c0e47a2b7
+EBUILD amule-9999.ebuild 2971 BLAKE2B b45aab5acc78862fb4a16959b9b5c80d7fdc685117460a1804243ec18fe11a8b765626a1aaf37184a32bef46c472c5440e43803270361c0119aa4bd12588309b SHA512 735f436b7164b701e01feeca582e579b6481ab6b8eca5bc491579388a04fefa30f45a697d9636fc169b246c7dc8599320468271aa2f7cb97bc2f2e2f2e069ae0
 MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f
diff --git a/net-p2p/amule/amule-2.3.2-r4.ebuild b/net-p2p/amule/amule-2.3.2-r4.ebuild
index 8199a8471f05..eee88909130a 100644
--- a/net-p2p/amule/amule-2.3.2-r4.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r4.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch"
 	"${FILESDIR}/${PN}-2.3.2-libupnp-1.8.patch"
 	"${FILESDIR}/${PN}-2.3.2-libupnp-1.6.patch"
+	"${FILESDIR}/${PN}-2.3.2-Fixed-compilation-with-newer-bfd.patch"
 )
 
 pkg_setup() {
diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild
new file mode 100644
index 000000000000..f14cc28e5c40
--- /dev/null
+++ b/net-p2p/amule/amule-9999.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit wxwidgets xdg-utils
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/amule-project/amule"
+	inherit autotools git-r3
+else
+	MY_P="${PN/m/M}-${PV}"
+	SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="daemon debug geoip nls remote stats upnp +X"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/crypto++:=
+	sys-libs/binutils-libs:0=
+	sys-libs/zlib
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
+	daemon? ( acct-user/amule )
+	geoip? ( dev-libs/geoip )
+	nls? ( virtual/libintl )
+	remote? (
+		acct-user/amule
+		media-libs/libpng:0=
+	)
+	stats? ( media-libs/gd:=[jpeg,png] )
+	upnp? ( net-libs/libupnp:0 )
+"
+DEPEND="${RDEPEND}
+	X? ( dev-util/desktop-file-utils )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == *9999 ]]; then
+		./autogen.sh || die
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--with-denoise-level=0
+		--with-wx-config="${WX_CONFIG}"
+		--enable-amulecmd
+		--with-boost
+		$(use_enable debug)
+		$(use_enable daemon amule-daemon)
+		$(use_enable geoip)
+		$(use_enable nls)
+		$(use_enable remote webserver)
+		$(use_enable stats cas)
+		$(use_enable stats alcc)
+		$(use_enable upnp)
+	)
+
+	if use X; then
+		myconf+=(
+			$(use_enable remote amule-gui)
+			$(use_enable stats alc)
+			$(use_enable stats wxcas)
+		)
+	else
+		myconf+=(
+			--disable-monolithic
+			--disable-amule-gui
+			--disable-alc
+			--disable-wxcas
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use daemon; then
+		newconfd "${FILESDIR}"/amuled.confd-r1 amuled
+		newinitd "${FILESDIR}"/amuled.initd amuled
+	fi
+	if use remote; then
+		newconfd "${FILESDIR}"/amuleweb.confd-r1 amuleweb
+		newinitd "${FILESDIR}"/amuleweb.initd amuleweb
+	fi
+
+	if use daemon || use remote; then
+		keepdir /var/lib/${PN}
+		fowners amule:amule /var/lib/${PN}
+		fperms 0750 /var/lib/${PN}
+	fi
+}
+
+pkg_postinst() {
+	local ver
+
+	if use daemon || use remote; then
+		for ver in ${REPLACING_VERSIONS}; do
+			if ver_test ${ver} -lt "2.3.2-r4"; then
+				elog "Default user under which amuled and amuleweb daemons are started"
+				elog "have been changed from p2p to amule. Default home directory have been"
+				elog "changed as well."
+				echo
+				elog "If you want to preserve old download/share location, you can create"
+				elog "symlink /var/lib/amule/.aMule pointing to the old location and adjust"
+				elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in"
+				elog "/etc/conf.d/{amuled,amuleweb} to the old values."
+
+				break
+			fi
+		done
+	fi
+
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}
diff --git a/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch b/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch
new file mode 100644
index 000000000000..3ef8a21fa45c
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch
@@ -0,0 +1,33 @@
+From c0c28234a40b1b575ce51cdfe5ffa5dac3a7494c Mon Sep 17 00:00:00 2001
+From: Werner Mahr <werner@vollstreckernet.de>
+Date: Fri, 31 Jan 2020 17:55:24 +0100
+Subject: [PATCH] Fixed compilation with newer bfd. Fixes: #174
+
+---
+ src/libs/common/MuleDebug.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp
+index 5d8d75890..0ebf2ab07 100644
+--- a/src/libs/common/MuleDebug.cpp
++++ b/src/libs/common/MuleDebug.cpp
+@@ -268,14 +268,14 @@ void get_file_line_info(bfd *abfd, asection *section, void* _address)
+ 		return;
+ 	}
+ 
+-	bfd_vma vma = bfd_get_section_vma(abfd, section);
++	bfd_vma vma = section->vma;
+ 
+ 	unsigned long address = (unsigned long)_address;
+ 	if (address < vma) {
+ 		return;
+ 	}
+ 
+-	bfd_size_type size = bfd_section_size(abfd, section);
++	bfd_size_type size = section->size;
+ 	if (address > (vma + size)) {
+ 		return;
+ 	}
+-- 
+2.24.1
+
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index ed30d3d741f6..52a77335ecf5 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,9 +1,7 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-3.12.1.tar.gz 1809074 BLAKE2B 2c19cba4dc070286d7fe39b53b61177b64c3d873bbcefa359c62f4cdaa8b685fa40f2ef61a1fce9fba57902ba3399cd3b45816e932362f2633ce3ca174ad2b41 SHA512 98c84e8057a9c31cfa65daba32f43c7a7d9225878dcce07c740fac563225494c901f15bdf0450e50d857918dbc01861ddfd39ead9d44f8038fe866bfa3ef69e1
 DIST cpuminer-opt-3.12.13.tar.gz 1809807 BLAKE2B c971153fc1099dc29ae93ab341e905b3d0252d02468e0f125692a38d00121f82a2825d61e8303e45f4b41f64280d780a02f742eb61d117601a6ce47db57d4d2d SHA512 830371c4e2931101d33d124c86733e9f079ace5b4b59e3b5149db0655c93031dcbbb2dd370d4729b7e697670117c0b6874214a8aa569dcca92c6750dbc88a8b8
-DIST cpuminer-opt-3.12.2.tar.gz 1809424 BLAKE2B fedec681166de95e18d41e4c61ec75a9e1ea1fc1cdb656cebcb303a637a01eb3aba9e0c5cbb5cc710be6a2191dcbef0b1a2c00f0ce349064b25471eac5035c26 SHA512 f8a9c71d673f68418164cc1f0bd7c80b4e5d246b21a8f54432ad9fc87c1962a0ab0a96372018e2d1da55d084b6ce9dcae58dd3f7a0b0e62e595a805fefdb5a10
-EBUILD cpuminer-opt-3.12.1.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+DIST cpuminer-opt-3.12.4.2.tar.gz 1811456 BLAKE2B a19dfa37b726020f3143bd0a11fba52aae0eaea5295e8fc568815a12ade1e5c55d560ac964316f4ed3f272873ce1a393f581dc6143504eeadeb302ba83f3c017 SHA512 97222820c321cb34748a9e0550d7b1ded3d0d3980b7855d72cd0eabf5f6a03e121552e62ee52389bf0d5182c54f226b61f0549e787fdc0b0351d2fffa7a7e7c2
 EBUILD cpuminer-opt-3.12.13.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
-EBUILD cpuminer-opt-3.12.2.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+EBUILD cpuminer-opt-3.12.4.2.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
 EBUILD cpuminer-opt-9999.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.2.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.2.ebuild
deleted file mode 100644
index a5d436b3b8b8..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.4.2.ebuild
index a5d436b3b8b8..a5d436b3b8b8 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.1.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.4.2.ebuild
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index dcea91f620e0..f68dd2b66968 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -19,6 +19,6 @@ EBUILD deluge-1.3.15-r6.ebuild 4627 BLAKE2B da5905161023ba40a0dd16a1f22186c30e3e
 EBUILD deluge-1.3.15-r7.ebuild 4565 BLAKE2B 0f3493cfebfd9caeb797110903bf73218286f54eaf0423fe32ddc9522e3cd946d0f302e7e6cb0c8da439a67f5a68bdcd05ae5643dedc6f86b5dbca8a58fe0384 SHA512 677d172e057274885e90e2326cf7ce866b9ac0aecb6a817fef0c42ae16e6d061d9b073b335c450924baa2f8ba3058aa53b26ee771edf13a0fdeebdea238f3ae8
 EBUILD deluge-1.3.9999.ebuild 4575 BLAKE2B eda51520f4bed4549b82a76065b3c9df05e68890b04d0d52ad7998a8e666ff5aefc87da75ca3469dfeef66f17ee86486d78eba631cd7b00a837fc292fe174909 SHA512 189365647ed13eca444ef4a5172b48708e851c3f75cc9e44209e176f9118573d2ce53107253762610088f220cc451fe2c52bd0583226e885c6bab51efacecb31
 EBUILD deluge-2.0.3-r4.ebuild 4551 BLAKE2B ca627923fdbb7144d4e4891916e5ef9f6e85f9ccdb24adc7ce28ab9295148ef3ec56c4f9fe3a53a6cc3c3b172dabb8c3ea23f7989db9e0d0d2c212313d8bbef8 SHA512 5b44412ab8537de7399608ff20afb7c8b06dc7ccc450dba4536df1c20c707bf59d3fa42bac27e91176e0d751da2a1848705fdcd0b7752df8fb3d13e676be4c37
-EBUILD deluge-2.0.3-r5.ebuild 4486 BLAKE2B 2b64e1b7305bf7fb2617151e5593247c61243f462867bbbd8ed9b03922d9c59e85899f1cda439fc66208f8323471c8c61b68abdf1edd89c652facc487c022e6e SHA512 3b724e1750f06be9a00dca6ee73e10715ef964bf28c14de9c29d4a214aff3201c6ebfd69a66356cf8d5b686da3904cbeb947d8557f477a805465528b49fd7369
+EBUILD deluge-2.0.3-r5.ebuild 4485 BLAKE2B 594dd62684161f8e3ac1cabe8e936290229d767ce6cde23a86b733b8cec0ccf83585cf1e2818126afd2d67a4a3e994a76e53a641359e10e948df2426772369d0 SHA512 d9dee2ef9d05b0e7a7973b1da3500c57095746d6c6750b9836fcaf571fe16cb1f28a3e22c8734d917678c2e5b5e324886db52069aa41c846179ebab89b1382f8
 EBUILD deluge-9999.ebuild 4481 BLAKE2B 157aeb683c381e0e421ffb15029c64c73dd1281dc2c2708128108fd0df088e9e727b444ab648340e04292232ccc011f614104fb753b63151d4c01b60b33982d1 SHA512 807d72757aa4343cf99de89ff6f4b404219951fd0872295d95ae5482510821b1425b2136d2418caecd1d4e80d25e135aee5a27d05c8e773953e271df203df9f9
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
index 3cdc92e94de4..f66dc0550184 100644
--- a/net-p2p/deluge/deluge-2.0.3-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 72d72070ffc0..2e841d875a9c 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,4 +1,4 @@
 AUX gtk-gnutella-1.1.14-statx.patch 967 BLAKE2B 73cc687043d2b932b8e36d69c935c84a6668a28902f9ce8b060679ef1e567958053d5e565d1087ada4a590547250bf6ef7b9daa5e8a6b66cdbc275bb1a3c2941 SHA512 fd2cc3d0486efe526b9764d0d6c5bdffa08c344fc91f14305d0b16b957353ca38a23ff873cc669a49f67fd416b79ba38c288cda080ebeac545ea64e40634596f
 DIST gtk-gnutella-1.1.15.tar.xz 19606508 BLAKE2B 3c699f2c5e8b6962265c9fc9bc6720d740c447afb33bef8968e8c8f1f7ec8b88ec3381419cdcee8e2ec8f4e10be2c6e5707d5f89365f347a33990fffd0f18395 SHA512 6b2bee08fba463b66890c8c5d7f7815a8cc4106824e598bed8cffe4601b1e591fc14903ce8d587815257f795c854d459b3a4fa7cc90de2fbc109daef025e5968
-EBUILD gtk-gnutella-1.1.15.ebuild 1884 BLAKE2B 630d1b1137338d2594e8f2f01d5b76ab376a22e8c0e03f0d79f8a885521946ad93ba4b790cad68cdb040bba85f069172603c7a3f59695500d826a746bd623119 SHA512 afb48864c3d9a1855019b2829dffcb8d4d3a433f9a46e7390a1e98536c5362d31ceced35fd3c3462a1690c7e8b628d7ee58afc8b77d1f3f93d74bef8d49f463d
+EBUILD gtk-gnutella-1.1.15.ebuild 1890 BLAKE2B 65713a6f912f6eeadf242192f2233c77847ca7e6acc262e628cc29b329d187b8b44287fdac65f44644a713623d1306985a05a5c2592a00f36d4c6f9326c87597 SHA512 2a81628ac9cec0fcf5a9530b83b81ed742a450b58f3a8b89ff443ee9f8163e94f8c245a5355783b377398b3e846c7e499ff9df29c79ed1ad25315afe11250072
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
index a81988b38c5f..bc55f7928449 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 
 RDEPEND="
-	sys-libs/binutils-libs:=
+	<sys-libs/binutils-libs-2.34:=
 	dev-libs/glib:2
 	sys-libs/zlib
 	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 3f679cc8f2df..b54ab8f64063 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -6,7 +6,7 @@ AUX rtorrentd.init 871 BLAKE2B 3f83e6bb52044e293127aaf7ae505c1dc6422698360537edb
 AUX rtorrentd_at.service 308 BLAKE2B 2aac1f49a25d35136db25a13c08d1847d21701272d56a6ca06eee6a8426719c340a041568cc1d575fae341a49fa1f53a132ba11ff73180b1bee246197d8119c2 SHA512 cc707500af2dbb0cc0c8297512807f9312445cf70de00bcf2f7267388834f1d0454eaaa9a8b52387e5f84288400286414225c55af0f560f61a8d0858971a8615
 DIST rtorrent-0.9.7.tar.gz 610149 BLAKE2B 3f1316b0142dade9662630ad40132c5968d7b0ded32d7ae13d1ec1fdb7fec794812203fece367bf6abfd02212ed94d308046d40eb3e7562c408e8da13b23c23d SHA512 e663bd8984bcec91868beaf16d215708bdea8872338365ba6a05c9ea830b2aff045257bbc8bd0414d84009ee85852822c97bb073dfb41c21e3b0081ecaeecc00
 DIST rtorrent-0.9.8.tar.gz 647523 BLAKE2B 3562ed03dee3baa4a702d20c7c91b9248d9de0f25d1f8cd182863101f293a0ef13cb49164e4d16b25e72a4fbe1cc1a2fbde176d3068c749edbcb2287ef260b2b SHA512 016685948d0290694ab9635ae218c7acd876e6d45bea1bdba3a29c545e64f5d824c5e2f6693a4c2e9200196177881d54f312d72e0a19742bd74a03bd19ca05c7
-EBUILD rtorrent-0.9.7-r1.ebuild 1938 BLAKE2B 9ef4672834023ffc606135463d522d17f9fabf66accc84e5e35878c07f5875a7622acd67f1498655f37ccd716b9befcd9235a9a418c6e0718bf3ecc240cab797 SHA512 09096616d50eb44bcae4850feaa4ba00d452fff2487ad9c7235b3734591c9b4ba61493d1ca7229f983374cb4aa836e7b3cbf67049801ebf3d816d9959c0fa62a
-EBUILD rtorrent-0.9.7.ebuild 1888 BLAKE2B 3cf5d1643764b902295480c997d4d4da789d39697fc39a20eecc6ba1f7d67ebb5b20af576850d297da37de9162865bcce779ad5c6113bb9f730f8b003775e196 SHA512 306c60cba099554bd4fcc14efb303e560e7a7b25a2cfa6aca2358db5bbcf4e44265862713a6ef26f3cb30396bf49a3b78d982bd5759c16ea129be2d79b8554ca
-EBUILD rtorrent-0.9.8.ebuild 1804 BLAKE2B 585c93ce00310757385ca8936cf85a2f7341d4817c2306607f11e45bd8d87520f00536f179144befb88879c3cef1924b91b0e01a3cdee62db6a7cae8a77b7630 SHA512 e9f28ea704ad29b85d7f6207d235453b391a447329e029071323cac97225e3c408ec66d80bec176069c9a33e37715b4045707f419a3c158314c4e9da7e717be5
+EBUILD rtorrent-0.9.7-r1.ebuild 1904 BLAKE2B 11d517d63d3c2f6ee14a6b20a2b5f9d18f82e35989f0c98aab345c2a69da11f30c2f83f1a0294d5f31c74dca946e0745a54218901f143d2b18520c7388d917df SHA512 c7af7a5f7d64969bf8c3c72524664bf4d4d9a661c5431ddd1d4545330cf68af323431b71745bbe411974b9fcda8bf6d7d07607247c821e1f0141425d14efdba0
+EBUILD rtorrent-0.9.7.ebuild 1854 BLAKE2B 25515629843a6d9a927c639c09aaf500d22659d2dd5ed8ec8c1afe5970e9c16220aad1214bbb2afaff2ecfe7e37739eacf3f5d5a048f58368343c4992ff0300d SHA512 804454f0ab73c5eda1d8988119a0a4643ef6c14caae5d7407a01ad07c2cc657c12466c38f1d947e406c83418b927024f7f51f387d038aed8c676c415bb2a8fce
+EBUILD rtorrent-0.9.8.ebuild 1770 BLAKE2B 2af3086adc74934a95b6eb4da846ec722dfc0b2e28f6f0bdce034619e28673d4a57d11ab1170fa6ba202a1ba08596f28da6cf1451281f44f65d6fb8b4d5922be SHA512 afce5e062ffe3296f4bfb87be7584f5136589f08671946ce509a00e3e6b5513538e5495aabf0275e218b6770c3d2f1b15cd0f900d15286fe7aa28649d048436b
 MISC metadata.xml 676 BLAKE2B ec4ff11bbb2ba69ce911f527e77d14f2891307bf9f321a7da4eda884dd0bb93961275592617e19070f958b9ac91372133130f33770f527623076f5b5338e0969 SHA512 f2e5e3a709b1be52e3947529e4aa4bc9d279820333287d562c0254b761962ebb19ad9a47c8c9f181eb103ae1580ebd4d68b8ce1684598cde0aad0faa126dbbd6
diff --git a/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
index d399917e251f..d6c8d7ab36f4 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -58,7 +58,6 @@ src_configure() {
 
 	# configure needs bash or script bombs out on some null shift, bug #291229
 	CONFIG_SHELL=${BASH} econf \
-		--disable-dependency-tracking \
 		$(use_enable debug) \
 		$(use_with xmlrpc xmlrpc-c)
 }
diff --git a/net-p2p/rtorrent/rtorrent-0.9.7.ebuild b/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
index 065a33969032..6eb4ec073f79 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,7 +57,6 @@ src_configure() {
 
 	# configure needs bash or script bombs out on some null shift, bug #291229
 	CONFIG_SHELL=${BASH} econf \
-		--disable-dependency-tracking \
 		$(use_enable debug) \
 		$(use_with xmlrpc xmlrpc-c)
 }
diff --git a/net-p2p/rtorrent/rtorrent-0.9.8.ebuild b/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
index cfd5c1bf8862..c7f4827b1c19 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,7 +52,6 @@ src_configure() {
 
 	# configure needs bash or script bombs out on some null shift, bug #291229
 	CONFIG_SHELL=${BASH} econf \
-		--disable-dependency-tracking \
 		$(use_enable debug) \
 		$(use_with xmlrpc xmlrpc-c)
 }