gentoo resync : 23.09.2020

48 files changed, 743 insertions, 1008 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 96368716adf1..2c8ab32d2a3d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 5db3263efe97..c44ddc28e741 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,4 +1,4 @@
 AUX farstream-0.2.8-make43.patch 1959 BLAKE2B d7c18eaf156a6cca991014dc512898cf93f1b67b10c78f28bf6cebf772d4a8974daba1305f06d7087f43fd766218d49724dca471835fcfe5dff06a105f40bb53 SHA512 c577c5f9fb384f93ce7e36cff117d3c2dea92dc7b15064dfed19d18fc5d8658044df19e2f0cc112cd347e35c6038501e0b05a1f97c95b0f43f776aabd8fba01b
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
-EBUILD farstream-0.2.8-r2.ebuild 1946 BLAKE2B 8da038d48c83edc62bd767a6618ff2738e076993fb9059fcc555cf54e8e4b96569112925005df63305e60e3d2db2557fb1ec6b4168a9587e89dbb36c1d67941c SHA512 bb0969dfb2719affdd18236701b3366c8b5dffc043dae9b171fc59fb80d747d546b11bfa723fe39ce09226699d909ff6eafb2f88b754d6a4af59627f1218e62b
+EBUILD farstream-0.2.8-r2.ebuild 1885 BLAKE2B 2da12350f5bd058d35ab5f06f9b5b52ec79cd51a65deb3f1f2fe71c8d5705101c4602344b4b279d06d09af9bf21c700034a63d0245ce8597edb0b2b72076361b SHA512 6256c320d320b4a47b622d6daa04c8c9adba0df5452d6d8facedb529708a1b804ab876b20471e535d1a777f22559a30f152b2fdd13f20eba647cd60a3dce5d89
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index 2325786f6d30..3ef67aeb0e53 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
 
-inherit gnome2 python-any-r1
+inherit gnome2
 
 DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
@@ -48,17 +47,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.8-make43.patch # remove when bumping and switching to Meson
 )
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
 src_configure() {
 	plugins="fsrawconference,fsrtpconference,fsmsnconference,fsrtpxdata,fsfunnel,fsrtcpfilter,fsvideoanyrate"
 	gnome2_src_configure \
 		--disable-static \
 		$(use_enable introspection) \
 		$(use_enable upnp gupnp) \
-		--with-plugins=${plugins}
+		--with-plugins=${plugins} \
+		ac_cv_path_PYTHON=
 }
 
 src_compile() {
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index c5222caeea4c..59d9d510c780 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,4 @@
 AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0b579d77483b9fc0f779bb24e3ba50953c2ca2b2bfc7774861085da3d9709fdf250c450cc77aa312095f816bf67748b5d2b5bed4f43ee SHA512 6f2dc20dbdd27875a964aa806380556f4a3da1d2c0c4f7337e0845fb304319b5b9ad94ba519982a4db75486f673a717e20c294487b2d3e339bf7d144a0f33803
-DIST gnutls-3.6.14.tar.xz 6069088 BLAKE2B a1cd88a7c977f3a94a49e4187878560a8d9589a6fd32d8ad41b84c33534597fb85a88cf6b260a4a5e8b1a100790a7ba701acac2368f1ad42dcaba7e5c90b6758 SHA512 b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604
 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
-EBUILD gnutls-3.6.14.ebuild 3985 BLAKE2B f8800a3883fbd2f04ac22f51d6486558ea48aae6393acde4361e1f634a74dfd0b9dbc1311fb8813725dfd14f45ad8f33e3338189fefcf554540c85df244181e2 SHA512 235d6a4c22ec21768d6feeb05f83cd7fbbe31ba78c20380cf7530ee17aa82d50d1465959fd62d5bcbd8c3cda4394600820f94a34c95e70b36592c778a8da6a61
-EBUILD gnutls-3.6.15.ebuild 4058 BLAKE2B 6544afa7351798f110bd2583fca628277fa06c28ea1d745387ae2c013eb3367b0e736d4ff2672ac42215ccbf4a61a117266bfb88f29f90f867bcc4ffcfe95635 SHA512 ebb218b617a5b1ffc31f7b19272504a65f4ec167e69e5dae4da803bfb07892880c412d626f6ce477a2f36b72748371d245c26f6518f74e51d3f28eb3cdf7fb65
+EBUILD gnutls-3.6.15.ebuild 4056 BLAKE2B a8ef09d11faf226a0f859e596a7addc804cc8400538c81286d230a92a1c2e26c5a516632b915811df86f276e09f42b918095b7cce8cad3d5ac79c91672c483d6 SHA512 f295a6371e62e7f403d9604202e80d0442091efc5ddfd89ee6489cc1a2f1f4393a9110ccb0af8baf690b292f2470043b58f3f00a585f93ff2590350b7e3d09b1
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.6.14.ebuild b/net-libs/gnutls/gnutls-3.6.14.ebuild
deleted file mode 100644
index 1969a8391568..000000000000
--- a/net-libs/gnutls/gnutls-3.6.14.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1+"
-SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
-
-REQUIRED_USE="
-	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen:= )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	local myeconfargs=(
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable guile)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.6.15.ebuild
index a9afddeafef8..5fabb1a30dc5 100644
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 608a42091f46..5ad6df499e9d 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,8 +1,4 @@
-AUX ldns-1.7.0-CVE-2017-1000231.patch 396 BLAKE2B 60225693e684ce9b7850fa416da879b91543b08573b36eaa1da40cb26c6726930d0d0c31a68b7aa99852859ae4554cc7b111c8318ffa832c7140a1a9cae80668 SHA512 c9119730ef74aaa89a362fa5354267da7e0336873a66a9e68b1d634946ab7938ac8833a8b1dbd27d51add226008b0b9336e4e4e06f20d714b225e35cb3efcbcd
-AUX ldns-1.7.0-CVE-2017-1000232.patch 469 BLAKE2B 4e17f4d13928081cef5093b51db1b1b1f393d151a5822ad4d40f385620fd7f78168e581a6e2d50164240ffe368d4926687a860f5555432d2a9b5b389a3287ea7 SHA512 2eaddaa4ab7ecf8e54a7fef341406e1f8bdb278a2caca3d8cafdebcfc349c7e3ba1247f194a5fc0fd50074c8836f29b4e5427b2ce7c3b8513191aa1b4b08c681
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
-DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-1.7.0-r2.ebuild 2249 BLAKE2B 9e2df8aee72acc1adab2f9ae23edf8538881e97d2d15a092ebb83af1479f24d460e5dbc4c02dd31708dc3d12e5b860b25e93b855b63747e9555d06dd6782a565 SHA512 30dc0b7d5b0f8d8e644ca66f8ab4870dc6b3bb60baa90e243297dd6480817028a5ea783a8e20088f50d72c659c279ebf7c8a75becbae725566c22e8e17c7cd08
-EBUILD ldns-1.7.1-r1.ebuild 2743 BLAKE2B 930ef54c6483238aa0d52f16396bd74edd2bcc82d86fba6be5203ee8b122eb4204dce91a70a91b69299a6e88a6440c27b439fba272ce75cf3278b55f32b6fcac SHA512 0dae14d12743d374b0dbaf11f41a3bae4cd2a1994d741327ea08521ef65fc2ae17be6f2a2cf5a1c0f77123940e48e95fbc56c50db8c741cf1d6aa87ec8715789
+EBUILD ldns-1.7.1-r1.ebuild 2742 BLAKE2B de1880e0b2fd045e29d9dff7049f9aa188f7de93fa6b3a46d9ee04ce979c442a13342ddc8ce7c999a19521741aaa72664ec8c0c00e33875e0f18513dae30ebb6 SHA512 7d07ce2d6fb1957533eadf0ed705b2e76128676b88fb48253683b4100b9d2c93bf242164cdf3b5164b3e32c96058ab7ff2c04873cea0ff7265946c4c7b478260
 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85
diff --git a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch b/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch
deleted file mode 100644
index 9ff92e25c75e..000000000000
--- a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/parse.c b/parse.c
-index e68627c..947dbb8 100644
---- a/parse.c
-+++ b/parse.c
-@@ -118,6 +118,10 @@ ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *li
- 			if (line_nr) {
- 				*line_nr = *line_nr + 1;
- 			}
-+			if (limit > 0 && (i >= limit || (size_t)(t-token) >= limit)) {
-+				*t = '\0';
-+				return -1;
-+			}
- 			*t++ = ' ';
- 			prev_c = c;
-			continue;
diff --git a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch b/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch
deleted file mode 100644
index 341dfa5916e4..000000000000
--- a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/str2host.c b/str2host.c
-index b274b17..f2a317b 100644
---- a/str2host.c
-+++ b/str2host.c
-@@ -1525,8 +1525,10 @@ ldns_str2rdf_long_str(ldns_rdf **rd, const char *str)
- 	if (! str) {
- 		return LDNS_STATUS_SYNTAX_BAD_ESCAPE;
- 	}
--	length = (size_t)(dp - data);
--
-+	if (!(length = (size_t)(dp - data))) {
-+		LDNS_FREE(data);
-+		return LDNS_STATUS_SYNTAX_EMPTY;
-+	}
- 	/* Lose the overmeasure */
- 	data = LDNS_XREALLOC(dp = data, uint8_t, length);
-	if (! data) {
diff --git a/net-libs/ldns/ldns-1.7.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild
deleted file mode 100644
index c55730be0304..000000000000
--- a/net-libs/ldns/ldns-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils ltprune multilib-minimal python-single-r1
-
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa gost libressl python static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ecdsa? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )
-"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/ldns-config
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable gost) \
-		$(use_enable ecdsa) \
-		$(use_enable dane) \
-		$(multilib_native_use_with python pyldns) \
-		$(multilib_native_use_with python pyldnsx) \
-		--with-ssl="${EPREFIX}"/usr \
-		--enable-sha2 \
-		--without-drill \
-		--without-examples \
-		--disable-dane-ta-usage \
-		--disable-rpath
-
-		# >=openssl-1.1.0 required for dane-ta
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-CVE-2017-1000231.patch"
-	epatch "${FILESDIR}/${P}-CVE-2017-1000232.patch"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		dohtml -r doc/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README*
-
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim
-	fi
-
-	einfo
-	elog "Install net-dns/ldns-utils if you want drill and examples"
-	einfo
-}
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index fb249bb22ad9..0c10feffa979 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 20ef0ab096bd..ace692d894a0 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,3 +1,5 @@
 DIST libhtp-0.5.33.tar.gz 496010 BLAKE2B 9648632e9f37c20a3efa5edf9b5ee5ed97b5ba767faf6b276c4d38760422b601f9443cfaf30e60c6e6dd555d259a3b5613f0370040753d7336f6ef5e94b32d55 SHA512 52bbb72710fd0f5fc917d62f5a2b659092669eda0553586e75c17c558e3f6559dcf8eb7707db931045af532592cbad691461af2dd5362f95e2a4884e7475bf94
+DIST libhtp-0.5.34.tar.gz 496765 BLAKE2B 8f4eb6b074d9a84fa872ff963f20b4a52f86d171a03fe2347affa9b9383d0d4ba4633b03ec5ca2a9a923c28d16e3f2304f0b4e32c8c4385c0333ba2f280ad21a SHA512 dc86c6b3a90439e9e2d5375b64119d80771e2dc076670f49b9d5f252d7b16fe5b643a16577ce50189c289e7baf16fcb84d86254d965a11ab1d148ad59455c20f
 EBUILD libhtp-0.5.33.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
+EBUILD libhtp-0.5.34.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
 MISC metadata.xml 314 BLAKE2B e5d844caabcf76837a2fdd5d27d3aeefa56773856d21a49187139a38a0ca445a7647fa72928a239df94f88137e213ef7560020baf4c250ec5257b892bc2f7d24 SHA512 c8738803840e411351a88683e51e1c89b7f4ca635d3c2bf6062abee768ee0571fd4d3ea9cde45698c7427391a2b7e2603114e6455647cb88e40be151d9aff714
diff --git a/net-libs/libhtp/libhtp-0.5.34.ebuild b/net-libs/libhtp/libhtp-0.5.34.ebuild
new file mode 100644
index 000000000000..4c0e8229142d
--- /dev/null
+++ b/net-libs/libhtp/libhtp-0.5.34.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces"
+HOMEPAGE="https://github.com/OISF/libhtp"
+SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="debug static-libs"
+
+RDEPEND="sys-libs/zlib[static-libs?]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# The debug configure logic is broken.
+	ECONF_SOURCE=${S} \
+	econf \
+		$(usex debug '--enable-debug' '') \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die "Failed to remove .la files"
+	fi
+}
diff --git a/net-libs/libosmo-dsp/Manifest b/net-libs/libosmo-dsp/Manifest
index 9b78ffb43abd..3b3da2dc2960 100644
--- a/net-libs/libosmo-dsp/Manifest
+++ b/net-libs/libosmo-dsp/Manifest
@@ -1,4 +1,4 @@
 DIST libosmo-dsp-0.3.tar.xz 106792 BLAKE2B 8ba4c06abda550383ff349d11456890062da606f553c4b0eccc3e8b5d70c4a31ec2dd82ec90ff0ef29284ef13702d3d949720b218e7374cbe7553492faeee719 SHA512 079316bb882859787ee26143e3b105aa260c89022b81a38b29713cde39093dc430abea406468774649dd14232c969b2806c47634b64f940f78fa20cb90ffade5
-EBUILD libosmo-dsp-0.3.ebuild 814 BLAKE2B 8aa61c9d25e2749a87c3f41bbeee3ac6850b7b55eec0f90eb8c810fed934a5a6312bf21fb380f873f63649d32fa3fdbeb1461a89bb363feb400e56e6078d9dcc SHA512 9bad89b2dbf29b526d64f3c102dcccd7d772ced4b3c6f0c22c0ae7cadcbeb4fc716eb1cecbc3dc17ddb291aeda8cdd989b48fe8900bb8cff584a833a0f0b1d08
-EBUILD libosmo-dsp-9999.ebuild 814 BLAKE2B 8aa61c9d25e2749a87c3f41bbeee3ac6850b7b55eec0f90eb8c810fed934a5a6312bf21fb380f873f63649d32fa3fdbeb1461a89bb363feb400e56e6078d9dcc SHA512 9bad89b2dbf29b526d64f3c102dcccd7d772ced4b3c6f0c22c0ae7cadcbeb4fc716eb1cecbc3dc17ddb291aeda8cdd989b48fe8900bb8cff584a833a0f0b1d08
+EBUILD libosmo-dsp-0.3.ebuild 811 BLAKE2B 6c73d2336c7bdf51d7c886b80ad8788107357e74311aad858f90e4cef0ec09014217bcc07391902655499f85a076e0f643f23dbc96a3b8aebf6b94c4d07602f6 SHA512 7d0ba59d2b53cd6aa6131180557d35feabeefda0c7128ce2652f9c57e8a5fab16358e7b1c7c9f72b2c9441e8d3089c37b29c42a75047544b621a4d093ada3447
+EBUILD libosmo-dsp-9999.ebuild 811 BLAKE2B 6c73d2336c7bdf51d7c886b80ad8788107357e74311aad858f90e4cef0ec09014217bcc07391902655499f85a076e0f643f23dbc96a3b8aebf6b94c4d07602f6 SHA512 7d0ba59d2b53cd6aa6131180557d35feabeefda0c7128ce2652f9c57e8a5fab16358e7b1c7c9f72b2c9441e8d3089c37b29c42a75047544b621a4d093ada3447
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
index b49e28335ba6..6d74de097a23 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit autotools multilib
 
 DESCRIPTION="A library with SDR DSP primitives"
@@ -10,7 +10,6 @@ HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}"
-	KEYWORDS=""
 else
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
@@ -20,12 +19,13 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 IUSE="doc static-libs"
 
-RDEPEND="sci-libs/fftw"
+RDEPEND="sci-libs/fftw:3.0"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	virtual/pkgconfig"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
index b49e28335ba6..6d74de097a23 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit autotools multilib
 
 DESCRIPTION="A library with SDR DSP primitives"
@@ -10,7 +10,6 @@ HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}"
-	KEYWORDS=""
 else
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
@@ -20,12 +19,13 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 IUSE="doc static-libs"
 
-RDEPEND="sci-libs/fftw"
+RDEPEND="sci-libs/fftw:3.0"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	virtual/pkgconfig"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 68c79e004015..774acb08d25b 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,5 +1,3 @@
-DIST libsearpc-3.0.8.tar.gz 48740 BLAKE2B c2743d7f03001dd971821ef72f403ad2c26aa8e2e8350e2c751e7aa3ffc2be2bcdec0adc75ef5dd23b12b31a866ff9b590f8a279616a5f5c76db0eacf225b2f2 SHA512 1f2cf9a15a004b6ddf8fc0b6a436a5db09a514cea4cec94ce9fa6ce973cd71dfc4a112e948a36ab0be61d736f1021622e46429d07de70b23c25b886d1e51c02a
 DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd
-EBUILD libsearpc-3.0.8-r3.ebuild 972 BLAKE2B c9c8ea665ac2dce2090982e10d755b9addf8c950d94ca01543aa73fef832cb765f9ee019eaf6904c6cd9209239d3680f6970c90dd1d3d7111d71ab9adc98f37c SHA512 9b6f516b7f9911f133e18b9017a2baa1b4adce76b02a53ed1804808f6822a3c44e2ede4945cbdabe45e7308cc1cdee86be6978b5d283b5cf704d8daabe4e681a
 EBUILD libsearpc-3.2.0-r1.ebuild 886 BLAKE2B 2caa94cc7263c828db647057a4d57e6011ae4045234a293bffc9b8c816cc202eab634de78b9a9cf977277636a8bc99c1d5351d7f9ef659eb8dff4d7c99d5d89d SHA512 f0acfe1e1a026335c319fb1bcb512e810fd7fac670a1c06d76f22cd157c77c97ee2ef6baadfa54d2ea12addceb7a074a2f5c100eacc396ae87b9217b982b4d90
 MISC metadata.xml 248 BLAKE2B 95ce6c164ee8faf34471896ffcaad9a285d3418dcf763f778c5f58d38f545845c46c87cb3af4f3a8d71c542b127313a909e8f7972c15f930b1fdeffdb660478e SHA512 ffe6a49d28d3659fb952d60aff92836d3d1280f24dc340985d81a5b6600abe5ed8d961bee9ed1188b83be02e547676efcc06689b89ba5484a940a47fe48ed45c
diff --git a/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild b/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
deleted file mode 100644
index fa39547c3c5f..000000000000
--- a/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vcs-snapshot
-
-DESCRIPTION="A simple C language RPC framework"
-HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/"
-#TODO: Use commit hash tarball on next version bump.
-SRC_URI="https://github.com/haiwen/${PN}/archive/v3.1-latest.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.0
-	>=dev-libs/jansson-2.2.1"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
-	')"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-	python_fix_shebang "${ED}"usr/bin
-}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index b85251671bcb..c1e1f4d6c2e0 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -6,7 +6,7 @@ DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1a
 DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
 DIST libupnp-1.8.7.tar.gz 786079 BLAKE2B 5f7764c1392f881f420f27e21084f5c98a6fce711f82a3e83dd21e22bf01f25348cbea377b2fae2d69133e4926ae3f8bffcd870e31c4f29b0fe20214842765d5 SHA512 c02b82e33e4c4d85257f0d282e3c4fc1b14a9f42eebdf12318ce6fb75e620bb0c103f9531e87be744fe70898aae9f67db4b5a187a23bcace33427a5fe7d3293d
 EBUILD libupnp-1.12.1.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
-EBUILD libupnp-1.14.0.ebuild 1082 BLAKE2B 7d3b644f5ea6ca34d6d9dde99b60970402b23ee5409401780af533ef3f2aebf40e6bdb77c9db70226eb7ec6a9f5217b35136086aaf35654e9626d36e5770ea59 SHA512 ebcc2ca451bb68cbe7cea299d5b018a5e453944da74940d7a066f5d10dd0b195a3dfec5a591e34f4eeb9acfec47a833605a727d3b597633146eac166283e58db
+EBUILD libupnp-1.14.0.ebuild 1081 BLAKE2B bee3c9b5418bf29e4c595073fe35c0d54339a961d1465a797eb2cc6365a7375ffef77fcb57cc33f304e4df6f1ceb86fed1b599c6807b68f64763d9478d80a7f1 SHA512 ee0bf108998fab201eacbddd16409447355c9d06b1c1566069f922c9ee2acbac93584fea87625f1425b879bd094e658c53eddae9ad720efd945c07da8ee6dd91
 EBUILD libupnp-1.6.21.ebuild 1044 BLAKE2B c83d4cf4eb687836b5f77b61aa7544f1fc1efb7b0ee751874801b0ec5ce0d521c7fca9f994d921e50d6d521017e0cce5dd90c39efc7facbed09b913bab2992f0 SHA512 c00b0d9075ef638590f7bd88a7fca1ddaeea7b551be515fd8795ef31075ae420fd07452c51712b0a4af7b1141d019a646ced3e67fb9badbebed6e35b0d215b4d
 EBUILD libupnp-1.6.25.ebuild 1045 BLAKE2B fec4de0cd91eb2621093f2e781c69a156a80c31cb84d625f2ff11cb9ae0ec7ae3f50d21e9a43d617c2ea9d89839feea1cc7b14559fbe87039f1d646793d3a144 SHA512 ed91708822c127df4d44ae12c48e7865cfee01baed2065ef86be50e3dce31c4a1ae83de0477f743a63c112139943a018b16a66f8c48d49765e78b2dc85a5ee18
 EBUILD libupnp-1.8.7.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
diff --git a/net-libs/libupnp/libupnp-1.14.0.ebuild b/net-libs/libupnp/libupnp-1.14.0.ebuild
index 05679fa6236d..a59a58ebb3d8 100644
--- a/net-libs/libupnp/libupnp-1.14.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
 # bug 733750
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 3e7f77efe0f8..afb75f2f1c5d 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -4,19 +4,25 @@ AUX nodejs-13.8.0-paxmarking.patch 4213 BLAKE2B 4235139400e33fbc0e9f9f965953ed16
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
 DIST node-v12.18.3.tar.xz 23679596 BLAKE2B 496a8fa0f0368634a900c5961b442cb9ef9e0cf7cb0fc974a9e29624fc40077a61bd6371851d5487b9eeeb50ebf6a238e5db5c801fef000c7cb15bd990cadae2 SHA512 a1c72d4664fbead4e63736abe46417b13dcd0581c7c9f8a94ca5c5b2bd782fefabac63e63f824dda6a771c3b5e647749e3156a611dcb100aad11c3f23e17ed5d
+DIST node-v12.18.4.tar.xz 23679924 BLAKE2B 14de3c83851b89f85f7d6f549d9e43e3e97c7a84de94eef8c3a2789e960595749726b8039fdff1be822377355ede2bb95bba4fd1d17c3e5165c844a80eb32e53 SHA512 07101a9acc8dee5189f8484746715b57d4227d819e38a79c100da33f803b0f061e7b37fbd4114ce2bc3eea647726f8786880d3096dfab187c177679f3e1c78e8
 DIST node-v14.10.0.tar.xz 33377228 BLAKE2B fc2e0b38c0cd56fa524cc01dd262003ba0dbb4f755b9b95079a4aedea75c75b1e588de8cee4503a9699b1fed9983db8827828fe622c1ea32f9d3ee21aeabc3e4 SHA512 902bfe3b142f11ef48076c4af6f3107fb20f617ef1f12a564fc3ea1870e6304458dd30fb9af67c3431b850caa496bbb55cb1d760e46c882603543685d316c733
 DIST node-v14.10.1.tar.xz 33383116 BLAKE2B 68959ad1ed576af327b53080099d8f1e520658f9c7aeb342ba4182f6f058e48d93b1c443e2a91348a221224bfa430a16cbe13b33f339b41eff4a6e41fc1e85db SHA512 fd094fb3ff1f94e913ee876de4365ba1f6d26abd33b60e964fbdf8a205ab8a44885bd69576ec997aee7b36b91a342daf3654bec41377d0ec66e752292aab4319
+DIST node-v14.11.0.tar.xz 33379456 BLAKE2B 99e2eba4ba2e54209836fa1e3b63e42caf854d7f3bc99f5836300b0795ef8c785b78bd7c6b99148604f0bb1b34a5169c72e8be0f8d4f62412e7d352fce15ca18 SHA512 5014ebaeb109b0ecaca8f795a4e1a626c03b1132f9b8bac8826b734633c14e9f99b4f079c185a1f43f6938a1e543e5838f520159c3e08ca454398039fd26ef11
+DIST node-v14.12.0.tar.xz 33390472 BLAKE2B 930b196ada16d21e2d2b43d030d936391e039cc985ee517b6b420277baa071ecef8c8cef7bd2f24b5e167465e9d4acc6b0da36ae4e7332fe179c47724e05ff50 SHA512 168141a3e3f20be98a0e800a8e8f70e1ff330ff087cc08c31d6ae185882615723166f445d6310a23e1bb5a023e671a74834b40e1b83f2b789f65c787c18762e2
 DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2
 DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3
 DIST node-v14.8.0.tar.xz 33342288 BLAKE2B 4f8129beb16ece09f14c234395b29bc53e84896fdd9877821a27c80d88a0740d42ea4dcf65a0a5c52a98129262be236207f4c07d81f76cc5e4471f21227083e9 SHA512 ebb20f7163e20e8074dd9cc5d3ee7f3cbc536c55a7753d39c482ea90e9314d8fdfe1a88203be7f250f6d77b9f13da04d32d99770d300c2ab0dfdee3d7582f068
 DIST node-v14.9.0.tar.xz 33356264 BLAKE2B 61e4ad33ad5a80862730a89dbfab5c59395750f38d093944bbedc9ef167e09008e5f5f1545be3e01090d452eee3ab2ce6af9bb0455c731a0c6332c7d7b797e18 SHA512 2e628f4fea9d228e4e13d16166ba4e38a53d9a33edf0c26a63f55f61e99fd9069583613859e9b3ddbc87a6efe70803b723c310d064f9495359b450127b0c01b8
 EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c
 EBUILD nodejs-12.18.3.ebuild 6203 BLAKE2B 67947d6dbb631fa2534eafad1192f53d50985da88153a86e072843ecb6e9431a66c19fa587b746052a9e652cbc176e39495ac16a5d0a0e433d8287d06e44eabc SHA512 2c72ba3340dc906bbaddab7fca35dd0730d327af710b5d2551c974dc389c32b82e46ba281a848e68894000822d0d755fcffe2c9bb7c23c2354d1f91cb2790335
+EBUILD nodejs-12.18.4.ebuild 6203 BLAKE2B e139f3e4bcb74998e9c54a72f7df2a8bfc7692e764582b4dc8745cdb5646dcff7374df24eedb7791e3af1ca54496dcd15ba9836b1a0451532cb538df674937d0 SHA512 75bdbab170dd226bbcda1a02a2574ff29d227d7db498296ff83fc4a5f6a04c3124222686e7386d07c908bfae16e71b17b381a6290d0bac060fbc079332332221
 EBUILD nodejs-14.10.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
 EBUILD nodejs-14.10.1.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
+EBUILD nodejs-14.11.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
+EBUILD nodejs-14.12.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
 EBUILD nodejs-14.2.0.ebuild 5854 BLAKE2B b738a893013811417c3dfbc5b9a51541193c2152f60b2ea8989e59f51788be98580e3f300dcb752a89196bd1dced51bb577e63cc60ac25194bc00a3c00818524 SHA512 9f4403626435df54d28a0f0f20e10d1f90f601e9330ac6b94a4717bbd851caeb85db260c3b1967ca66778db29098056cf7641de4840976efaa38bf853083f5e8
 EBUILD nodejs-14.4.0.ebuild 5860 BLAKE2B 668d26dfe8d4c274274851f8b96e8d77dc69205dccdce38b188776ec3f72488f92790f4132a0e3da624b20a52763a67b50bf0b73804339b6a6713e4de23a5dfe SHA512 054656d522edaa005c1cf3efedf29c0cbcbd41ea2ee94aa7000b87b219ececaf4e2d0dc53f728a945b0028fcaac9c38467327f48c23e4d360c2a69a40e7bb7ba
 EBUILD nodejs-14.8.0.ebuild 5864 BLAKE2B 7ee566dff438cdb6e865e7e850baca0abbf3eed480d60c673a1e8cbbff652828a602561a4658b6923c328a1ce872cd4bf08098123329372ff2e811e854f689ef SHA512 cc2a1cf7b04a767e7cfa71b8308bc52763fe6ed8aca8fbab44e161048e59d5f45d946953c7f71d58b576b9c995b8d95fed5ce147988833f7560490ca1f3c12ae
 EBUILD nodejs-14.9.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
-EBUILD nodejs-99999999.ebuild 5782 BLAKE2B 91b3e65a9809f00405872d40032d9411b655d00c6e498050efe303e578a723a0e3245d846fd84e4ed9ce91cd677df71d744bbbc956017d869a93e5c19d2113e3 SHA512 051a3e32e82faf388137f4be8be8df4d95fa9f1ec39ebed2ddea41c1f445262bdc6fe4538d9109d8dab60bc793e0e6fe178e79c5571ebc1e366cf240c7111d43
+EBUILD nodejs-99999999.ebuild 5782 BLAKE2B 8be8e505f9fe119bbbd0d79b84b7a05d70bbfe08b239f6f14da7d4ae140c017755ac0c6d47dc8037b2760a4e606fc34c119ffec0c6e9a5fbab98ee823fd938bf SHA512 3ca3921d9c73a9d9916cf982171e7409a79912aa899025471532a2976c7c9c24f70cf7731a4abab3b989cc426ef9867c612465a833fa6cdc338cc7613e113947
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/nodejs-12.18.4.ebuild b/net-libs/nodejs/nodejs-12.18.4.ebuild
new file mode 100644
index 000000000000..af217c2f69dc
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.18.4.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-14.11.0.ebuild b/net-libs/nodejs/nodejs-14.11.0.ebuild
new file mode 100644
index 000000000000..43b934166628
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.11.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-14.12.0.ebuild b/net-libs/nodejs/nodejs-14.12.0.ebuild
new file mode 100644
index 000000000000..43b934166628
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.12.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index e7b61f1ab582..70e923f68c04 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -22,11 +22,11 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.35.0:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/nghttp2-1.39.2
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-66.1:= )
+	icu? ( >=dev-libs/icu-67.1:= )
 	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 BDEPEND="
diff --git a/net-libs/openpgm/Manifest b/net-libs/openpgm/Manifest
deleted file mode 100644
index 8b3b27e556e1..000000000000
--- a/net-libs/openpgm/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST openpgm-5.1.118.tar.gz 557816 BLAKE2B b066aabb71701f6b1d33313e95212ec37aec4ddab8b56a0a44f5ed862bca8a5ac5846150ba766340a66ee82d5a579a84348ae0e232238664202f1c37a405ab52 SHA512 50acd102f03fb250cd027c8f4843749641c7b1a4c1dfc41b136627feb59209bc7a2bbd08b7edeac603fb820118c6683ae9377a692949608bad455fef91c97274
-DIST openpgm-5.2.122.tar.gz 583469 BLAKE2B e3520f88282eed7da7890d678a25252a43157982955fab2740766cda9ce6c475ac5f5e3897c6dc1312a19d17e9e6ba94638f4d6fb93e42599359927e29f0962c SHA512 f8b29fb69acb548536179262665c0cdcc8bb1510d3e970d6abebaf33e301f87fbfa7e2c46e387973d8b65470350af66b3130482269b9fbb15fe7bf98b52f6404
-EBUILD openpgm-5.1.118-r1.ebuild 704 BLAKE2B 4d62ee8dadc0d44a769876b692e66fc89f97fcce97f7bde109a16705842e735235a6a25abbcc55e9a54e4f3d4cf8132ce5b716a4e6e84cf88f222ff2489785da SHA512 644b33e015b6266556a4c68589948692de20dd7a0a683b156792cf165c706d7ac0c95e11e28f3a6a989119a23d34cd70e48abc4ef8d896e92460ca4136168084
-EBUILD openpgm-5.2.122.ebuild 716 BLAKE2B 07a25febac86f286638720f239d481fda3bb8f094ff033da964f54f494860abbb37f1bbd9fe4a75a62c28950a830bc55f3633d372c32161924ac7a4db9826f21 SHA512 08ac64a62df804b86c670f2c4e3dfae69301a688fc9fe12812afb7cda25d8200c0ce7e8fb2c94ca06e1f5225288d05dfcbb6191e0712e95964e758a88f362265
-MISC metadata.xml 252 BLAKE2B 6c3a806621bff6345c81c8745469d37c6dea7b0f4e3053a8e768420e72a6e19dc5be32c070d25df570f5cc25083218920d6cb7398a0a67061eda42b9fa45cce8 SHA512 a630f122a596a2325eb582cbaf062dcbd4e27bf2bf5677b8ef0695cd61434c1d96a2c33ef353b6e9659c5fee62a98edfe652474a2150b6ca159e71b146199773
diff --git a/net-libs/openpgm/metadata.xml b/net-libs/openpgm/metadata.xml
deleted file mode 100644
index ce00d8d56813..000000000000
--- a/net-libs/openpgm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">steve-o/openpgm</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
deleted file mode 100644
index b4fb79c7dc76..000000000000
--- a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils python-any-r1
-
-MY_PV="${PV//./-}"
-
-DESCRIPTION="Open source implementation of the Pragmatic General Multicast specification"
-HOMEPAGE="https://github.com/steve-o/openpgm"
-SRC_URI="https://github.com/steve-o/${PN}/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="static-libs"
-
-DEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}/${PN}-release-${MY_PV}/${PN}/pgm"
-
-src_install() {
-	DOCS=( "${S}"/../doc/. "${S}"/README )
-
-	autotools-utils_src_install
-}
diff --git a/net-libs/openpgm/openpgm-5.2.122.ebuild b/net-libs/openpgm/openpgm-5.2.122.ebuild
deleted file mode 100644
index 43058f88b4f5..000000000000
--- a/net-libs/openpgm/openpgm-5.2.122.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils python-any-r1
-
-MY_PV="${PV//./-}"
-
-DESCRIPTION="Open source implementation of the Pragmatic General Multicast specification"
-HOMEPAGE="https://github.com/steve-o/openpgm"
-SRC_URI="https://github.com/steve-o/${PN}/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-DEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}/${PN}-release-${MY_PV}/${PN}/pgm"
-
-src_install() {
-	DOCS=( "${S}"/../doc/. "${S}"/README )
-
-	autotools-utils_src_install
-}
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index fa3dca673e72..f6d0667dcad2 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -1,16 +1,9 @@
-AUX serf-1.3.2-disable_linking_against_unneeded_libraries.patch 554 BLAKE2B 17f96c6629fa21830f0223f9c6210ba3f52aa443da832bf9aa1c1b207c649c4da465328a88865fd77ea8a34fd048524df892c381b4ae7da1c2d35f3eb357fc99 SHA512 29a2a18d062ecede2c544a6de510f17556deb9d9036b4c9248035e22d561e90fac902fdd38c5dbda649bb44f2eeab3407ee3fc59697c825a8fd76a787043c4ee
 AUX serf-1.3.8-openssl.patch 960 BLAKE2B ba24959e39cafd03d041e349806b03feeca52fc1432fa96a39cf44fe392ad5e25bfc11e305d20b752f0469445f3a0932bd1d1de0646c3a95a9c24aec36560d81 SHA512 902f0b28a0166bb2c30127600eeacd8117ab9c8a21787aec7f6ee77b94554a613ec1bdcaef3bbbd730254c9c26a7c40b47906b296ca869af909ec18d9f2ad59b
-AUX serf-1.3.8-scons_variables.patch 3553 BLAKE2B 528a642abd693f4052f3af9d1580defde70fe1ea4ee9e3c117847249b270cb8928a63282d4be34ece1aa29b8230fe42393329f56b5286526f168097d184efcec SHA512 e492c5a9289700330e964a9b42da9002f1b992ed197a9aea54f188188264e8dc2047a3005c9724769ff5e845d5b9db31d622981e016284523fc65dec6a3c04bf
 AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de4d82f82ba66b9c574a21720d7bad61ea2d575363426d297f1649d394cfac4fcd8b5f963dd307d60db2f08fa3e2a2f SHA512 c5d7cbc7ed7632e3ead1a1eec36106a4e50f89c42b7099d8e6bc2a3021b4b3058c16cb1aef1fedbb26e6bd5b4d0b12b34567d40c38c0f1c5cb6528e924db9e84
-AUX serf-1.3.8-tests.patch 3159 BLAKE2B 96cd539541f8ca59dd5693bed44854d2aa626cdecaf89e754e8123166559f8e6518f3cde372a42f6d0455302d53dba6a55e51fd44734e1984730f34a090969a3 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d
 AUX serf-1.3.9-libressl.patch 394 BLAKE2B aa1a15b09b64c55d52e87df9f9a069f0d8ae3be3dc399431d3429bf0a174e2df5151ba2f03eb47f8e8a6771a1c2581d29643f1a630efc385485a69aa937d33e8 SHA512 fc547b040a4e10243ab4dc7d8873e8197861c07b4442aeda939aa27ed963432402bd55d2895b86c5156638d9425dd6a5457b081e9d3c02283f9fc640579f181c
 AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
-DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.8-r1.ebuild 2069 BLAKE2B 65a5e2ff2eed6eec0119275ba9547ff4b7a3ce78dca38374e45a8c060f2ff265e0cf7afb504a3c26476866b6579d597785a919905b593aa04685299f91c412fe SHA512 363a3430963cc39cf7f88575c401186d83be1c92b226d2e1356d84c3ad60ce3624ec78c398f99144d67cc26736705b9028b1cbccfde0e8d005dbba4c6a481a89
-EBUILD serf-1.3.8.ebuild 1456 BLAKE2B 17382c17f6e9cfd9c86a7439b4bfb809044cc109e3cea1e9c0f072ba30fb5997edbcee40b46e55784feed6efca4d169329baec3ef9321e7f24cf0228c4427953 SHA512 a06af1e5c87bd64727f309b0d85ae7676b64d0847c0cca44a2389448cd092350f559e67b213cef130e72b38b0425ee0e4a297f717832f9e132e1213adc80ca33
 EBUILD serf-1.3.9-r1.ebuild 2054 BLAKE2B 6f7d698e7e77eda30d0725d1ac55662ef69262e4d2599e2b74a867911c6b24deb29dce5a82eb75d53a2e8be52c62c0e03ef09ff40d27a1f3808a7a9aac8e9cac SHA512 ca6e8e60e6c587e35fdeffe0d231db79354f929b79953633cc4348d1b16fb3f4dacf5f5ce49ce6f19f31d8e87b4a112dcd56e9ea53e66ce6a2c5288352bdd334
-EBUILD serf-1.3.9-r2.ebuild 2104 BLAKE2B 7a2161b1bc1ebaa27837e2285c9d8c0e89e4d7f836d1e03141b16914941210450e6d620b0e80ed21f9cb53796b2e07e3cd6ef41c9f872b9d475880317fcf217f SHA512 0ab048246a075b326d8d56db9bba3aaf75ea6f34712e25bb6e7013103e261fb8c6a5ab57279e2f80a963e7c7f4d351841e8d7e805f53279e77e491dcb60df7ad
-EBUILD serf-1.3.9.ebuild 2071 BLAKE2B 706481c2dd5e1f3150d04cb55bf33396010cbe9980480497fcbf5eb484cda2d06a6da58ce5d17a18587a7cf23c904e34f8d05217dbf827c7bc5ac6bd14d68077 SHA512 c05e6f9d6eb392836c80d553b3d56fd7e4b3b2df09b3365c2be48a4eefcd25ddad389b19aad6e8b82867bc796890240acfa081a1c581f75c3b6430fb8aaf4699
+EBUILD serf-1.3.9-r2.ebuild 2101 BLAKE2B 07e68d0b1e29e72e93f59ec0656b20a0b86e1c4f5d26397d998f260cea12dc095b238921689cb1b06ddf312ed2dc3f2d814fe2da036d918851268f9303a8510a SHA512 af6da24c47d857855a53f7ce86ba2ae47cdbc3c6e74088411e619d53611a181e2b18c07d004318fb8ea84320dd9dba8754d5f724e5dd03436d85f20d64bd70ea
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch b/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch
deleted file mode 100644
index f86646a28d89..000000000000
--- a/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- SConstruct
-+++ SConstruct
-@@ -345,8 +345,8 @@
-   ### there is probably a better way to run/capture output.
-   ### env.ParseConfig() may be handy for getting this stuff into the build
-   if CALLOUT_OKAY:
--    apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip()
--    apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip()
-+    apr_libs = os.popen(env.subst('$APR --link-ld')).read().strip()
-+    apu_libs = os.popen(env.subst('$APU --link-ld')).read().strip()
-   else:
-     apr_libs = ''
-     apu_libs = ''
diff --git a/net-libs/serf/files/serf-1.3.8-scons_variables.patch b/net-libs/serf/files/serf-1.3.8-scons_variables.patch
deleted file mode 100644
index b51e846d8932..000000000000
--- a/net-libs/serf/files/serf-1.3.8-scons_variables.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-https://code.google.com/p/serf/issues/detail?id=151
-https://code.google.com/p/serf/source/detail?r=2413
-
---- SConstruct
-+++ SConstruct
-@@ -223,12 +223,12 @@
- 
- if sys.platform == 'darwin':
- #  linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
--  env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
-+  env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)])
- 
- if sys.platform != 'win32':
-   ### gcc only. figure out appropriate test / better way to check these
-   ### flags, and check for gcc.
--  env.Append(CFLAGS='-std=c89')
-+  env.Append(CFLAGS=['-std=c89'])
- 
-   ### These warnings are not available on Solaris
-   if sys.platform != 'sunos5': 
-@@ -237,17 +237,17 @@
-                         '-Wall'])
- 
-   if debug:
--    env.Append(CCFLAGS='-g')
-+    env.Append(CCFLAGS=['-g'])
-     env.Append(CPPDEFINES=['DEBUG', '_DEBUG'])
-   else:
--    env.Append(CCFLAGS='-O2')
--    env.Append(CPPDEFINES='NDEBUG')
-+    env.Append(CCFLAGS=['-O2'])
-+    env.Append(CPPDEFINES=['NDEBUG'])
- 
-   ### works for Mac OS. probably needs to change
-   env.Append(LIBS=['ssl', 'crypto', 'z', ])
- 
-   if sys.platform == 'sunos5':
--    env.Append(LIBS='m')
-+    env.Append(LIBS=['m'])
- else:
-   # Warning level 4, no unused argument warnings
-   env.Append(CCFLAGS=['/W4', '/wd4100'])
-@@ -260,8 +260,8 @@
-   else:
-     # Optimize for speed, use DLL runtime
-     env.Append(CCFLAGS=['/O2', '/MD'])
--    env.Append(CPPDEFINES='NDEBUG')
--    env.Append(LINKFLAGS='/RELEASE')
-+    env.Append(CPPDEFINES=['NDEBUG'])
-+    env.Append(LINKFLAGS=['/RELEASE'])
- 
- # PLAN THE BUILD
- SHARED_SOURCES = []
-@@ -307,25 +307,25 @@
-                CPPPATH=['$APR/include', '$APU/include'])
- 
-   # zlib
--  env.Append(LIBS='zlib.lib')
-+  env.Append(LIBS=['zlib.lib'])
-   if not env.get('SOURCE_LAYOUT', None):
--    env.Append(CPPPATH='$ZLIB/include',
--               LIBPATH='$ZLIB/lib')
-+    env.Append(CPPPATH=['$ZLIB/include'],
-+               LIBPATH=['$ZLIB/lib'])
-   else:
--    env.Append(CPPPATH='$ZLIB',
--               LIBPATH='$ZLIB')
-+    env.Append(CPPPATH=['$ZLIB'],
-+               LIBPATH=['$ZLIB'])
- 
-   # openssl
-   env.Append(LIBS=['libeay32.lib', 'ssleay32.lib'])
-   if not env.get('SOURCE_LAYOUT', None):
--    env.Append(CPPPATH='$OPENSSL/include/openssl',
--               LIBPATH='$OPENSSL/lib')
-+    env.Append(CPPPATH=['$OPENSSL/include/openssl'],
-+               LIBPATH=['$OPENSSL/lib'])
-   elif 0: # opensslstatic:
--    env.Append(CPPPATH='$OPENSSL/inc32',
--               LIBPATH='$OPENSSL/out32')
-+    env.Append(CPPPATH=['$OPENSSL/inc32'],
-+               LIBPATH=['$OPENSSL/out32'])
-   else:
--    env.Append(CPPPATH='$OPENSSL/inc32',
--               LIBPATH='$OPENSSL/out32dll')
-+    env.Append(CPPPATH=['$OPENSSL/inc32'],
-+               LIBPATH=['$OPENSSL/out32dll'])
- else:
-   if os.path.isdir(apr):
-     apr = os.path.join(apr, 'bin', 'apr-1-config')
-@@ -351,8 +351,8 @@
-     apr_libs = ''
-     apu_libs = ''
- 
--  env.Append(CPPPATH='$OPENSSL/include')
--  env.Append(LIBPATH='$OPENSSL/lib')
-+  env.Append(CPPPATH=['$OPENSSL/include'])
-+  env.Append(LIBPATH=['$OPENSSL/lib'])
- 
- 
- # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
-@@ -362,7 +362,7 @@
-         env['GSSAPI_LIBS'] = cmd.strip()
-         return env.MergeFlags(cmd, unique)
-     env.ParseConfig('$GSSAPI --libs gssapi', parse_libs)
--    env.Append(CPPDEFINES='SERF_HAVE_GSSAPI')
-+    env.Append(CPPDEFINES=['SERF_HAVE_GSSAPI'])
- if sys.platform == 'win32':
-   env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
- 
diff --git a/net-libs/serf/files/serf-1.3.8-tests.patch b/net-libs/serf/files/serf-1.3.8-tests.patch
deleted file mode 100644
index 65b9962f2529..000000000000
--- a/net-libs/serf/files/serf-1.3.8-tests.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-https://code.google.com/p/serf/source/detail?r=2443
-https://code.google.com/p/serf/source/detail?r=2444
-https://code.google.com/p/serf/source/detail?r=2445
-
---- test/test_buckets.c
-+++ test/test_buckets.c
-@@ -1232,9 +1232,9 @@
- 
-     /* The largest buffer we should need is 0.1% larger than the
-        uncompressed data, + 12 bytes. This info comes from zlib.h.
-+       buf_size = orig_len + (orig_len / 1000) + 12;
-        Note: This isn't sufficient when using Z_NO_FLUSH and extremely compressed
-        data. Use a buffer bigger than what we need. */
--//    buf_size = orig_len + (orig_len / 1000) + 12;
-     buf_size = 100000;
- 
-     write_buf = apr_palloc(pool, buf_size);
-@@ -1309,12 +1309,12 @@
-                           expected_len);
- }
- 
--static void deflate_buckets(CuTest *tc, int nr_of_loops)
-+static void deflate_buckets(CuTest *tc, int nr_of_loops, apr_pool_t *pool)
- {
-     const char *msg = "12345678901234567890123456789012345678901234567890";
- 
-     test_baton_t *tb = tc->testBaton;
--    serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(tb->pool, NULL,
-+    serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(pool, NULL,
-                                                               NULL);
-     z_stream zdestr;
-     int i;
-@@ -1333,8 +1333,8 @@
-     {
-         serf_config_t *config;
- 
--        serf_context_t *ctx = serf_context_create(tb->pool);
--        /* status = */ serf__config_store_get_config(ctx, NULL, &config, tb->pool);
-+        serf_context_t *ctx = serf_context_create(pool);
-+        /* status = */ serf__config_store_get_config(ctx, NULL, &config, pool);
- 
-         serf_bucket_set_config(defbkt, config);
-     }
-@@ -1356,11 +1356,11 @@
-         if (i == nr_of_loops - 1) {
-             CuAssertIntEquals(tc, APR_SUCCESS,
-                               deflate_compress(&data, &len, &zdestr, msg,
--                                               strlen(msg), 1, tb->pool));
-+                                               strlen(msg), 1, pool));
-         } else {
-             CuAssertIntEquals(tc, APR_SUCCESS,
-                               deflate_compress(&data, &len, &zdestr, msg,
--                                               strlen(msg), 0, tb->pool));
-+                                               strlen(msg), 0, pool));
-         }
- 
-         if (len == 0)
-@@ -1378,10 +1378,15 @@
- static void test_deflate_buckets(CuTest *tc)
- {
-     int i;
-+    apr_pool_t *iterpool;
-+    test_baton_t *tb = tc->testBaton;
- 
-+    apr_pool_create(&iterpool, tb->pool);
-     for (i = 1; i < 1000; i++) {
--        deflate_buckets(tc, i);
-+        apr_pool_clear(iterpool);
-+        deflate_buckets(tc, i, iterpool);
-     }
-+    apr_pool_destroy(iterpool);
- }
- 
- static apr_status_t discard_data(serf_bucket_t *bkt,
---- test/test_util.c
-+++ test/test_util.c
-@@ -363,10 +363,18 @@
-     return status;
- }
- 
-+static int pool_abort_func(int retcode)
-+{
-+    fprintf(stderr, "Out of memory\n");
-+    abort();
-+    return 0;
-+}
-+
- void *test_setup(void *dummy)
- {
-     apr_pool_t *test_pool;
-     apr_pool_create(&test_pool, NULL);
-+    apr_pool_abort_set(pool_abort_func, test_pool);
-     return test_pool;
- }
- 
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
deleted file mode 100644
index f951a44343b0..000000000000
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils scons-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="HTTP client library"
-HOMEPAGE="https://serf.apache.org/"
-SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="kerberos static-libs libressl"
-RESTRICT="test"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/apr-util:1=
-	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib:0=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-2.3.0"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-tests.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-static-lib.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-openssl.patch"
-
-	# https://code.google.com/p/serf/issues/detail?id=133
-	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
-
-	# need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
-}
-
-src_compile() {
-	myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		# These config scripts are sent through a shell with an empty env
-		# which breaks the SYSROOT usage in them.  Set the vars inline to
-		# avoid that.
-		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
-		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
-		BUILD_STATIC=$(usex static-libs)
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		CC="$(tc-getCC)"
-		CPPFLAGS="${CPPFLAGS}"
-		CFLAGS="${CFLAGS}"
-		LINKFLAGS="${LDFLAGS}"
-	)
-
-	if use kerberos; then
-		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
-	fi
-
-	escons
-}
-
-src_test() {
-	escons check
-}
-
-src_install() {
-	escons install --install-sandbox="${D}"
-}
diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
deleted file mode 100644
index 5fca0dc8af95..000000000000
--- a/net-libs/serf/serf-1.3.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils scons-utils toolchain-funcs
-
-DESCRIPTION="HTTP client library"
-HOMEPAGE="https://serf.apache.org/"
-SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="kerberos"
-RESTRICT="test"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/apr-util:1=
-	dev-libs/openssl:0=
-	sys-libs/zlib:0=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-2.3.0"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-tests.patch"
-
-	# https://code.google.com/p/serf/issues/detail?id=133
-	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
-}
-
-src_compile() {
-	local myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		APR="${EPREFIX}/usr/bin/apr-1-config"
-		APU="${EPREFIX}/usr/bin/apu-1-config"
-		OPENSSL="${EPREFIX}/usr"
-		CC="$(tc-getCC)"
-		CPPFLAGS="${CPPFLAGS}"
-		CFLAGS="${CFLAGS}"
-		LINKFLAGS="${LDFLAGS}"
-	)
-
-	if use kerberos; then
-		myesconsargs+=(GSSAPI="${EPREFIX}/usr/bin/krb5-config")
-	fi
-
-	escons
-}
-
-src_test() {
-	escons check
-}
-
-src_install() {
-	escons install --install-sandbox="${D}"
-}
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
index 646928a7b050..2ec7d7f43574 100644
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
deleted file mode 100644
index 4b06dc39a97c..000000000000
--- a/net-libs/serf/serf-1.3.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils scons-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="HTTP client library"
-HOMEPAGE="https://serf.apache.org/"
-SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="kerberos static-libs libressl"
-RESTRICT="test"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/apr-util:1=
-	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib:0=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-2.3.0"
-
-src_prepare() {
-	#epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch"
-	#epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch"
-	#epatch "${FILESDIR}/${PN}-1.3.8-tests.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-static-lib.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-openssl.patch"
-
-	# https://code.google.com/p/serf/issues/detail?id=133
-	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
-
-	# need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
-}
-
-src_compile() {
-	myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		# These config scripts are sent through a shell with an empty env
-		# which breaks the SYSROOT usage in them.  Set the vars inline to
-		# avoid that.
-		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
-		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
-		BUILD_STATIC=$(usex static-libs)
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		CC="$(tc-getCC)"
-		CPPFLAGS="${CPPFLAGS}"
-		CFLAGS="${CFLAGS}"
-		LINKFLAGS="${LDFLAGS}"
-	)
-
-	if use kerberos; then
-		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
-	fi
-
-	escons
-}
-
-src_test() {
-	escons check
-}
-
-src_install() {
-	escons install --install-sandbox="${D}"
-}
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 824b76b605c7..b3e20359dc4c 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,9 +1,7 @@
 DIST xrootd-ceph-4.12.0.tar.gz 80601 BLAKE2B 05e31ec3a03d50f36f7ef368705ca8ad064d1d9da4fc3815aaf96ce358da07348aaea264d82884da2782cf7c1069b584269fff9f2a3140057b2d4d2929639f77 SHA512 de55cc923bad3629de6428dbc4e7c7e2cb802512f03f49bcfc79f12221828cd9702f1c9a1bc28b599dce801c937146cf381dfd589c85f4f5721c4fbf13f6ad34
-DIST xrootd-ceph-4.12.3.tar.gz 80615 BLAKE2B d7040be47fe3f9283036f1d56f509860c6a56f29f68835d1469f3ee48377dd90e1c76b28c65b1dab24b64e00083368e1242bd4988f15b6b9df50a0c7715d9f00 SHA512 8df64c33b97cb9d92bc0a962c34c82d789551d76a3450b56125f2924357ee46c51513f992809357a217890d1d261144a92ee1b95f075b2c8081d4646402467b0
-DIST xrootd-ceph-5.0.0.tar.gz 80615 BLAKE2B dd37dd2c76d59c8e1fe672fd9a573af8197f0f93a64e1ea1a2b02fca6be66c163c54f999089d397715135d0e209cc0b570f6d381b9f3c472a1e7316e22a03d46 SHA512 12215876bd73d59217909390595d128d03e12eed82d130ccec3b88c02620dbeb3e028e4d8101121778df5a804de1cc66bc485aa3073455ab5ef88d8ac158550f
-DIST xrootd-ceph-5.0.1.tar.gz 80620 BLAKE2B e36e07a5dd8cc5035986774e76a231734c7d8e0584cecc941cc41045dddedde75173d83f9a55525069f83fefd50af9bab93d038a40c19f06b158ca45cbfa3a1e SHA512 8e00cba70b2cea1a5a83041df1b5c18ba3ec9dc801bdffd5cb14dbdffd02a3230b58603523a2ae0995a4685343bcb3d1ad8afbdf9a345104c7e29de3717509a2
+DIST xrootd-ceph-4.12.4.tar.gz 81253 BLAKE2B 0b3d0e347e02b6948550c44487e0edb1c65075407b444b6242fb3e647e3fe91ff2d03ca10f13b5ae05ffa931eaf0b73a75055999a55b74ec20d8e6b853865f67 SHA512 cd793d18f6162a98f50f605177aae1421227226540fe3e632adae3632c053e78f3b53b1e09f6f60a9c64a5a5e5d019aceaf1ab1c11dde81e5c36512b47ac0ac9
+DIST xrootd-ceph-5.0.2.tar.gz 81255 BLAKE2B 529d2c361cc7660cdbb481cdbae1fbf4cd706f29df868c645775b96efa7efaaecd9ea8b7d915c15b5ff78ad1395bb8271a3f1c1105ea0b42dced77efa33acaa7 SHA512 9f8de694a9a864ee0a963bb47c603d2cd3a77b4e13efacdd7f35674016358ce3b0a3fc5850098a29774749f54fa82db12c0e56b55d814873c124d9e19c7c23c5
 EBUILD xrootd-ceph-4.12.0.ebuild 679 BLAKE2B 6171c6bf61a24f633fbb774d23b398160fe9d00ae797d6c40fc2058ce33c4216e6a1a79846d38e6cf489fa3655772441505b30cf372a19e25f6fe5c2398d4948 SHA512 72c4e43a05aee572e139050e2428046f70e1ce2199698998cabc1f3f391f5dd8369a8ed081a39fca733999ca4cca102a2f7a4baf8de9605b127f2d14f5df2dfd
-EBUILD xrootd-ceph-4.12.3.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
-EBUILD xrootd-ceph-5.0.0.ebuild 954 BLAKE2B 7a80536c0f93bd17977c5dcd593a5657378d5c61e22a94865dbeb9b5aafab7c5b0e82a0ce7cf5bbdb4b42e61bc158eeafacca49f61abf04d8bbb94e7a8548ef3 SHA512 a5313627b4adc03f9fd895b447ca57cb083ce2f7547752c8413d8ae28016d157ecab4ee49ae1690abbaef2a7c62275eba352101bb18d74c8703a9e0bec53710e
-EBUILD xrootd-ceph-5.0.1.ebuild 954 BLAKE2B 7a80536c0f93bd17977c5dcd593a5657378d5c61e22a94865dbeb9b5aafab7c5b0e82a0ce7cf5bbdb4b42e61bc158eeafacca49f61abf04d8bbb94e7a8548ef3 SHA512 a5313627b4adc03f9fd895b447ca57cb083ce2f7547752c8413d8ae28016d157ecab4ee49ae1690abbaef2a7c62275eba352101bb18d74c8703a9e0bec53710e
+EBUILD xrootd-ceph-4.12.4.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
+EBUILD xrootd-ceph-5.0.2.ebuild 954 BLAKE2B 7a80536c0f93bd17977c5dcd593a5657378d5c61e22a94865dbeb9b5aafab7c5b0e82a0ce7cf5bbdb4b42e61bc158eeafacca49f61abf04d8bbb94e7a8548ef3 SHA512 a5313627b4adc03f9fd895b447ca57cb083ce2f7547752c8413d8ae28016d157ecab4ee49ae1690abbaef2a7c62275eba352101bb18d74c8703a9e0bec53710e
 MISC metadata.xml 496 BLAKE2B e2a202798936cfc2061b2660ab7ad32a4a4c02aab9789e46bdd5981795815505da531ab2891c9022447d2154b6070ddba3e1daa68f25b2373757cbe17d960a6c SHA512 43fa4446767cb279125fdedcaf415af260c42871460fd1144aff7bf47769070da9e9c4fc0e8b32c87fdd879f8dca24586a0764f0ad8a3ba715e1d95e07d60f70
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-4.12.3.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
index f701427b94c7..f701427b94c7 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-4.12.3.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.0.1.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.0.1.ebuild
deleted file mode 100644
index f38a421f4865..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=net-libs/xrootd-5.0.0
-	sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/cppunit )"
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdCephTests\.so"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-		# As of 5.0.0 the default plug-in version is still 4.
-		-DPLUGIN_VERSION=$(ver_cut 1)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.0.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.0.2.ebuild
index f38a421f4865..f38a421f4865 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.0.0.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.0.2.ebuild
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 5da466876d0c..f7ac2e291aa9 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,15 +1,14 @@
 AUX cmsd.initd 885 BLAKE2B 9198afa01850da74519a6869894ebd86313f87781e3e2401d429e5e05a938a19a583feca808f78c4b497fd459a8adaece01d0482b132646033575cd50ad5b1b7 SHA512 7f666e98634b205964d69fd540fb79c7ff3b6f1b423ed416a966d1e0d6a18d950908e1dc463e3cc8029fc062b2ff7d29693af8e5af2fb13a36500d40b16345e9
 AUX frm_purged.initd 895 BLAKE2B c192a3c69d3161a8342242789cfc1559f189c0748cd0bdd1ee6baf9b5ba98c80d8103fa55344e1c9b040a513045c7a473272da46c800ff2afa45a0665a93c3b2 SHA512 f9c09f8baae7ed391d5248f5dfb7a1d4d60f23605b2646e6f3c2ec33b05838918a4ba4874424e9b4e674f1ca127d57760364552f6f948dcd3ef84245730efc30
 AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99013c01d4f9681e010082bfef332ba2cc520afdbef67051ea80ee6922e515a30de32e735f0a6c6a7 SHA512 1c38b20c9b54cab17706c040a90b00df61c9b2f5e4e7a9cc26fa3b125e1d132097222921b5627a33f69b80c8ae5a64cfbaea0a4880588de9fa9d18f6aaa04768
+AUX xrootd-4.12.4-http_secret_leakage.patch 1339 BLAKE2B 47ff77bbc2c5a4d2ef0dafbb10dc75de45b7a263ed13867f050c11f07555d7818b811c20e9020696d0a2c69568b79e329523354973a61124a6b084d0ff4680f9 SHA512 c22d744444f96b2b4b93f9e6dbb18622a271e2a88313ed796783bb722a951098bfde60be19f5ea747e83d71d66754cab00e4ca7141c5f3d91ad643228f29c146
 AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
-DIST xrootd-4.12.3.tar.gz 2574996 BLAKE2B 1ba6ecdee473fbe1f6367459dfe8324f38e2d72aa64ed349ccdcaa7616a3d70f0b647d2eac6babbcc0e1b673ff44a050c05f23e80fb89161f121fa6dd3484311 SHA512 e4f4ad744a71a7fc69a16f2114b6d5962ddf0b22bd86f7eb19703313d55242813f13be1a1f23c541b966674bdb4854f955843322525f37bc83647e8f2fbe076d
-DIST xrootd-5.0.0.tar.gz 2754256 BLAKE2B c80a38ede3263ae669181f2173f6ee2bb0a347dc973cecc9dedf00867041190f7bceb7f475696e8cd3921c57d4c197b73ee57b29c9e78a027393ca61dca1b6d3 SHA512 75b69d3da2a6e477edbf5588afd943a91a2e1e86fcc98afc34d964c9231fc0224b4eec82336e9a7d5bd8bd0cd5c20e442ee37b8f6239f417b05efdf39038d93c
-DIST xrootd-5.0.1.tar.gz 2759931 BLAKE2B 2bc76f660f7fb3c9202c37dc10f099f2bd06868b00c43e6015ebb0d9cf3edf8ac777f76c1f71d0f1f4b252cedd62c9aa74a449cb5f369492a5ee63813bb7924f SHA512 95e0fe97f66a320999d4c2dd2ac5be4e2ba7779f220aa521e4882925d5e9262c34991f0ecbd3c2449b97977ff4cdbdcd9477ed780d1a6dbf8fbd3f547b4932ba
+DIST xrootd-4.12.4.tar.gz 2577360 BLAKE2B f2e4413bcbf02dccb1ac7b0ceec8fbc2bb8b1de838cd9753c9d61f76fc2d68e845a41075b63a4afe56b1a434cf89ecf4f4b8571fa9ae866a19e6bcadcc5dcd9b SHA512 8cbc5e5f270f39c48b7c75a15e2721ebb793f13419608834777f39bc0ee7dd8c4fad481367f997172dae5029d9e5e4e9d7870843bd5c9957fa9fe439592c4364
+DIST xrootd-5.0.2.tar.gz 2764503 BLAKE2B 35bc642d3601738135ff24a77f9bc8795568553856284ebe80d90315039d04109353d2e00310f8b8168f6b1176ee295c9116a7e6adaff33ca23383da9deecf17 SHA512 e58b5484c0fa9f83643e252eb8228f2061130b4f97964283a6adb8a81560841f3d44814572136023d944be6bdd97cff551e75bbfb04e6c9aafaa779ecb051255
 EBUILD xrootd-4.12.0.ebuild 2517 BLAKE2B 80d5848ae7082e174e89e877d468929fb95ffd8663a74d1aec792ecbc533c7d3fbebd8405e78b2987aa055345dea02a4d6d60cd34657ed72b2eba0509adfd003 SHA512 56e62ed7a09bdd941a01bcac483e852cdb6fb12f241266af3e004361729bbda789299b32077bfe48116e69f9b87bebdec4ccea79bf4ae2f017f43c705d3c524d
-EBUILD xrootd-4.12.3.ebuild 2519 BLAKE2B 395695d7458e091905988112f84008e6b6ec67cd5ebd5ea76cdf04ff7f2ffdbcf3ae35b7a94aec178fdecddbb8eb2e9db984a017cc73eaad59cd42fa3e006e4c SHA512 4fea5f8371f05507a25c20472600b0b4fe085442e81b0acec0dea3fbe65483836da1ffca4fa70f639f81aba336aaf83b7e0467b7a7dd879bdd98da2ac99907e0
-EBUILD xrootd-5.0.0.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
-EBUILD xrootd-5.0.1.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
+EBUILD xrootd-4.12.4.ebuild 2603 BLAKE2B d1a63f322e8b1ac35560cc8a0b4769fe10c83556171a2c434af40d6d70787b6a6356ce100fab44d5e202db11806737d7037357d2fb4db1395c34f7ba18afb4f0 SHA512 d18c1fbad414b4cf4f94f6123749880d4d3369a7479aef27554ce03b0ff0f61132f5c1ec79a169112cb7cf1d547ec515ba178ccff7d5de5c784b8613037c88bc
+EBUILD xrootd-5.0.2.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch b/net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch
new file mode 100644
index 000000000000..953c6aa3b2bc
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-4.12.4-http_secret_leakage.patch
@@ -0,0 +1,41 @@
+Backported from 5.0.2. Not quite sure if xrootd-4 is actually vulnerable
+to this - but just in case.
+
+From fff97c2dc6703dc1ba8b28b1bf67eeb278ff3e22 Mon Sep 17 00:00:00 2001
+From: Andrew Hanushevsky <abh@stanford.edu>
+Date: Wed, 2 Sep 2020 23:13:52 -0700
+Subject: [PATCH] [HTTP] Prevent secret key leakage if specified in the config
+ file.
+
+---
+ src/XrdHttp/XrdHttpProtocol.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/XrdHttp/XrdHttpProtocol.cc b/src/XrdHttp/XrdHttpProtocol.cc
+index 66b89df20ed..5f50f2aeadd 100644
+--- a/src/XrdHttp/XrdHttpProtocol.cc
++++ b/src/XrdHttp/XrdHttpProtocol.cc
+@@ -1986,6 +1986,7 @@ int XrdHttpProtocol::xsslcafile(XrdOucStream & Config) {
+ 
+ int XrdHttpProtocol::xsecretkey(XrdOucStream & Config) {
+   char *val;
++  bool inFile = false;
+ 
+   // Get the path
+   //
+@@ -2001,6 +2002,7 @@ int XrdHttpProtocol::xsecretkey(XrdOucStream & Config) {
+   // otherwise, the token itself is the secretkey
+   if (val[0] == '/') {
+     struct stat st;
++    inFile = true;
+     if ( stat(val, &st) ) {
+       eDest.Emsg("Config", errno, "stat shared secret key file", val);
+       return 1;
+@@ -2059,6 +2061,7 @@ int XrdHttpProtocol::xsecretkey(XrdOucStream & Config) {
+   // Record the path
+   if (secretkey) free(secretkey);
+   secretkey = strdup(val);
++  if (!inFile) Config.noEcho();
+ 
+   return 0;
+ }
diff --git a/net-libs/xrootd/xrootd-4.12.3.ebuild b/net-libs/xrootd/xrootd-4.12.4.ebuild
index 17545ef3217e..105a4611edcc 100644
--- a/net-libs/xrootd/xrootd-4.12.3.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.4.ebuild
@@ -42,12 +42,16 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-4.12.4-http_secret_leakage.patch
+)
 
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,
 # see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so"
+QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so
+	/usr/lib.*/libXrdClTests\.so"
 
 pkg_setup() {
 	use python && python_setup
diff --git a/net-libs/xrootd/xrootd-5.0.1.ebuild b/net-libs/xrootd/xrootd-5.0.1.ebuild
deleted file mode 100644
index b96f560be940..000000000000
--- a/net-libs/xrootd/xrootd-5.0.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-inherit cmake python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		python? ( dev-python/sphinx )
-	)
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CRYPTO=$(usex ssl)
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-		if use python; then
-			emake -C bindings/python/docs html
-		fi
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-5.0.0.ebuild b/net-libs/xrootd/xrootd-5.0.2.ebuild
index b96f560be940..b96f560be940 100644
--- a/net-libs/xrootd/xrootd-5.0.0.ebuild
+++ b/net-libs/xrootd/xrootd-5.0.2.ebuild
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index a4defc6c8b62..bc1bdfd1e2ff 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -5,5 +5,5 @@ DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c32
 EBUILD zeromq-2.2.0.ebuild 1202 BLAKE2B d7305176ccb01d706480c012de123b16eacc7bae10916377bff524575ecd4a174cab2112fd1a1b20e3465f69d400c5d3a02f3ba8b30cddfdd75f01093f82e935 SHA512 ab6b64d7b0abc80e03241fc26bcf87e753730b9d6bdc52ad09578d83124b7acc3b49aad2bdee662cd99a4c6e26c19c2b49445cf5d60a6b45cb74452502f4c2a1
 EBUILD zeromq-3.2.5.ebuild 1493 BLAKE2B 44f12a38570540f82df5381908f68759b02a423b9a0e9ff014432c02bf6538f2fd08380eb241a6ef7bad12b50bbff0e53b72a05cea11dfb012dab3b229b7c3c8 SHA512 2b5999497c19de44b8846ee173d8dc96ace8d2e9ff1c9f0e1e1ef8633513ed2bea7a33cdf2947b8c5cfda36911a405132a71114efad45c1e40ca6cfb878a0918
 EBUILD zeromq-4.3.2.ebuild 1436 BLAKE2B 500b642be77c2ae67926d932eddead3a872bb6cd5d0a752e2b7fe87f5ce4ba52b3256903f05ba62e923985637fa3c7af08fbbf504cf79b7caff2d74a7f794397 SHA512 333b64802cdafc872e5db83fc3566f6f307e07cdd668939f0c955e6bed2c156dd02ffde51fc17f393842ca13f57a5ec9f44f459eaa02d5fc9ee13331b9600926
-EBUILD zeromq-4.3.3.ebuild 1437 BLAKE2B abdafd58cdfc2807d1aaf9f16f660186441f5d8099ed741383b8cc0f83f323c4002a12e1cfc245f656f7a3b11fcdcb588c9c50f9dc92706ff0ab19c6eefaf88e SHA512 63785fce2db3c9901a9a9afece8568f85dc8367a62f0799559e7799275c0bd414368a2e5fd8a71975c81c739d16edf4e1336d4e34cedb8b38ac5c94cda052406
+EBUILD zeromq-4.3.3.ebuild 1436 BLAKE2B 500b642be77c2ae67926d932eddead3a872bb6cd5d0a752e2b7fe87f5ce4ba52b3256903f05ba62e923985637fa3c7af08fbbf504cf79b7caff2d74a7f794397 SHA512 333b64802cdafc872e5db83fc3566f6f307e07cdd668939f0c955e6bed2c156dd02ffde51fc17f393842ca13f57a5ec9f44f459eaa02d5fc9ee13331b9600926
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.3.ebuild b/net-libs/zeromq/zeromq-4.3.3.ebuild
index bb5cb548f8d5..a35a1e964c01 100644
--- a/net-libs/zeromq/zeromq-4.3.3.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
 RESTRICT="!test? ( test )"