gentoo resync : 18.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
commit: eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree: 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /net-libs
parent: a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)
71 files changed, 599 insertions, 895 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index dd4a0f523d3a..7cc4885217d2 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 4e94a4a71c62..9d81bc99f23c 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,6 +1,8 @@
 AUX cvm-0.96-fix-test-padding.patch 971 BLAKE2B a0a6dbd617427347a4b93b436f326d2cda5bd123adb6410a29f4b5955f014d078935cbf7178a1857941fa09ace013a5800f615cc0a5067dbfca10b228ec0e758 SHA512 18fa658e70030709fb83b81311a13358b09cc872ea8bb9db91ab78ea56dea13459f0bdf8e02bf8c6045c8838d7ea1941f73d0c405fe3b38f2edcb29a9cc200fb
 DIST cvm-0.76.tar.gz 91957 BLAKE2B 4b1ff780fa0842f2dba7afafe98479b76b95c3dc71ea3fe0321c92039697fde1fa69a99ee78450cadae6b23941344c48f4d4c845f9c3fcc8a69a5f8f208fbee6 SHA512 f3634be766e1381a95c09514547679f458e92b5f4de468b5d3b4e5f7e8f1eb8d1aa7eb5e2b15a374cbf51cc5f6e6269e7f5e7d9daf8d2adfaed37d2e11f472fa
 DIST cvm-0.96.tar.gz 127999 BLAKE2B bf6a0f26538f4f10dafe9d021e6f3ef22ee57230f64cf50cba95be3cb5ddf54a0479d033936d26ee9526745ead61fc6af7bfd1fdc3da10a6915108b2d873772c SHA512 23adf39571bf414fa61084ac824a54b3cb37ef32a46c72ad50734743fb66bb923168eb866d72fba7f88397b37831e2ce7603c7d543996b28761ed1d5b053d73d
+DIST cvm-0.97.tar.gz 127759 BLAKE2B 857a30ae52e7edc5e8bc66dfbe7e2ada6ba7763260b073eabbca6ee289b68ceece92442dffc5aa1d358faec24f90993d88d3555dd9399837f25e9f689ab6d66b SHA512 b04ca9edb8c84e06628ed1a827d28bf7d787c3853bec1e064fc1eb7e3082ad81998e7c902e029c0f01c346a52a4419e3c9890e2a7a75ab38625e0078dc4e9891
 EBUILD cvm-0.76.ebuild 1451 BLAKE2B a869b351583def10291ee6f19ac8602fab654dcac0dfa9e09cc7003afe795a97a7d64243a1d331eb78a27781c6e57532f39298704b57a0a719bf8714760f2761 SHA512 e0cdea110fa6acff28b95bb9eede58dd63dc4dfd9c6c22aa9ae2c2ede0b8d926d5f4adf458be62054358aad5f9329ea9b64441ca0dada3b60d825ae4fd956eb2
 EBUILD cvm-0.96-r1.ebuild 3208 BLAKE2B 0ad53487cbaa52ca349b1e12abfced27584808a5d0c8e02ee56fc90bd091b79e413d435dd4a719237a5a2e945a6f1edae663fa14f007aee7badd65b3ed90cbb1 SHA512 b761512901a1a10b4d9c1f1952a3e63ef09a1257dacba6afec9588389c4967fc49b056a314a05c1b1fb7c644e0bd4f32b8cfd4767c62f09f4f46b5ccd7571705
-MISC metadata.xml 296 BLAKE2B bdd092a7e715a03179775af2fcaf170ac7ad4d640812b29d347484bbb986e09b429365201112a409b97b8d40615e561958da79e1acfdbb783ec3e6db30d41109 SHA512 75d265987a3c3e83685a00d760965bc8e4e796429017c05642de2fcda4e37891dd06386df57dfe2d0e2b294916316389a1d72dc09e9feebdf5db3abe2626e34b
+EBUILD cvm-0.97.ebuild 3238 BLAKE2B 8d1cc8aaa761dc1cf2200c72ec9ff2f70a92ec6238ca9a0e16bf462db5a061bbb71fcdf5b013e1d44d09404cd6b3599b49a454fd76867a0ff03e1eca5b7ade6d SHA512 7b406bec5ed97fee10d4124f40d7fb62e8c993cf0d156046654c855bbdaf516433cae161e08f204483a1f24b2e70cd69ef4515db627214991b524bef407c6c52
+MISC metadata.xml 237 BLAKE2B 0c8ef45b6f0e15404fc767ceb7b133a844621199b4b5a5f8906c6e9ffb186572a46fd6871021bb4fe3e3b1f76ba75f38bddcaaf8eddeef43568074a54dea0c9e SHA512 34de058bcfc91edc8aa792fa3a20d0bb0318166634113402f22da57d97a4d54f8710c922c38fdd810aeb3bdcb9591494d5b20f63441ff77d242ab83f764126f3
diff --git a/net-libs/cvm/cvm-0.97.ebuild b/net-libs/cvm/cvm-0.97.ebuild
new file mode 100644
index 000000000000..9f7bfe2f7380
--- /dev/null
+++ b/net-libs/cvm/cvm-0.97.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Credential Validation Modules by Bruce Guenter"
+HOMEPAGE="http://untroubled.org/cvm/"
+SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="mysql postgres test vpopmail"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/cdb:=
+	>=dev-libs/bglibs-2.04:0="
+DEPEND="${RDEPEND}
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql[server] )
+	vpopmail? ( net-mail/vpopmail )
+	test? (
+		app-editors/vim
+		dev-db/sqlite
+	)"
+# some of the testcases use
+# - ex/vi/xxd
+# - cdbmake
+# - sqlite
+
+PATCHES=( "${FILESDIR}"/${PN}-0.96-fix-test-padding.patch )
+
+src_prepare() {
+	default
+	# disable this test, as it breaks under Portage
+	# and there is no easy fix
+	sed -i.orig \
+		-e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' \
+		tests.sh || die "sed failed"
+	# Fix the vpopmail build
+	sed -i.orig \
+		-e '/.\/ltload cvm-vchkpw/s,-lmysqlclient,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,-L/usr/local/vpopmail/lib,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,-L/var/vpopmail/lib,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,-L/usr/local/lib/mysql,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,\.la,.la `cat /var/vpopmail/etc/lib_deps`,g' \
+		Makefile \
+		|| die "Failed to fix vpopmail linking parts of Makefile"
+	sed -i.orig \
+		-e '/.\/compile cvm-vchkpw/s,$, `cat /var/vpopmail/etc/inc_deps`,g' \
+		Makefile \
+		|| die "Failed to fix vpopmail compiling parts of Makefile"
+	sed -i '/\-rpath/s|conf\-lib|conf\-rpath|' Makefile || die
+}
+
+src_configure() {
+	echo "${ED}/usr/include" > conf-include || die
+	echo "${ED}/usr/$(get_libdir)" > conf-lib || die
+	echo "${ED}/usr/bin" > conf-bin || die
+	echo "${EPREFIX}/usr/$(get_libdir)" > conf-rpath || die
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)/bglibs -lcrypt" > conf-ld || die
+}
+
+src_compile() {
+	default
+
+	if use mysql; then
+		einfo "Building MySQL support"
+		emake mysql
+	fi
+
+	if use postgres; then
+		einfo "Building Postgresql support"
+		emake pgsql
+	fi
+
+	if use vpopmail; then
+		einfo "Building vpopmail support"
+		emake cvm-vchkpw
+	fi
+}
+
+src_test() {
+	# bug 624384
+	# the test suite tests stuff that isn't potentially enabled
+	emake -j1 sqlite
+	sh tests.sh || die "Testing Failed"
+}
+
+src_install() {
+	# Upstreams installer is incredibly broken
+	dolib.a .libs/*.a
+	dolib.so .libs/*.so*
+
+	local i
+	for i in a so; do
+		dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i}
+	done
+
+	for i in {bench,test}client chain checkpassword pwfile qmail unix \
+			vmailmgr{,-local,-udp} v1{benchclient,checkpassword,testclient} \
+		; do
+			dobin .libs/cvm-${i}
+	done
+	use mysql && dobin .libs/cvm-mysql{,-local,-udp}
+	use postgres && dobin .libs/cvm-pgsql{,-local,-udp}
+	use vpopmail && dobin .libs/cvm-vchkpw
+
+	insinto /usr/include/cvm
+	doins {credentials,errors,facts,module,protocol,sasl,v1client,v2client}.h
+	dosym v1client.h /usr/include/cvm/client.h
+	dosym cvm/sasl.h /usr/include/cvm-sasl.h
+
+	dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr}
+	dodoc README{,.vchkpw,.vmailmgr}
+	dodoc TODO VERSION ChangeLog*
+	docinto html
+	dodoc *.html
+}
diff --git a/net-libs/cvm/metadata.xml b/net-libs/cvm/metadata.xml
index db5dda48e725..e24b11abcabd 100644
--- a/net-libs/cvm/metadata.xml
+++ b/net-libs/cvm/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="vpopmail">Enable vpopmail support</flag>
-  </use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="vpopmail">Enable vpopmail support</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 21f769b215e6..0ff16a382e2a 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -3,5 +3,5 @@ DIST farstream-0.1.2.tar.gz 1265972 BLAKE2B 239deea639f3456170aee1633d0ec0856917
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 EBUILD farstream-0.1.2-r2.ebuild 2374 BLAKE2B c4832a241cce39990bc5a396503cb29090a67799edb33018d2f25a8fee56eb77b9ffa17a04b05ec608dc28cc90382fd7f2620924bd1b506ffd8273f9a5c0bf15 SHA512 1222e9257b9ac280dd94b1e2f75f12369db67ae8efbce4ab6403404b37e60b63de9c06c797eb716ea8150c642cf323153e7ee4a1e246ff51b9a5de69e76ca56c
 EBUILD farstream-0.2.8-r1.ebuild 1823 BLAKE2B ec2e9332008aff2e2b510a473addfc3d424152b25045714544a2b12d6bec84df95e82869a076ca6c0eaa8461ea1f1cf897e814ea817b3e2e74b30371be91e144 SHA512 11cdf3f595e40cd4dd6fd328313e4f8696a82f86083f9944ec60e25e68389aae8e54b7791b83cf7638becf92e1cf00badcbe5d669feb70412ecd1520528ac65f
-EBUILD farstream-0.2.8-r2.ebuild 1867 BLAKE2B d8c03b35640b192a61b66cd56d97dd528159faee3326c41bd65239717fd1c2d2db5de5d7619224685bb9abd102677bbd45cb70598824e633dc8b6a1f23566745 SHA512 fedf07dfc91f650737be63e7be42a1cfca91527a6a8bec513515b9e8c7432a479ef5c35bc3c9f913d42ca8d591f62356776b3f2c93925345fcde37848fdd64fe
+EBUILD farstream-0.2.8-r2.ebuild 1865 BLAKE2B 3de27782915da460d70704c2f5c0369578a1e25cbfc5dd45ffc1b4b25219d9d340724a3c9f507a3c1f884576e4c47a7349360708c1f9264002be3fb043b96ebd SHA512 2a0c475abee3d10c3f1beb7b3763003d1990ec8481ec07bbcb46d9765195239c3fdd27715526aa27d7947cee788edbbe3a64abd74f6cb44ef68b0efae70ff735
 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 1f577d2f0c3d..5fb5b32b80e9 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/ftplib/Manifest b/net-libs/ftplib/Manifest
deleted file mode 100644
index 5bc3704e18b9..000000000000
--- a/net-libs/ftplib/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX ftplib-4.0-crash.patch 3277 BLAKE2B b99ac37f15d7253824b27c0b4ef422f08c71680b97d81c70cb3461073d59bd2d897d06599a87d36960b3f109d5200a218b78fb950d33aca4b4d0a0a388e10201 SHA512 9030a24aec67cc7a857bcb8b22aec66a8175ef3ce2bc6a82444301b06a2a51c7e9c3d439684189aab046c7f61aeb8405370d224ee63c357698a34f0421c5768e
-DIST ftplib-4.0.tar.gz 66680 BLAKE2B a4a2ca6df725daaeec226c7dfe4b165e7a8e1c5317d681a0137056b89bbfc448c83e15278696062d9bda83b62c58dfa5f0a52b83817f2a642805b03a403bd08f SHA512 ff39c243a6acbb67a8d2779f34b59f69f45d578ea3976c14aee1abcc56bf16cbbc6518ba96a4ccf34f6dd469eef388043caf066858b8df24bebfab7ab30a1c62
-DIST ftplib_3.1-1-9.debian.tar.gz 8560 BLAKE2B c9a1a487bbf260cbdac5c3c5fef04a3e059414805e3528339d8bb37d37ed3a84c8858552ad6b8b48d1034c412d912933c04631ec5379d32148ba3508b10999f3 SHA512 c87fb17bca4616d85f064f718161071b35a0e3f1c84ce8f13b4cd9f9b75f5115a4c518680d77af240196f0b2ee5eff520e0d4a0b87c797554c1ee8caa4962e07
-DIST ftplib_3.1-1.orig.tar.gz 90724 BLAKE2B 4aabc71dae317801c3754979b48fa04871c6f6b5b332037d5606dbe669d64c82b057560656a5e2f8a792d4a3ae4597fc873f471d4e10f52e8a25ef6c41687249 SHA512 5a0116ce1526f77532ced94c00bc1199378da1e1707c86637c83c6e9a27fef3a290bfefb7fc537946219587625b39560399cf136b83878a7829a2f3bee5f926f
-EBUILD ftplib-3.1.1.ebuild 1093 BLAKE2B cd1fe296df8d4e9d611ec0f1d0dc1204cccbc79a8897b130eb5127d7248f879fd739a9be1c9e9d99fcc10c2ebb6dff564aedb8a9ba2ff5151ed559e5936b8cb9 SHA512 cd492415e438616ed852b912897af824c20ffcf484a27e18f28319ff16c5b39a1ff019071be5c1f04cf4e0f589b737e323d953bba7db890788cfca5f8882d700
-EBUILD ftplib-4.0-r1.ebuild 1016 BLAKE2B b559ed7e660d2072edad64bf6fde5bce864d78f987469cac6d770c683c2253b56aac81b6f590e5f8b00931fe9bf270df513ed7d952f6389d44b0b7b0da2a4685 SHA512 f5d86f2761d039891b94eb163c4700a3ec55d14155cc848cec69df02d20b4063576b786f53aafb582eb604f4d33b67154a7f934be575885e328efbd61e6d3aa8
-EBUILD ftplib-4.0.ebuild 863 BLAKE2B b70d71673b6d3bd6949533f425d6488fa90422596806baccde705e9bf03fb305f6c67dde8db2c00f58ad92a530ef2f59921be5cbf27c826ec79ff275e1e07413 SHA512 5d3a79f831504f72d66045bcfc7f159590525ace2d3d745cbe32394318dfc88f9b3905ffe5a98a778b185796782b29aee4e660654a17b99e2bdbfe334fcf0c4f
-MISC metadata.xml 227 BLAKE2B 129a977f3a470f0774cb25c7d9d67968f807b5bbba6b1d1b1d0155e288555355796826ce187abf95a06ee0a448e08e9c5ec34ee79d9895bf2718b47ff0d9bfe8 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5
diff --git a/net-libs/ftplib/files/ftplib-4.0-crash.patch b/net-libs/ftplib/files/ftplib-4.0-crash.patch
deleted file mode 100644
index c984e2d81b19..000000000000
--- a/net-libs/ftplib/files/ftplib-4.0-crash.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-include sys/select.h for the select() prototype on unix systems.
-
-fix warning about using chars as subscripts in arrays.  on many systems, isdigit
-turns into an index of an array, so the pnum char needs to be casted to an int.
-the spec says these funcs take an int, not a char.
-
-fix warnings about the rv return value being uninitialized in FtpAcceptConnection.
-
-fix a crasher in FtpClose where it derefs the ctrl pointer before checking
-if it's NULL.
-
-fix the FtpQuit API to return 0/1 as it's documented so the caller can detect.
-
-patch by Mike Frysinger <vapier@gentoo.org>
-
---- a/src/ftplib.c
-+++ b/src/ftplib.c
-@@ -31,6 +32,7 @@
- #if defined(__unix__)
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netdb.h>
-@@ -453,7 +456,7 @@ GLOBALDEF int FtpConnect(const char *hos
- 	pnum = "ftp";
-     else
- 	*pnum++ = '\0';
--    if (isdigit(*pnum))
-+    if (isdigit((int)*pnum))
- 	sin.sin_port = htons(atoi(pnum));
-     else
-     {
-@@ -841,7 +862,7 @@ static int FtpAcceptConnection(netbuf *n
-     int i;
-     struct timeval tv;
-     fd_set mask;
--    int rv;
-+    int rv = 0;
- 
-     FD_ZERO(&mask);
-     FD_SET(nControl->handle, &mask);
-@@ -858,14 +879,12 @@ static int FtpAcceptConnection(netbuf *n
-                 sizeof(nControl->response));
-         net_close(nData->handle);
-         nData->handle = 0;
--        rv = 0;
-     }
-     else if (i == 0)
-     {
- 	strcpy(nControl->response, "timed out waiting for connection");
- 	net_close(nData->handle);
- 	nData->handle = 0;
--	rv = 0;
-     }
-     else
-     {
-@@ -885,7 +904,6 @@ static int FtpAcceptConnection(netbuf *n
- 		strncpy(nControl->response, strerror(i),
-                         sizeof(nControl->response));
- 		nData->handle = 0;
--		rv = 0;
- 	    }
- 	}
- 	else if (FD_ISSET(nControl->handle, &mask))
-@@ -893,7 +911,6 @@ static int FtpAcceptConnection(netbuf *n
- 	    net_close(nData->handle);
- 	    nData->handle = 0;
- 	    readresp('2', nControl);
--	    rv = 0;
- 	}
-     }
-     return rv;	
-@@ -1054,10 +1054,11 @@ GLOBALDEF int FtpClose(netbuf *nData)
- 	net_close(nData->handle);
- 	ctrl = nData->ctrl;
- 	free(nData);
--	ctrl->data = NULL;
--	if (ctrl && ctrl->response[0] != '4' && ctrl->response[0] != 5)
-+	if (ctrl)
- 	{
--	    return(readresp('2', ctrl));
-+	    ctrl->data = NULL;
-+	    if (ctrl->response[0] != '4' && ctrl->response[0] != 5)
-+		return readresp('2', ctrl);
- 	}
- 	return 1;
-       case FTPLIB_CONTROL:
-@@ -1442,12 +1443,13 @@ GLOBALDEF int FtpDelete(const char *fnm, netbuf *nControl)
-  *
-  * return 1 if successful, 0 otherwise
-  */
--GLOBALDEF void FtpQuit(netbuf *nControl)
-+GLOBALDEF int FtpQuit(netbuf *nControl)
- {
-     if (nControl->dir != FTPLIB_CONTROL)
--	return;
-+	return 0;
-     FtpSendCmd("QUIT",'2',nControl);
-     net_close(nControl->handle);
-     free(nControl->buf);
-     free(nControl);
-+    return 1;
- }
---- a/src/ftplib.h
-+++ b/src/ftplib.h
-@@ -111,7 +111,7 @@ GLOBALREF int FtpPut(const char *input, const char *path, char mode,
- 	netbuf *nControl);
- GLOBALREF int FtpRename(const char *src, const char *dst, netbuf *nControl);
- GLOBALREF int FtpDelete(const char *fnm, netbuf *nControl);
--GLOBALREF void FtpQuit(netbuf *nControl);
-+GLOBALREF int FtpQuit(netbuf *nControl);
- 
- #ifdef __cplusplus
- };
diff --git a/net-libs/ftplib/ftplib-3.1.1.ebuild b/net-libs/ftplib/ftplib-3.1.1.ebuild
deleted file mode 100644
index 51a887e92428..000000000000
--- a/net-libs/ftplib/ftplib-3.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib toolchain-funcs versionator
-
-DEB_REV=9
-MY_PV=$(replace_version_separator 2 -)
-
-DESCRIPTION="A set of routines that implement the FTP protocol"
-HOMEPAGE="http://nbpfaus.net/~pfau/ftplib/"
-DEB_URI="mirror://debian/pool/main/f/${PN}"
-SRC_URI="${DEB_URI}/${PN}_${MY_PV}.orig.tar.gz
-	${DEB_URI}/${PN}_${MY_PV}-${DEB_REV}.debian.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/{check-getservbyname-failure,fix-ascii-read-without-eol}
-
-	sed -i \
-		-e '/shared/s:$(CC):$(CC) $(LDFLAGS):' \
-		-e 's:/usr/local:$(DESTDIR)/usr:' \
-		-e '/^LDFLAGS/s:=:+=:' \
-		-e "s:/lib:/$(get_libdir):" \
-		linux/Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-	emake -C linux DEBUG="${CFLAGS}"
-}
-
-src_install() {
-	dodir /usr/bin /usr/include /usr/$(get_libdir)
-	emake -C linux DESTDIR="${D}" install
-	dodoc additional_rfcs CHANGES ftplib.lsm NOTES README* RFC959.txt TODO
-}
diff --git a/net-libs/ftplib/ftplib-4.0-r1.ebuild b/net-libs/ftplib/ftplib-4.0-r1.ebuild
deleted file mode 100644
index 9d3e7f9c5192..000000000000
--- a/net-libs/ftplib/ftplib-4.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib multilib-minimal toolchain-funcs eutils
-
-DESCRIPTION="A set of routines that implement the FTP protocol"
-HOMEPAGE="http://nbpfaus.net/~pfau/ftplib/"
-SRC_URI="http://nbpfaus.net/~pfau/ftplib/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i \
-		-e '/shared/s:$(CC):$(CC) $(LDFLAGS):' \
-		-e 's:/usr/local:$(DESTDIR)/usr:' \
-		-e '/^LDFLAGS/s:=:+=:' \
-		-e "s:/lib:/$(get_libdir):" \
-		-e '/ar -rcs/s:ar:$(AR):' \
-		src/Makefile || die
-	epatch "${FILESDIR}"/${PN}-4.0-crash.patch
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake -C src \
-		DEBUG="${CFLAGS} ${CPPFLAGS}" \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)"
-}
-
-multilib_src_install() {
-	dodir /usr/bin /usr/include /usr/$(get_libdir)
-	emake -C src DESTDIR="${ED}" install
-}
-
-multilib_src_install_all() {
-	dodoc additional_rfcs CHANGES README* RFC959.txt
-	dohtml html/*
-}
diff --git a/net-libs/ftplib/ftplib-4.0.ebuild b/net-libs/ftplib/ftplib-4.0.ebuild
deleted file mode 100644
index 11dcd2fe2bd0..000000000000
--- a/net-libs/ftplib/ftplib-4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="A set of routines that implement the FTP protocol"
-HOMEPAGE="http://nbpfaus.net/~pfau/ftplib/"
-SRC_URI="http://nbpfaus.net/~pfau/ftplib/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i \
-		-e '/shared/s:$(CC):$(CC) $(LDFLAGS):' \
-		-e 's:/usr/local:$(DESTDIR)/usr:' \
-		-e '/^LDFLAGS/s:=:+=:' \
-		-e "s:/lib:/$(get_libdir):" \
-		-e '/ar -rcs/s:ar:$(AR):' \
-		src/Makefile || die
-}
-
-src_compile() {
-	tc-export AR CC
-	emake -C src DEBUG="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	dodir /usr/bin /usr/include /usr/$(get_libdir)
-	emake -C src DESTDIR="${ED}" install
-	dodoc additional_rfcs CHANGES README* RFC959.txt
-	dohtml html/*
-}
diff --git a/net-libs/ftplib/metadata.xml b/net-libs/ftplib/metadata.xml
deleted file mode 100644
index 106575f01e53..000000000000
--- a/net-libs/ftplib/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 6f4e469d5176..1b438188e38a 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -3,5 +3,5 @@ AUX glib-2.58-compat2.patch 1361 BLAKE2B 85c6243812c58a759c710a3e3238d0383067381
 DIST gnome-online-accounts-3.24.5.tar.xz 1391332 BLAKE2B 9085cbb0c92bfcd338d5feca7ebdd3e3b15483e47fe29faffb8f9fb474663adeaf8d5cc81673c552652c9444e742f2782fd727c93bf488f5c976bde72d00ddce SHA512 8db35d21f0639e7452ec5cb34455b6d48a77fe0755c525f22e5235abe758f09ad5a4685e5e4912a53def298c76a13b558704a83803b5aabecc13a0f9bc3ae0e4
 DIST gnome-online-accounts-3.30.2.tar.xz 921284 BLAKE2B 9dc503f73ddda64411f73ac865a0355f318ad13789fac0cf7e7a91d16e53b03dee33acca6752060ce54936cfd5050adb8fadfd121158c0496a3f516e35e8fa45 SHA512 3555421adbfec0e7da1c8f3a47415f6c5bc3eaf8b246cf08eb6ee420286a4b40d11bc6e2514bca937b022b95068c9862438fa632d3385503aba2647a4a57976b
 EBUILD gnome-online-accounts-3.24.5.ebuild 2564 BLAKE2B 3079163a311a3cb7284649ddacf36d303263ec2b7fde638724be5f27f69c3c85b6533ed2a2898f4ab85c2a60762d58c7e69fcfef61d9f428f9653b4c974997b1 SHA512 ef3cebd5b5c97524941f40289daf0e6aaef07ae0821ae5be05806fb95f77ff82e2a72033cf541d4badd4b1b8dbbc12d701f2ae93ab6cc76f5f241c11baaf5087
-EBUILD gnome-online-accounts-3.30.2.ebuild 2096 BLAKE2B 0d2fd703b22edd2a819a28a1d38a9097aca19e3f2010d3ea87ebaded182a27f90b07dbc68faf9993ac570dcb50af47daaff67646a6d34a1fde53734f58dca514 SHA512 89f71315bbb3648486c966db0a0c819ba471c0d8778850355361af49d2d69ff34f15292b6a3a2c4cf81069bb55f57f4ef627e42936e1ce481a3ca8e2e7e6d439
+EBUILD gnome-online-accounts-3.30.2.ebuild 2094 BLAKE2B 50ec41090891c626d2fac7a78419522338dada0b0d984a7c47c6526ca9227203d9f13ec3a61845f998539bcdf79db55d4b54c56dd9b31b0e39226b64f989cc10 SHA512 401fb0d2206311d71e965ec30dc23600a13d7525d0f3850b69666ff6698d537523d5e40b88ac37fe90cf9f9de2eacad2f80d8a4b5c94c0165c26826110d26737
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
index 450fa084c558..4e26ca00f0dd 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.30.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index e752697cfb2c..3d8f951e6182 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -25,15 +25,15 @@ DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f7
 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD grpc-1.12.0.ebuild 1530 BLAKE2B d2abeea3fa12c68427d1ac0769715e85bc73393b0b08ae57a42cb5ef88d4126fb0993e7f3b4efc77667ba63239793cd436da8e8fb9d006d569b6f2ba3338f5af SHA512 4758b67f830e8c2d40add0d6f8fb2aae9b5856c8e0ca02a78f1ae0b7fbc974a5a0f066da252f1e10111fcf99299b12881632386bde9c511b7f54d2b961612811
-EBUILD grpc-1.12.1-r1.ebuild 4255 BLAKE2B 3d5fc2764c0dacd9c43e9b1788c4588110e7d2218dab8d218392b195e63d77146b6c15726e5d48a021dcf798f8219147eee6ca09e81623976d6bae1784120546 SHA512 4114b2138a8b79155d563a46762662f28464f695b8690acf64b17fdd5ba6c30d13fcea3adf9f4b7803b8737e848ac461022a2da2dbf388f188eda1e1361fde7f
-EBUILD grpc-1.13.0-r1.ebuild 4364 BLAKE2B de0b69472bdd7435a7b6fe0c159ca8f78ca9dc56267c283565f392006d0e0c4749cffa06364cd6c13c0e4313d5fd7eb8c376b5647a469f36ed504917e6db0c18 SHA512 bb989a1ab4c2ef8b272633de8ee2abd16c6e616e2cca89b1664a55b6f7b58218daa3fcbd4a7c6f5d2363b5b7119703a7538edbcb4a06eb1a6123442d6653489d
-EBUILD grpc-1.13.1.ebuild 4377 BLAKE2B d059e77f490d9e74527b5b80900948c0205478fa05f322252d25bea479b0ec9a6ba59a0e99552acdeb2ac2b3fec4977d3647ffa9571d276d0b8194e71214dddd SHA512 03cb76a0e7668e22cd36350e3aed501391c9871eccaaabacfe317e2db734572d2f138f6ca75ad6ac45353030a1c7a85023f42ea8dca8e41c7cdfadbb80a7791e
-EBUILD grpc-1.14.2.ebuild 4480 BLAKE2B 4bbbd1f8e2c272805e996aecb1afae043a4e55f527367496cf318531d2a5d4a9f655b3417479c96cd15d25d678fc9170172f21d9bb23f7f9780392c6fbd5906d SHA512 a6cf14e409dfa7686fd1dd2296e60a9111d98cc3f6ff06690036d2ffcc331f65c517f215fca2ad85e84b12b6133b29882cf4f2e58f42b9997ae316b25fe061ba
-EBUILD grpc-1.15.0.ebuild 4475 BLAKE2B 99ed12cbd25ee07839b2c3627b957c175997117969fe4c1fcdb88225373dc5e410ae10dcd8b95c44ae21a1b07365c21f52986bb2ee8d8f9eeabfab59856ab70c SHA512 44f8119ee363e065360252cdcc9268b77beceec31e0e2b50b435946fe74968c31360190de9867ef20b62effe1fd408afa7b70370799d771130d3d639406f7cce
-EBUILD grpc-1.16.1.ebuild 2336 BLAKE2B 227d1fdde55627d925b99eb32e07ed909a8fcc7264a75807cd71fdbe91fe56e8e40ae0acf87575b2d9185034b11a416f814b2e71571dcee2d1b507ab01e7eec3 SHA512 7a597c9c5243a306a90687b0414540dda5498c64062fb4c485458ddcbff70c9340bc282b564448c26fb33fa9866906356be9b15aed08ea501c3eaebfa08963a2
-EBUILD grpc-1.17.1.ebuild 2360 BLAKE2B 833456fec4fbe906a7aa95d4207cbe7abce79f727d7df6341297f9762eb41e9099ebd75900bc4fa112204410292d846ee8194d5bfe5c927b0c11afb7b9af30eb SHA512 86ab9cdf77ca6510665aa6897db580218b0914f7f682244ee155f4468f183d3cdf2f0ee3adbbf1c4390d0809a1bec6c9848a664c5cfe8a0b2cda97d8275cfae5
-EBUILD grpc-1.18.0.ebuild 2360 BLAKE2B d77a48e16f5718d2ea5222aca1802954498ac77e14446e8c6eb1ab8817b01332608f6b6b3d34ac4bd612de4e22bdf9004c87b8ff4c0f285628da2c556349f96f SHA512 8ba9de98288dcd43938cb080945e2c692435487105a33b39f08fe7a95fe03a598fcdaceaf93cf543a859b3b052c8f56f6f30d624f5ab79031fa973599fca5b0c
-EBUILD grpc-1.19.0.ebuild 2327 BLAKE2B 6a5026710f1c815586b3e132d471f09173c5de9157fc04cf91671267df449e9a4c7a2ff3b184140fd6401be5efa02536caaf5734f2fca591e8de5ac3779a3b37 SHA512 4b14447753b23a91fc06f8d261d2c224a02161c888f8baea9af3b6ea17eca6d697112904f7d830b3ee3714290c21ac9354112ecdec1727f638bb63695f14263b
-EBUILD grpc-1.20.1.ebuild 2336 BLAKE2B c6942d4beb716ae2990bbb448aa5a5ed745d74e682ae6b62ec79dbc8ab1c64d1c28c6c6f71c2201e98a8799c8d9f83147e67ca126498be571e2770886c776ccc SHA512 ebdc99c1a5dd1f4ff998bf283611a5fea5ebd030eadbabe0fb60da2b057d24f19ff94867ee1789c018dbe625eabbc78e0e8ebac39c9c5e838b524cf22406e292
+EBUILD grpc-1.12.0.ebuild 1533 BLAKE2B 8b5808b767a779c2e9d5baf53ba27e76ea78aa8433acf1b5c3254db134efbf82c0166963e9182111b1bd6dafdab8b7f6c66066e20676bf208aedb4b1286143e1 SHA512 2beaf3a5f7309fb756d3c90fa8444337fcea15ed7cc65adbce7951602a96e9d29d9389b540c5d92e6d4ef209b25b99b76328a52de7aef36b6c543bed10506017
+EBUILD grpc-1.12.1-r1.ebuild 4258 BLAKE2B 372198269d3e8422b0fcc7e1148066b9e0c4d5358d42e7e1ee0a1ac76221e40bd07b97f37a1abb3d70644b5054fdc3e5b6e99041f6c35d5c0932d3ad73c141c3 SHA512 e9aba2354c4f23e6d4b37f96570035f75c2ef719f42783127b785f6d6aefadd737e69c7f94d061301823b1f1f662c4bc977fd8d680eb1c9cbf3a5af84d5ec189
+EBUILD grpc-1.13.0-r1.ebuild 4367 BLAKE2B 60db5fa5681f2574b54b52fd06832f43f9de2902db43345d95541eb1e412a4a318c17f08b000ce6e7db0ffa9c749f0fe4a7c1ceca863e7e9414a4ef6cf5cbe06 SHA512 ee044858a4bd1b8c85cc021c329f8fae48511b99f23997b1af8ef3a26be7a8e3179d24c947d40ec7d1b510084a35618d86d928cf5e554e1d03b6eff7f41a46d2
+EBUILD grpc-1.13.1.ebuild 4380 BLAKE2B 6fc9c25ff651bab7903c3550b3c3eaf6c8dab361273d9fe8480abe874b6d46d9315973dafefe054b92bc900f4fc9a6fde783f23277b05b2cbc895995078385aa SHA512 250bd2fe515d305d4c093deca0c22f8e81b63ee2bf3c86dc3b8b83ff1ee65b99856ef1aa035e9ab6a5802ecb86657c61256727c36491a2c5a3c1c446fb354a76
+EBUILD grpc-1.14.2.ebuild 4483 BLAKE2B 74abe8b6c1686a92faa257379fa7085ad13bd6222557a3ac7701503a82f19d82bf87a1dc9a01a2f825d2a87de42e6bf3ec333ea2feb381a373ce7aa904a4d4b5 SHA512 f4353999761d8c438f2a4fc9618aa12e214bd01799722c252d4bfcc4f63bd4f914979dba8f62ffe2ef34277ef6495e363b6a10af6123d6f45ba339a25926fdbb
+EBUILD grpc-1.15.0.ebuild 4478 BLAKE2B b27a529156dca8385d57bdb38076d0292e1409aa2e328a008fa15b2cbae20172e4baeec06fe978d736fc8c29549c8172ccf1d01167ba2f376802e246c8db91b6 SHA512 8eb8cd1e05c7ba06b06879221cf598546143e5c510322cc66abce42d502a214fd81f98c81d2031fda04404d3b4dcacbed32603cdb138fcd3e3b7f1c017b539a2
+EBUILD grpc-1.16.1.ebuild 2337 BLAKE2B ad5315e38f4f176a621de8eb1c792d4f6735d9ff078fb3516e0569e11b83f2e916340905dfd59754c45ceecbca4924464711cf94aa38bdc91ff587fa4c2658c9 SHA512 05e321adbe059e17882d35692760576d745476b872f3fa7859e364d7cb8a88488fa7adcca3183059b552f7fc8aca926d2a64fe1c2f85a285a46fe69e0010a1c9
+EBUILD grpc-1.17.1.ebuild 2361 BLAKE2B e05151676e946f5f4681799144db2610c6dca6c359abfa49bd29a02e059a79cd40e2b17810539c74d9ee26a4333654b1a237f5848b34008a296a28a6def14dd2 SHA512 8cc37a22dd53ee250c6c5f468d799373b8136df4e5e64232ba7337e37202bcd23be6cf51b0133618a3c8699b82c619a52d8ef44427f3a104cc7302ce18467998
+EBUILD grpc-1.18.0.ebuild 2361 BLAKE2B e05151676e946f5f4681799144db2610c6dca6c359abfa49bd29a02e059a79cd40e2b17810539c74d9ee26a4333654b1a237f5848b34008a296a28a6def14dd2 SHA512 8cc37a22dd53ee250c6c5f468d799373b8136df4e5e64232ba7337e37202bcd23be6cf51b0133618a3c8699b82c619a52d8ef44427f3a104cc7302ce18467998
+EBUILD grpc-1.19.0.ebuild 2328 BLAKE2B 24b0230a3ba17bbeff1504a27c1c0c01706cd7cc9c3f0660f411d7b57ba100fbf0c0bad8728c90836b4637abd007c68bce14b4f084df343e5a362754702deb07 SHA512 d638a76e179b729822d77b22f7653b68104c0c7b1a86568b3872675bf8926e6780833b2c2bd46c95208bc76f2fa5f3bfb7caa336b05a8737a4fb7f322c205be9
+EBUILD grpc-1.20.1.ebuild 2337 BLAKE2B 565cbec7ca067173e1296eb962dc6ac740df29ab23023c8340e88f4256c212b963d6bc7c33ad041f4ea1f55253d7e81eba9ae293184b3afbff8e249a9f1c101e SHA512 3199e0710cc18c73938d00a224435b9829c4c54be6a8d5e9303fe4b3245c5590f6dddfbd5abf7deb2dd92f7982ced0a99215acdc2aa10bb145a5b7262f514700
 MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
diff --git a/net-libs/grpc/grpc-1.12.0.ebuild b/net-libs/grpc/grpc-1.12.0.ebuild
index ddf193e17a04..89cc2c83087e 100644
--- a/net-libs/grpc/grpc-1.12.0.ebuild
+++ b/net-libs/grpc/grpc-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,7 +59,7 @@ src_compile() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED%/}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=true \
 		install
diff --git a/net-libs/grpc/grpc-1.12.1-r1.ebuild b/net-libs/grpc/grpc-1.12.1-r1.ebuild
index 7f3ee9f18a82..51e73dd8c9cc 100644
--- a/net-libs/grpc/grpc-1.12.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.12.1-r1.ebuild
@@ -134,7 +134,7 @@ python_compile_all() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED%/}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=true \
 		install
diff --git a/net-libs/grpc/grpc-1.13.0-r1.ebuild b/net-libs/grpc/grpc-1.13.0-r1.ebuild
index 138531249bfc..45bfa5343f47 100644
--- a/net-libs/grpc/grpc-1.13.0-r1.ebuild
+++ b/net-libs/grpc/grpc-1.13.0-r1.ebuild
@@ -138,7 +138,7 @@ python_compile_all() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED%/}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=/bin/true \
 		install
diff --git a/net-libs/grpc/grpc-1.13.1.ebuild b/net-libs/grpc/grpc-1.13.1.ebuild
index e4d1903e6797..12364479d275 100644
--- a/net-libs/grpc/grpc-1.13.1.ebuild
+++ b/net-libs/grpc/grpc-1.13.1.ebuild
@@ -137,7 +137,7 @@ python_compile_all() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED%/}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=/bin/true \
 		install
diff --git a/net-libs/grpc/grpc-1.14.2.ebuild b/net-libs/grpc/grpc-1.14.2.ebuild
index b88634bc3de7..f3f61968210e 100644
--- a/net-libs/grpc/grpc-1.14.2.ebuild
+++ b/net-libs/grpc/grpc-1.14.2.ebuild
@@ -137,7 +137,7 @@ python_compile_all() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED%/}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=/bin/true \
 		install
diff --git a/net-libs/grpc/grpc-1.15.0.ebuild b/net-libs/grpc/grpc-1.15.0.ebuild
index 9a98d75031c2..54b506a2c3a7 100644
--- a/net-libs/grpc/grpc-1.15.0.ebuild
+++ b/net-libs/grpc/grpc-1.15.0.ebuild
@@ -137,7 +137,7 @@ python_compile_all() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED%/}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=/bin/true \
 		install
diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
index 4cfb0e21799c..07af07cc1f53 100644
--- a/net-libs/grpc/grpc-1.16.1.ebuild
+++ b/net-libs/grpc/grpc-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -69,7 +69,7 @@ src_compile() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=/bin/true \
 		install
diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild
index 306060617908..bbdf4092a7c5 100644
--- a/net-libs/grpc/grpc-1.17.1.ebuild
+++ b/net-libs/grpc/grpc-1.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -73,7 +73,7 @@ src_compile() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=/bin/true \
 		install
diff --git a/net-libs/grpc/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild
index 9334110878bd..bbdf4092a7c5 100644
--- a/net-libs/grpc/grpc-1.18.0.ebuild
+++ b/net-libs/grpc/grpc-1.18.0.ebuild
@@ -73,7 +73,7 @@ src_compile() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=/bin/true \
 		install
diff --git a/net-libs/grpc/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild
index 980578d57ee3..dbbfa3954380 100644
--- a/net-libs/grpc/grpc-1.19.0.ebuild
+++ b/net-libs/grpc/grpc-1.19.0.ebuild
@@ -71,7 +71,7 @@ src_compile() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=/bin/true \
 		install
diff --git a/net-libs/grpc/grpc-1.20.1.ebuild b/net-libs/grpc/grpc-1.20.1.ebuild
index 34179c7a860e..c17b91e18436 100644
--- a/net-libs/grpc/grpc-1.20.1.ebuild
+++ b/net-libs/grpc/grpc-1.20.1.ebuild
@@ -71,7 +71,7 @@ src_compile() {
 
 src_install() {
 	emake \
-		prefix="${D}"/usr \
+		prefix="${ED}"/usr \
 		INSTALL_LIBDIR="$(get_libdir)" \
 		STRIP=/bin/true \
 		install
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 31c8e46dd0a5..4ef8a97d671d 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -2,5 +2,5 @@ DIST gtk-vnc-0.8.0.tar.xz 448984 BLAKE2B e9de98a969297832ff6eaba79707a44494b20d9
 DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b70459afd8bf92630d69cf32d380264814304a68a93d8a5a70d6573b6754658450005a2ea2b96f13ae03f9e87fcba SHA512 498b368eb53ac58172db280c80f9da71ce82b636c39f186046e4f674e44c574ff4b63c3f777acc79d32c17d70e4efcdc207768ed49b3d1842bc4b73618296215
 EBUILD gtk-vnc-0.8.0-r1.ebuild 1699 BLAKE2B 2a794a7f9138bec46834e44335e287b4a755053d1ef9c1d50a3c1612e4c5eb349fb3256d4f4d2e40965fae816ce54ef93cae41424bc4908e668edf84089ef9ba SHA512 836b75d87766ba67e6365a62a869694f3ee599b4c336eed8986a955e5e33c4396596c3d2b811da9225add73dcd66e59d596b75b0bb7faafff778a190886225b8
 EBUILD gtk-vnc-0.8.0.ebuild 1666 BLAKE2B 3ee6335e5f0e998a10b5bf526fffd65db5961a38968b25a676dcfedb19585161fbbfd3dee1e02e9ec93582845573cb69e517e18bffded22d70596986940ee684 SHA512 81e1d665c1ab68ce8b857aa557cfa1bb2578948c863826250e9b00d6be723f6cddee482a7be66f8fe91c2ab1599136c4f5a275f31f71374f24f4898e8c31c462
-EBUILD gtk-vnc-0.9.0.ebuild 1702 BLAKE2B e98816a1f811bd70ffa1efc76d85ca19ccdd49fb47fbc47db3dae4fcc19d57de072c7cc05a9ccfcb7bd79054a1bc22af8ce4aadd2cd758fdfe9fe0b58b89800c SHA512 2c9b8a9c3378a06f5ebd0079a9ece56136fcb73944edd28450dd491b0342e5a52c13dbdaa24b5b3b0f289bf85788268c0d790cc71ad9116961436176949b6fb9
+EBUILD gtk-vnc-0.9.0.ebuild 1700 BLAKE2B 75e0f942874fb58b56f6e86b9ddf156e801b02c63441550ee94af1ccc4708fbce37d200eb84d1067d0eec2515170b2dde183acb646058349dd279c8bf42c4b4d SHA512 cd518601ff7ec08cf8540e9ff619bbb2f011c7d2abe6ee9555a6eb71e3297953d60e58b31160a053a615f5e69e5d8b7a3a8f114e55a9540a194b371d9b243de9
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
index c2931f94f27f..a61ff7fe12dd 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="examples +introspection pulseaudio sasl +vala"
 REQUIRED_USE="
 	vala? ( introspection )
diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index 0d13e63c5782..e45171e0c8f6 100644
--- a/net-libs/libasyncns/Manifest
+++ b/net-libs/libasyncns/Manifest
@@ -1,5 +1,5 @@
 AUX libasyncns-0.8-configure-res_query.patch 428 BLAKE2B e19cdfc88ebee7f22dac6dad6dc302fa80957464c91eb8907ef75bd3f5fb32d7b985545a1aafccf2cd228688c16ab731ddd9c5315083f8f4d117a9a6d4ee731f SHA512 ed338a91575f9e642c3da9764348fb7d4e5b2d0da4ef9a849a4cb176df96776100e59b419bbc9206395252d8317c20c5cfe1b68e008825fde1192e24dc9f8ce0
 AUX libasyncns-0.8-libdir.patch 299 BLAKE2B ad0b79b5725877642c1b03c8183654be8d54e78e44bf7ab4de3c8bd1ffc5ceb2e6cfd250cc4725c2a0491d062d12124faf55fb20b07887e1f47cee7ab156f0de SHA512 b4a42a4241034756feeacdcd9a7d6e57a8b2d9ae945b149e05c6ea9d8b33791733601ef9d153e75d7979079cdf4c02c4136f881236e2a2b393ce070021c3a2b0
 DIST libasyncns-0.8.tar.gz 341591 BLAKE2B a93e7fdeb6e686cf3ed87db8fe2473f8868defd5bb6a29497c48d970d1ff33c550b5521d84a224314c9e93bd4cf09f502bde0fbe1c4d2680f6fa07f1f1a224c6 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7
-EBUILD libasyncns-0.8-r4.ebuild 1344 BLAKE2B 7298360c973d265d7f5c7fe34782aa075e918eb4a769f6666c58c88a31acb83081dc6cf6769668a6eaf51a8b18a6b591be58e56f670f973ccd2692520f67c933 SHA512 6c692317d081dffd152f3513e88fd0429b072377694b5a5f55c61c96ad5b279162ff6cc47c2eff82b05e164759929ab59d470b0089434ed996625e9cb9efb42d
+EBUILD libasyncns-0.8-r4.ebuild 1343 BLAKE2B f8bcf6c0e09900809ff76d5b20b183f5627cfc133e6f23d71e489531d8b4ebd08d5a36ab60a248a35e09eaa8e93c415f8ac642e90e4aab51b60aad242f906927 SHA512 a3f6836f3a7ac94982cc8938a713631a2b667168aa77f45d4d3f76f57d49b86f7dd7f5bf0f1e87d4c09cc2a6df5fcd9e06902c914208d348d57ba951ac975e38
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index 0cabac41cf59..f3eda0c2fecf 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
 SLOT="0"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="doc debug"
 
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index c65308967b0f..86044956c078 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,6 +1,4 @@
 AUX libesmtp-1.0.6-openssl-1.1-api-compatibility.patch 2243 BLAKE2B 03cf78375e04d781c1deb15ec76ba35b2800dd2b739c9ad330cfc9a25c05f59b684a5cbe8e436288a98e84b2ebab2c08abfdfd81e000f9a3c4053411254ab89c SHA512 9c5e9ea6d6b09dd48225edc17a9003ea863d91e06ec3856ce22d89b1b908f1c8bfccb7a1090dc5b1ff26a62c35a48806805115000eba3a478cab632181c905a1
 DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
-EBUILD libesmtp-1.0.6-r1.ebuild 952 BLAKE2B 28f2aeed294b3cb4889f1ffe69fdb62e23bf407a06f2da55eae6abe9e51c9b9dd5a4c08468779fe6191b0cade572ac8297c9860faa9dd4da84ce7733bf8dbd12 SHA512 7d460a12bd2c8c6c6b359deba3869ea728a0a63ce5043f7a31c79338cdb2d7ee1d1a2d6ae6dae55c3caec44d5df302851c2a61280fb2755dde10953e028362a1
-EBUILD libesmtp-1.0.6-r2.ebuild 1031 BLAKE2B 4ab3082dee4a2862e51a7007685b7bb6bb323b8f5db3ec7251be93be3fbe43840400ae34f0806377a6b7ccf8a4227bf9177abd74be0ef0cc547d8a36cefac859 SHA512 2a819f32e22f13d4de8d8a7907e7b052645d525c6715237a4e99882e3dd22be7ad47e1dbcd893412cc0826a26f6fcca78651b0ae57c28960ff6d4d12f71335d5
 EBUILD libesmtp-1.0.6-r3.ebuild 1081 BLAKE2B 2d7d1105db3e1b749fa4799fac1101411f77dd38885d48e374952e26385fd071448b313a6f4b64a75ca34499f3095ac1d4f30c948717a0f6f871623a2b2a1cdd SHA512 34bd645bc08fc711e8171fe1145dc0fcf7c9a8b5feb386ebe2e32207892979ea3813b1fd6664ee99f5d027c12d809f39dfcc15d3a3e5e23e0820781084a5cd43
 MISC metadata.xml 245 BLAKE2B 8d60530acac96088463f7357d79430c34c12384bcda5df24a93a92789a40fb34014c14fb73ea1e80f7e96f5afb8e70a4600a651b46322af25c404bea3c75e004 SHA512 8f811f556e1fb3b6c4955a0815435a2b54897133a5a545d05fc3c47a6f8ad2448fcce4644e2f7f3d5b6835fdbfccba521a49a8c11629a89ab53770d6bc620c25
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild
deleted file mode 100644
index ea11090f93fa..000000000000
--- a/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit libtool
-
-DESCRIPTION="lib that implements the client side of the SMTP protocol"
-HOMEPAGE="http://brianstafford.info/libesmtp/"
-SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="debug ntlm ssl static-libs threads"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		--enable-all \
-		$(use_enable ntlm) \
-		$(use_enable threads pthreads) \
-		$(use_enable debug) \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS Notes README TODO
-	insinto /usr/share/doc/${PF}/xml
-	doins doc/api.xml
-}
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild
deleted file mode 100644
index 1bd5ae76df71..000000000000
--- a/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit libtool
-
-DESCRIPTION="lib that implements the client side of the SMTP protocol"
-HOMEPAGE="http://brianstafford.info/libesmtp/"
-SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="debug libressl ntlm ssl static-libs threads"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		--enable-all \
-		$(use_enable ntlm) \
-		$(use_enable threads pthreads) \
-		$(use_enable debug) \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS Notes README TODO
-	insinto /usr/share/doc/${PF}/xml
-	doins doc/api.xml
-}
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 6a36d583a51a..927a8501b409 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,8 +1,5 @@
 AUX libetpan-1.0-nonnull.patch 404 BLAKE2B 485fa277a9b5a9f1f74e2bb658a68da3d6781d8cf243df019ae945a69fb96e5ddad36d83e00294e1abfb983525dbbc483686882653e55713686099d839fa7fc3 SHA512 3800d6e2dbb50985290b8a141ee2fe6ff92bee8516567f55ea14e634b41e11d1074cd8df6e6de30996e0d86e54cd659300da0d61ad63fc10f713d672aa3b4f6e
-DIST libetpan-1.8.tar.gz 6188927 BLAKE2B 730d9fc545ea2fbd4dbc0eaf3cdbd0540ec85984dee5448c5f22c83ad12e568a9e066e53734da96ef6a9c77942e5aea2eb241c2228f0ca7577755e67646aa589 SHA512 a5e97998803cc56dbd54356153c8579b52a9675fe95fbf642c3158215428d9d2cb30c4e0060c5f4dd760634fff5b1c2a32ce4bb70a5f2bc6398a071ce95e1efd
-DIST libetpan-1.9.2.tar.gz 6191522 BLAKE2B a5b3b93c94596d64b49150680a2599c930b5f010d29be7fbd325e43ba82b8d61032bae65155d2c5e0e2bbcd219db3d916b10a6ce5a98df2ac31fb88811491d71 SHA512 3e2e1de77fae2212374e909d15ed8564eee90883c38fee0ca69f58785733b1ac2df848da1bda6f55577d647e0ad27bc3057199e70b6ef01f2a7e2823b24113ba
+AUX libetpan-1.9.3-missing-stddev_h.patch 989 BLAKE2B 49918148deeacc128bb33e8cf56c9f3a56de92fd7206becd5c6e6054979691e17fd1de008f42c0db64c0f72def07bd5fb10178b0eec9ee64c6d6b0f8749bdd56 SHA512 cc9ea9b4c641cbb3b2446252b8ab8b520814ad8584f7fccd3174e31726a59a8445a5af21b6086034891a883887cb69b1d2c38a07e7f8667c0fea518b40a0e058
 DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6
-EBUILD libetpan-1.8.ebuild 2093 BLAKE2B 4d24c6398d9de5b50433e3c2b4716331280fe0c88f70ac64192bedb570ce955e1002d520e0c1ff7132aa1b957020bddfbc4d4ab08823645b1e16b4b85f83bb4f SHA512 23d9195d9665ad24c58cc1c7b570e48ddc157cae14cc69dbd814124525bc70de3aaa33687a5a914aade21241c082c1b16f5014f8618795cc53ebdbf6b8b0e933
-EBUILD libetpan-1.9.2.ebuild 2059 BLAKE2B 302400ed74c1f3a142f0fbec6ae2fe01467d26bd7ee604d0b098965588ace7a5afef0ee16eeb1f5fe81e0daca13cc09fd9b685cd1d02bbdc0273a512dfca576c SHA512 35d05d4da2bc6c234db47fd048f3beccfb6ab9b6144f1f1d6ff445185d8c4c79a7f67e8e2615d934104601e7e0719e9f4225e3b0678832241559b400acc406bd
-EBUILD libetpan-1.9.3.ebuild 2056 BLAKE2B d5fd3fb1de5b69697f320c0c68a877538c3c74adc6d83cbcc76c622fd2ee8e6e004f6e1d459e4c0d3e212c73288033ba8a734757f2fdea2c9aac786ee176fd35 SHA512 b95e37cff786387d9b9b3e81b8d8578879d2399c0fa5cfc10d0d910b147fc431f80f9b5c085fdb8edb0e7255e804eea001ed52a994ef90f4a5532619d414d4ec
+EBUILD libetpan-1.9.3.ebuild 2104 BLAKE2B 093e7e5bf5de575f1f73d72886d6c6216225b0fbf1a97b06b149c9ad05731b07e217c762c70fb9215fd441d46cb975b8afa290303479fa76cfb46922c1cbec70 SHA512 2fce824e8b46db90e4b8d3afb88c6909b7cf9e696e8b4fffa985afbc46781a5f2d3cefe65dab6cae0089f122b1d88f6d1358f74ddb5fc22b121c88761139f47a
 MISC metadata.xml 744 BLAKE2B 8d47251742439a710cc6c6a2130a001a1a66ceb7f358d8ff138b9d9a508a7d2ddf14a3879537f129b755bca1a6548187f15a62f2183c5297e4245fd5cd8ccf3c SHA512 5b732d7d205ade686cb11042918d81b6959549836743a582701f05e161adbf8416beaaf33cbe03b4ec4ffe38d35699803583cd2bddf9e333dd8c93cd7f9a1db3
diff --git a/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch b/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch
new file mode 100644
index 000000000000..9d53f90190b0
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch
@@ -0,0 +1,30 @@
+commit da9fd7839c9affea48f74a159a789fbb183b4be1
+Author: maxice8 <30738253+maxice8@users.noreply.github.com>
+Date:   Fri Feb 1 01:58:08 2019 -0200
+
+    add missing stddef.h include for 'NULL' (#322)
+    
+    clientid.c: In function 'mailimap_clientid':
+    clientid.c:66:38: error: 'NULL' undeclared (first use in this function)
+       if (mailimap_read_line(session) == NULL)
+                                          ^~~~
+    clientid.c:66:38: note: 'NULL' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'?
+    clientid.c:39:1:
+    +#include <stddef.h>
+    
+    clientid.c:66:38:
+       if (mailimap_read_line(session) == NULL)
+
+diff --git a/src/low-level/imap/clientid.c b/src/low-level/imap/clientid.c
+index 1c34637..38880dd 100644
+--- a/src/low-level/imap/clientid.c
++++ b/src/low-level/imap/clientid.c
+@@ -33,6 +33,8 @@
+ #	include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include "mailimap_sender.h"
+ #include "clientid_sender.h"
+ #include "clientid.h"
diff --git a/net-libs/libetpan/libetpan-1.8.ebuild b/net-libs/libetpan/libetpan-1.8.ebuild
deleted file mode 100644
index b6dfb6cdbfb7..000000000000
--- a/net-libs/libetpan/libetpan-1.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
-HOMEPAGE="http://libetpan.sourceforge.net/"
-SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="berkdb debug gnutls ipv6 liblockfile libressl sasl ssl static-libs"
-
-DEPEND="sys-libs/zlib
-	berkdb? ( sys-libs/db:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	liblockfile? ( net-libs/liblockfile )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-nonnull.patch
-)
-
-pkg_setup() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
-		ewarn "No ssl support will be available in ${PN}."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s/-O2 -g//" \
-		configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
-	# libtool recognises it as valid shell (bug #300211)
-	use prefix && export CONFIG_SHELL=${BASH}
-	# The configure script contains an error, in that it doesn't check the
-	# argument of --enable-{debug,optim}, hence --disable-debug results in
-	# --enable-debug=no, which isn't checked and debugging flags are blindly
-	# injected.  So, avoid passing --disable-debug when we don't need it.
-	local myeconfargs=(
-		$(usex debug '--enable-debug' '')
-		$(use_enable berkdb db)
-		$(use_with sasl)
-		$(use_enable ipv6)
-		$(use_enable liblockfile lockfile)
-		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/net-libs/libetpan/libetpan-1.9.2.ebuild b/net-libs/libetpan/libetpan-1.9.2.ebuild
deleted file mode 100644
index d364a29f58e9..000000000000
--- a/net-libs/libetpan/libetpan-1.9.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
-HOMEPAGE="http://libetpan.sourceforge.net/"
-SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
-
-# BerkDB is only supported up to version 6.0
-DEPEND="sys-libs/zlib
-	!lmdb? ( berkdb? ( <sys-libs/db-6.1:= ) )
-	lmdb? ( dev-db/lmdb )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	liblockfile? ( net-libs/liblockfile )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-nonnull.patch
-)
-
-pkg_setup() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
-		ewarn "No ssl support will be available in ${PN}."
-	fi
-
-	if use berkdb && use lmdb ; then
-		ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
-		ewarn "Using lmdb as cache DB!"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
-	# libtool recognises it as valid shell (bug #300211)
-	use prefix && export CONFIG_SHELL=${BASH}
-	local myeconfargs=(
-		# --enable-debug simply injects "-O2 -g" into CFLAGS
-		--disable-debug
-		$(use_enable berkdb db)
-		$(use_enable ipv6)
-		$(use_enable liblockfile lockfile)
-		$(use_enable lmdb)
-		$(use_enable static-libs static)
-		$(use_with sasl)
-		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/net-libs/libetpan/libetpan-1.9.3.ebuild b/net-libs/libetpan/libetpan-1.9.3.ebuild
index 6c5254f45d5b..e2b6c80ffefb 100644
--- a/net-libs/libetpan/libetpan-1.9.3.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
@@ -30,6 +30,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0-nonnull.patch
+	"${FILESDIR}"/${PN}-1.9.3-missing-stddev_h.patch
 )
 
 pkg_pretend() {
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index 1181829d4168..9ca0a6363859 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,5 +1,5 @@
 DIST libndp-1.6.tar.gz 364406 BLAKE2B 616bad28a38f40b32446431ada1ad786ea09e5fe8e58fe9d4944b2fc36ab7ad44258f9fb7b8cabcea47bfb366de3a4a93ef2bd1d032896f60cc35ac92e9c8438 SHA512 ad2df92c5b908f5c40e6e1920195ef97d560b667f78dd4ba5b5418d2dc294a69357fa704b9137f76a4d1ab473f0ec5f1bc4644f25f6a3f0802b75b961638be22
 DIST libndp-1.7.tar.gz 363502 BLAKE2B f9b4dc455a666fb8d7bbedd49ed2c66764eac0e886943647be906fbd2912379c8b0bcaf64460316417b9d13011c79f5cf6a79d0dae0af991b137cb69940e85c2 SHA512 4aadaf6d7d8b9e57983cba17ce92715cceef6635613c4c5326decb97fb575ce5f5d5586a629645e3605a03e385c6481bfb6c4458216be2bbd36959af62783790
 EBUILD libndp-1.6-r1.ebuild 565 BLAKE2B e6c1dde7773367b73701af74d37c91cf5d1c41ac509cdb06d9649be49f4addf4bd178f92ff21d689028260a917fb54388aba8b235a7b3556894cdf564e64920e SHA512 c4d41e8490f65cb6703a9831c7be6b9e097ceab8373dd3760adc855e967dca6f0523e03864f6c9048197fe458d23e206e25927dbb4080339e8a6d761b498bf7b
-EBUILD libndp-1.7.ebuild 567 BLAKE2B 94b0474c442b6969b6cc181b89f2a5ea0a408f0ebbe0a3b14c485a7f7b9d07bafe47eb4408561e66b913f8a41aaa555d97510408ff0e21ca2f5208ea1ba11eb1 SHA512 0106eb94af6628a810768afcbdadfbdb120b9fc8ab49b2f0328527f828718146cf2cbb6b65a455195ba03edcbc5e16eea96c221fb95560d06b36fa0c4538e54b
+EBUILD libndp-1.7.ebuild 565 BLAKE2B 7307cbcf163f3188bde8ab730e70c239d6511479caa0f6be4f3cd09fac1eef98cdc6e2274bcc2c18ceff0ae0ac68e382fc848017966e91c5a3fe5e947636ed83 SHA512 dc503a94be18ee896bfb1e78b6d830fd629c2fe4f183cfb7149befba0f67f97c47239a88a20bcad69c6c9db22054b5e6dd2ffcaa8f55a78b8439c3e952086197
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libndp/libndp-1.7.ebuild b/net-libs/libndp/libndp-1.7.ebuild
index fb437c73e28a..541d0be371c5 100644
--- a/net-libs/libndp/libndp-1.7.ebuild
+++ b/net-libs/libndp/libndp-1.7.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 252e75171611..e06515a1514b 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -3,5 +3,5 @@ AUX libnice-0.1.15-libressl.patch 1961 BLAKE2B 7e06399def0beb5c744d97fc6ed3a73eb
 DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 EBUILD libnice-0.1.13.ebuild 1566 BLAKE2B 4b5dcc470188b8fba4435ed7be47dacda438d59821ecc69f5f6875572d91b3bc6a4039febb7d2c241674122b6db0aecd1dfcf2c15a226bb144850d7b403fefb4 SHA512 85220da97849a1202ff57fc6864011bc5d6c7e2ebccdc7ca98a852af08defd5616dd55bea86cd101c60dda24444258d51374124ff2ce52c50f47a6dd7c0b0137
-EBUILD libnice-0.1.15.ebuild 1765 BLAKE2B 5ad8e59f209314340d6cc7eb80f1939ce463efa6c88eba9468c9be6ba1d02df0708c004580840b96b6d69559d7d6a2f138aab74ce5b1e5c174a6fa1c767fc132 SHA512 86feb279be7980da3306e01f98ba6e1959f9d59b14c31dcc4031f4a4d3c6abe531f6f9f6556ab82f1d968d2dc656940a60c6964ea3405c428104b49bad593b7e
+EBUILD libnice-0.1.15.ebuild 1763 BLAKE2B 0c79f1ee986c7f7e12899d680390ae2865dd924db03b7ee065fc29ef5aefd3f3051e12403de2732f4811c7fd70ef8338254044719b0bf518df137c46f592291a SHA512 d082a3c75ffd23cc20484a7aa047dabc8a54e83d28cb445ac052cfd712142ce2acae1b10fca65d4e3fe078f5362ac636116ebc989fb81bfd9d0b8d3f92f9d6e1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
index e66ba68fd511..deb325875153 100644
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+gnutls +introspection libressl +upnp"
 
 RDEPEND="
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 2299ac3150ef..9b9f954037b2 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 EBUILD libpsl-0.20.2.ebuild 1473 BLAKE2B c70153f34bd9da55823c004eb61fd10cd9f91bd04b55ad33d528d37dbd4bf32bbf3eb6b117adfcc1933099ea09a3f6ce1b490342386054662f7a9f97fc125699 SHA512 32ff684e4938c070a09ecf5410b35e50131716b4e694c798c6b7a9e6cbfb86d3145ab9b78ff7c2469bac74e43c579a131d64ae5dee4002723c15d46431af307a
-EBUILD libpsl-0.21.0.ebuild 1473 BLAKE2B c70153f34bd9da55823c004eb61fd10cd9f91bd04b55ad33d528d37dbd4bf32bbf3eb6b117adfcc1933099ea09a3f6ce1b490342386054662f7a9f97fc125699 SHA512 32ff684e4938c070a09ecf5410b35e50131716b4e694c798c6b7a9e6cbfb86d3145ab9b78ff7c2469bac74e43c579a131d64ae5dee4002723c15d46431af307a
+EBUILD libpsl-0.21.0.ebuild 1476 BLAKE2B ddaaef76af1c382bde3b327d7749bcfd412efd0dff7797c3a28a64e5906ffb73bdf2c91781332e0ffeff916db1891139b56bfa4fae0c68d7df93623becb5a49a SHA512 9ef8ac9dfdab1f1f7d5d7985a26bed09dd73a51b5886cae8fdfb4fe52ed53833ea93f22b6653deadcd2c07dfdd3dfa011012503e03c9bea498e12dde0f91ae61
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 3e0dd1f17a06..80ab1cdb49be 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 6fcc249937cc..2a740212dc6a 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -4,5 +4,5 @@ DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e
 DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
 EBUILD libsoup-2.58.2.ebuild 3011 BLAKE2B 6bb09cc7a247550ac1ef0fbc82b3a6e2d0fe421174243f12feabb87dda992b305ef0aaec2fdbc99a13eccd1523ed98f46bfe175598907f30d9365034ad6c3fd7 SHA512 98dfcd612e875658b20e590875f0ffc016fed4f4da998d38954a6fbd5f8817c0d95819343d567432b682dadb152299d826f8d65aa36714de091e4aad8c20e8aa
 EBUILD libsoup-2.62.3.ebuild 2922 BLAKE2B 8b7f012a12a0a6d6ec723a5d8fd74ac57bc5c734c2dd4c65fa51ac6db657f4a286a3324509c4490fe97b9e5c8f0834d8116285392bf643349bb398bffb8c406f SHA512 c70d71b679159df7cf00829cd13e68f8723e054ef3bb3ddcd131008ce699317fb5a7e9a0a69cc4381746441555b2f1dd78c78f1528e39cc38315d396054cbcb0
-EBUILD libsoup-2.64.2.ebuild 2809 BLAKE2B bc1abba30b0413c4de2eb4d7a84cff4db3a3cae03779e3441288e51119290bb8992588a16ddfd0179d2c0dff9438798da05697e24149ab4225b011ce7f6a261c SHA512 769bf730a1766e50696b53e811588befa33163436c3b24230d22112085af002c31a661c276b9281d6b56132819e345a3215f3378c99e34789c09196093ece297
+EBUILD libsoup-2.64.2.ebuild 2812 BLAKE2B 61c3033e057e6e36cb503a266ac3b13128d150ec462515ae518a063a272249815993f29b04b73741284e44320dddbffb28646a54e58a2b1eb1306699701179b7 SHA512 72b40e83847245d124929705eda35733b9bad46ecb9ce112eaf2f4e5d54bfca44d8d30c57bd204508f2579d66db016aa3792f6cdc9ed7fc5c84cdd11d0da144a
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
index 22b8b0633296..45930701efa1 100644
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 6734a2e9b5a2..0964a924bcbc 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -6,7 +6,7 @@ AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cd
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
-EBUILD libsrtp-1.6.0-r1.ebuild 2388 BLAKE2B 6698b8dd582e2224702c0cb1d7ee03d6ca923fb8a68cdb57e1260d30605415843f8284047133e1f749a5fc42862e00a689354b267e5f23b20aab6dcbe524b98f SHA512 e3cee3220a12c85fce5287b98cf2353c1eabff3c77d361002a4a5abf75cc3b809c1d87d467a9f50aa3b1d355353e2fc7cabdea14b9aeda6188839d9665b83c54
+EBUILD libsrtp-1.6.0-r1.ebuild 2382 BLAKE2B 46357f214e3bb13d64daf41157ab8d560dcc741933175252b97a42d84426497d5c596867c496d5ceef0f1ab36149eac3a9337c0c2e72c96503c696590198ed20 SHA512 eb599d95be055bcae54d06b8110fc6351f1b0048fa5566f87941ad7583c794b5c26db77dde153c0cef9b54d063aad7f2c130a7708b378ef1a45e68cc259f276a
 EBUILD libsrtp-1.6.0.ebuild 2215 BLAKE2B 0c7fc9e569f320487aa26c95c9d5b70335fa770bcc7471a1727e0872f8af655b3af9034831fa5d8800afb0492bf2b6bcc61f1aa9b3b1d6b39f065dee7b2787c0 SHA512 14f95b201db1eba997d54059ac6c54d0af5d5047bab001510bfa1fe6ed7ed3b3b29428a1221fb6c0e44fd0fc96b8a481416a912e4c0c79fab3f6b56afab29712
 EBUILD libsrtp-2.2.0.ebuild 1849 BLAKE2B 8da25f146b54912124fa5f31bc31431098216ba839375823cc5afa093ca1c34e5a6bbd1ba39d9b2fe5db744291cb39e70bccaa0693c5997cbe2eb18522a2c380 SHA512 a42d3e5bca155e7ea0453903c19d0ea38cca52e5d1fcc08bf031527e4500e8fc9a63b884e0d157cdbaf7ae0a4d253d30b788eb86292cead338b6c05ef56d8efd
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
index 9b3f9a9952bf..424043f972f5 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index d41039920353..c75b9d01a4cb 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,10 +1,8 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 AUX libssh-0.8.3-strict-overflow.patch 627 BLAKE2B 81d29d56f91bb5c649f8f2e3706034de59834b859725bddd9243a934335fc20d13dbc2fcb0e8627ba23856072958e1bf06224403ed24a871a38a909af09d38d8 SHA512 06529a3a6145ac4123f48b307b45376441b09c368a6cc89d514180e6a0e7fb5be46c3a1ed118bb2f8aec61a389fadbb7c8b2649d35dfa03bbdfc01befad56fc6
-DIST libssh-0.8.5.tar.xz 427372 BLAKE2B d1cd94a50f09b1562f7267ff435b2d180b84d4132a589e053f43f5de64bb764d9263910837a53be594e64595483ed9516dcbf20abc5071e9a8154b8bb75f6f4c SHA512 f1e90a5046e006d44a48ab36675167761d8e308ada7a1d7a1f7ba2825d222a2fab7e19dbc78b1371fee9ba74d9c55d9856a623f97842c9b9ad4c79215e344124
 DIST libssh-0.8.6.tar.xz 433680 BLAKE2B f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762 SHA512 e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522
 DIST libssh-0.8.7.tar.xz 430104 BLAKE2B 8ad9455d81120726434a418abb74bfee53279040541cda50117909d43088ea992b9dbc7164b079dbe970b4348b967ed0d3f6352df98f60d1e6d9f14a086b5a40 SHA512 13c3dccad81d521edf29c8a5e2c5f7fdd90507a0eda652b2b040a0a17bab88860873e089a46e181907ea3f449ca1847b1c84453b1960f456e391eefe5be983c5
-EBUILD libssh-0.8.5.ebuild 2959 BLAKE2B c9acac4ed8b93e0742a99e1b8514cbb505a58f78f142ddcca4bac35c03d8299343b1550556b309b17e9c4dd55f73c1d535f6670a41b42b40125b74fef93e042c SHA512 b314908c959cdd0443ef505f2000dc5b47f41bc4cbe0c1ad4906a03af486cae314c1482769614deba1d5b77e0e5a30b182095459180febbf56f2e5f0be390424
-EBUILD libssh-0.8.6.ebuild 2938 BLAKE2B a38e4d108b50fd07221809eee27f89a9f63baf1beb2b9cda4abccf821026b755a11492c4ab594cb9f030e7c0c88a5f851c428393dde1672eb267d9683133c7b4 SHA512 2b646e6ad1c1e365545e5416a0160d3c5cd5e933f77fccf2e80b0887d511f5c66a7dff166f4c6a6b516f2e1a42f6f2f8012ed0d031c31b1b8b2df7c80114a9cb
+EBUILD libssh-0.8.6.ebuild 2937 BLAKE2B df427590602299e1c2fb18583c83d554f083db3ad474307002474793313a0aedf5d2108ad8116934fc4ebcc748391d16d6fab87f42b42aa56ca659031111ec26 SHA512 a7fe530b3714b126fab464b0acff0cb4321ea9c2594f8862eb184b6378a5febcf93042a6a18e329e3f5d39891ef335f2f9aac783ab4485ca6d9c18359a7a5f71
 EBUILD libssh-0.8.7.ebuild 3091 BLAKE2B ebd0ec869401d1dccab35911777e785afa7700969bd2ac0ca4f9e8e53685b36f0f4af952e1544a77fadd3708f5a5e7f4811a68ca35a87168bf7b0920dfe938c9 SHA512 930688de59ddbef12c114005e2e7e5cc39b3b1066463433a68486030d64ecd43382d2483fe0eb93f7378849a111bf37d5a05d8c4e4f4b2b78e7417a206a2994a
 EBUILD libssh-9999.ebuild 3090 BLAKE2B ec389c91318025f582a7639e6abf61082d8ffeb81c91e861100ccd13dc13ff940710379079165f826524ecd761fecd29cd0e09c5a789e473a262a95eba01eace SHA512 2c8a24d0037737ee7125e505ff8e4c0a0a256e42ebd5f6ed0544ff8c171e1622bbdd2ebf07547a07e337fae3a225fbc1037979287f5edb399dba0a58fd88782f
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.8.5.ebuild b/net-libs/libssh/libssh-0.8.5.ebuild
deleted file mode 100644
index 362a937e9f33..000000000000
--- a/net-libs/libssh/libssh-0.8.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	inherit eapi7-ver
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.0-tests.patch"
-	"${FILESDIR}/${PN}-0.8.3-strict-overflow.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.6.ebuild b/net-libs/libssh/libssh-0.8.6.ebuild
index 9429fde86ddf..65d029e138f0 100644
--- a/net-libs/libssh/libssh-0.8.6.ebuild
+++ b/net-libs/libssh/libssh-0.8.6.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 6fedeacb6bb1..061c5c95be2f 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -6,6 +6,6 @@ DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420
 DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358 SHA512 390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93
 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
 EBUILD libssh2-1.8.0-r2.ebuild 1647 BLAKE2B 47a2d718a0a2bf40f31fa3a3251ddf64e44fdb2823b61a3c10b54cf34c41af01adc3831b99f25a8b012cf7ce54a0120d4216dd3c7ec9921b48df15d29d542561 SHA512 43bbf761c4075cbe523b1b5ab247ef7e69c800f529ac41981ff61cf53a0c37b3b2b989cd9a08e7e709b9ddc0cb9d2a86f31e7930b96c95a0e5857aadf2a3eda9
-EBUILD libssh2-1.8.2.ebuild 1647 BLAKE2B 47a2d718a0a2bf40f31fa3a3251ddf64e44fdb2823b61a3c10b54cf34c41af01adc3831b99f25a8b012cf7ce54a0120d4216dd3c7ec9921b48df15d29d542561 SHA512 43bbf761c4075cbe523b1b5ab247ef7e69c800f529ac41981ff61cf53a0c37b3b2b989cd9a08e7e709b9ddc0cb9d2a86f31e7930b96c95a0e5857aadf2a3eda9
+EBUILD libssh2-1.8.2.ebuild 1640 BLAKE2B a58a0bf9e7129e17a14ecfb17c81449325f2d5cc4b9765ca4ac73a8574f23a56914401fbbff8bc284b5239bb02f97f03bd3745c02f890d2360b92c495b000da9 SHA512 a7e39681d2cb9a006b900b8fc9b91c251be9c03ecbb40ea31a502b46614f75e042c443a8ec94a9371997dc2fc7ecb19219e0af2452c0746a81a7a5fb3f3f32d8
 EBUILD libssh2-9999.ebuild 1350 BLAKE2B 4c235624aeef7721a3488a1dac91d406f5f83b8e7b1482bdddf7a71f0d2ad19c0124aa64b00b228d713a5da0c394accc9d3dce19374d588256e2905139176b64 SHA512 e12db58e8a20272414575ab19378dec2ecb2c97aa79d3f8d4397ec9638a2377d9218f21302c2c56af03dbc8620e807189b50442cb8d86b3b50d9c8caf15d717a
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 7eb5156df2c0..df52717f790d 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 8f6531d4eaf0..d6db782ba04b 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -2,9 +2,9 @@ AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815
 AUX libtrace-3.0.20-tinfo.patch 474 BLAKE2B bfbe8126fae0ef132671c24ae4a0a44fa5204e95e7aad330c9b3afcb033e65a95c135b09b054a7741f902b2aefe31fa5b953d62a95bb41ff227b3281956e55c6 SHA512 eb0369b9b8a273e47189b63ac90e9bcfe3a10532343efce8b5ab1d79c84a427dbd6655683c9e7b135978e703567603eec12d1314dd6bb44c91c716d166c9b824
 AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
-DIST libtrace-4.0.5.tar.gz 954257 BLAKE2B 42d0940f18f836945fc50d86e1fd242e18a09c4dc07319f831457ebfd08a4ad2d4f7f1ae2a5fcd8f881011110fdf57f623a42d624ba07348f1b9de759769c641 SHA512 c9738af7a471f6c0a6a2a2595ea081beb6145b57792558dd66feef9e4601814a8f5d6be194c83ba2ce076571dfc2a86aadafaa30411d9ecc3e7b7d83fc7809ce
 DIST libtrace-4.0.6.tar.gz 969315 BLAKE2B 812100d7f0fe3def44404372c7b2287a2a9c9b3831cc2e3dee30cff0946d959089d44f201ba74aba57246242153e634806d899a108e18f195f5b6bfde8c0043c SHA512 8f888f57e4436d1aa7fc030212f7b356c58848151873569aa372c6cbcf62c5dd1ece4ecc5a98f6dbe8dc84a39d19abcbe42ff240282054b45cfce0c8ba048f16
-EBUILD libtrace-4.0.5.ebuild 1134 BLAKE2B 65826d3c4d60e567d3d6ca954f9699f3c067f7430d35c9d98316ab159b1e0a1022aae36ad9272b15cb4970d05f61269f81ae98eda13107896187414ff7ec7bc4 SHA512 2ba226191a5cc7675a1c516df80a4e2a4848db5ed8f0f9557e31d361127abd51b426c52a6ade15851663a3dc28882420ecef03203c13a116f2c5d09c590badc5
+DIST libtrace-4.0.7.tar.gz 992013 BLAKE2B 24f2f684f58eb197ab7f117a5c2c97c0744b4ddfc210088058440148773066e64414766f7e1296c5520345b2a18f2b420215521ee169c74537f2f3ead92c9503 SHA512 3cfc2a47c7402e9ddd3821a7a435edfbb27b718c656400283fd5fa6f4137ede4acefbbd0390aab68e4140a6eb9f93b8df6726df484a79749798302ed3ae5165d
 EBUILD libtrace-4.0.6.ebuild 1134 BLAKE2B 65826d3c4d60e567d3d6ca954f9699f3c067f7430d35c9d98316ab159b1e0a1022aae36ad9272b15cb4970d05f61269f81ae98eda13107896187414ff7ec7bc4 SHA512 2ba226191a5cc7675a1c516df80a4e2a4848db5ed8f0f9557e31d361127abd51b426c52a6ade15851663a3dc28882420ecef03203c13a116f2c5d09c590badc5
+EBUILD libtrace-4.0.7.ebuild 1127 BLAKE2B 8f734cad9cacdebeb00ceeeeb52db158d3a5d7e44d4d819291dee0a9be32cb885d476d8a968794d1d02260bb7b65f9264a4abef6225eff6c80ce2ff4d75d4806 SHA512 0cb30eca2aad22f76c37237cbbd49b7460728a55c33262d2643d921d9fec06f537984b08ae6241313ab62c4ce18db20deed7a30e303a6762312c0735691a401d
 EBUILD libtrace-99999.ebuild 1110 BLAKE2B 8de7818aa67bf32f231add5448240e41db4153983aca831afeddf714a6958aad8fc9ba9c507af436572e0c6ef4f92fa3cb0cc5c7b59d2b2750b717a7af8e346c SHA512 b7a560233c8231f40ca0469f35676b1670514e9985ceaea82a62cdd0dfb7b13906daa64a6f8de4888eecf9373581c4308ec20e2dae2fb662baf5106765a62c3e
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/libtrace-4.0.5.ebuild b/net-libs/libtrace/libtrace-4.0.7.ebuild
index c8291b01d7ff..d5c5a09369da 100644
--- a/net-libs/libtrace/libtrace-4.0.5.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="A library and tools for trace processing"
 HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index cfc2994916e9..234a0d659966 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -2,5 +2,5 @@ AUX libvncserver-0.9.12-cmake-libdir.patch 669 BLAKE2B 1906637be7180a884aa3daf8e
 DIST LibVNCServer-0.9.11.tar.gz 1413739 BLAKE2B e295d3aef7181cd767676c4e55130fa65ecf8ea92a659b6de82d2cc465f1c9e1a587839942fd89882126dc8ec54f9de20a78e799ea194f9ae227a82ae705721b SHA512 e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
 EBUILD libvncserver-0.9.11-r1.ebuild 1921 BLAKE2B e324d043474b5575867592f07106ef8c6054004aed2dd46a1ac433962538b0203da3315a1025490de760960d58102935fd925ef77287af597ac18b363590c5c2 SHA512 33159e0e940be618bc4267e62f34555cc48726fab8db08097568e911f3fa5efdb1391ad0ee054e92db785811368943a601ce6434456177a0258c044431c9eaab
-EBUILD libvncserver-0.9.12.ebuild 2115 BLAKE2B 1ff83615bca00ac022ef0a31c755aa346e9731f23bd5a03cbee48233cf0b4798dc9bed793db41deca3231adac780cf2e0d4373faf2b7088ba50e7cf130fece94 SHA512 52615562675a74b0d9c3c839fe101d8b96893f3ed84641375706b0b44fff4f34f620d8a22ed58901410ef6f365c0bc49959578a5307244c0b6eda8b57837aa9a
+EBUILD libvncserver-0.9.12.ebuild 2113 BLAKE2B 22f17f33bd0ea7ba84bf1744ae25f3ad15299902311e990db06af343d570dfbce1cb16de0a167311f610ee4e7d4ca781006aa15b2ae182ae0b4d321e1aeff300 SHA512 8d9e6ed8352cddb3146d37525bbd3ee47b335cb6ca28e43005d7dca6a7c3ed8756cae3a2922c10bedfab0de7926e98a04ec78b1d2b60d453101b755001cfe1f8
 MISC metadata.xml 886 BLAKE2B eb2d3707e1c536735a10b97c885e8787d1039449cce85e93e4ad485bcc92ca786a538aa10cce2888657cb2764c5793c6d86516b5dfe16970ce54e23803c569f1 SHA512 40d57c413847589b5e3b4c4edd7743bcc3461624abe129c7cc558178e1af8ee7585c3a1edb776c884a2d8b33b99bf9d67e4e6fa44c774692e66b2bab074fe06e
diff --git a/net-libs/libvncserver/libvncserver-0.9.12.ebuild b/net-libs/libvncserver/libvncserver-0.9.12.ebuild
index c228e51f8943..35cdde270759 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_PN}-${PV}.tar.gz"
 LICENSE="GPL-2"
 # No sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl sdl ssl static-libs systemd test +threads +zlib"
 REQUIRED_USE="!gnutls? ( ssl? ( threads ) ) png? ( zlib )"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 9ed9de5a1ebf..bb47b342b83b 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,5 @@
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
 EBUILD miniupnpc-2.1.20190210.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
-EBUILD miniupnpc-2.1.20190408.ebuild 1342 BLAKE2B 671942063a16c89ec176127db3463e507df02b0096c74fc52ba3423ff0d5cd323d1bf5ce576fc8104650d3c2441ca393b1fe70d555430caa15fa35b02811ef10 SHA512 2d0673f006c620441a8762c68da93eeb34d77772b3bd36834f5e363b7750380ffdf16c4e4d82414a1b2e2603b2c7a886918b0f5a70c604ceb43fc63433cff206
+EBUILD miniupnpc-2.1.20190408.ebuild 1338 BLAKE2B ca708dd1a102da3ce579a974ee29aa31835df92f39c04d159cef990df3c8c780cf93a7fc366b5004c49f1d342562922b62243adc36a42556ae63877ee6623ad6 SHA512 3925e55613ef2bfec421fd61da101838528a05a2c4f62d5b6a71ff8252e0022bee27ca1c81f8ac40619c460cadac1e097e8051bc58d104f8ffd5872220dae04d
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
index b170db612f20..a422b3834f6e 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc ~x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 0b5c9b2b58b1..0e424360505e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,11 +3,10 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.15.3.tar.xz 20262632 BLAKE2B d65d4e274fa829be5cda1970b0ebe7081e8476334cb825e5727324c3202bc015f4ba39589608284d0f8c0b722079c06d1587de5299a3c81ccb7b0eacbdaccf84 SHA512 cf741f733af7a7e1fbd37b0f98110078494b4771dbdfccacfda95a5ea4cda6cdcea4f8d31dddcf27477213614e4ab6cf7d1a1f900cb92936333730737ac4f9e8
-DIST node-v11.13.0.tar.xz 22085284 BLAKE2B e771c6109b4ca60b3037ec6a4f8138af75b505f35584a239f30d2a349d6de68db2f2183b89a7d5a4bbe2aef1e29fbbea54bc93697362f56c12e2e0b54fcadcd3 SHA512 89411c9b9cbf1df09cbf2b5e3a910d7ef2e4046a27a5af858c53a20f51b9ab2f9aad4e4c7c41936520e1feed249118fc46e4e4458e7980a878f364082c24fd35
 DIST node-v11.14.0.tar.xz 22106812 BLAKE2B 3a8dd9feb5916f235bf69d0610e32c1861e64f427b6de5ec27b3634268f273826f271cf5ea821042420d3b3f348124be2ce2fda13d0addea092db1338c9f95f7 SHA512 4e8033ea0f326fe5a8372c81771cd58242881ac7db905f697ce79ef9cb3ba2dfe2b94fb24a36775761c72ac531096c5e18a8574f933d76c1b652b18419b25446
 DIST node-v11.15.0.tar.xz 22115480 BLAKE2B ed1f621e46d24051f8d84255875e7cb2c1bc0f9432a12fcc35dc5e336a71bb3e7f511146d112d1f236f9f978a68987d80331c22699479ce63b7bf30e50643219 SHA512 48270620fab3eef86c21387b316ce9054e2b0aac60a36f7fc08d18ad4a11c8d2082886ca20a455fb4a74a561d7e97c77403227ec9a83a13c47fa230b47a5af2e
-DIST node-v12.0.0.tar.xz 22387124 BLAKE2B 7d596a5e7597c358c6b81b7ac1efaf27c2c3202a107c2ea76e55f6d2acced6e1271fe1ceb090df3c2377c73f501c11330f73f60f2f06c3459d7d9f19e9ab11ed SHA512 ca2f40c05e963ec54a8fffac2da1bf61c6f4026c96a4ce688e72d36932d750ecf9ca83c33d5688e565ee7609afc49ea385b4396f2082ff885226d307689299ae
 DIST node-v12.1.0.tar.xz 22463256 BLAKE2B ed66ac34acb3e27974f1da192776223104862d00410bc3f77ddafa49fd3e5a1a9921acf472990a8cc953522f2953135ad1af80ac9c83f8d796dce343a086d419 SHA512 bef5b8f85f772fbce474991952cd36cb83f8bfb9cf59d34e0bc4b0b60fb1a5b8547eaaca8c796e865ad6b7e54dc76e0fbb2c0d692ab35c1cb7d3fd4d39add4e5
+DIST node-v12.2.0.tar.xz 22436748 BLAKE2B bb578aad8ad49ee542716086591d896c325083d48b7e69b8b0e9644db2b43546872eaba4b7b6a8b983cb7b21fc948705af88cbf883f275af76bd24918088d584 SHA512 00cda17e5fcce771ea461941d6cdd258545ac295bfbe7543f3153278e73fddbe117dd81c4e22716c147eddaab2577f50abf2a3235b18b4eca60180dee050dd7b
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
 DIST node-v6.17.0.tar.xz 15853760 BLAKE2B f1872b2ed43c447beff2b3278e49f9f10bbef58bba2640f6ecd889facfa4c5e5ae142f3b30721faae615df42c0870d7c09147930a259fa81c161b29559e2a340 SHA512 8ae9bfa0336a7d0d9f4a372330de1f877354a3d68bdd6977285787f81999012e42faf4ccef5981fe565ea9e2f18c5490b857bab29359fdf906b5a9fb14628858
@@ -17,11 +16,10 @@ DIST node-v8.15.1.tar.xz 18501532 BLAKE2B e6da98902d665997b2e85472424e00f817353d
 DIST node-v8.16.0.tar.xz 18515392 BLAKE2B fc2e53322fbd74cc35c3865d718733ca18d37f82af057650cf119ad64bb81aab1dcf8a09e43437b1f196547c11291f5d7de5f53a959f0b742f8f5b97e4a2d7fc SHA512 42ce0aa6f94b42859c2df43db4e3a2818581ccaf92179a7a5252ec122035c8674dddb8aad3b867d8edfff19053918162ad04e8f2eedc1026b199a12b586ae103
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-10.15.3.ebuild 6442 BLAKE2B 8ae691a1aa9e3a2eeec5096c5890fa6ae2d8774769f65c88551f3c09e2bd7fdf9482f0ff169e2df43d29be1d85d4424dad7e840300c8f441028c7fab075cee69 SHA512 7ecdabe04e2eaf93277922e528f777126a90fcd8c96a18d3db7f890f0dd516cc0ec2c60f427f1366aafe42e869a777468bcfe85fea0cc1dc62c252373b7cd594
-EBUILD nodejs-11.13.0.ebuild 6486 BLAKE2B 49db27efd59a9eab189a1cbcd5c1bd8a782a67f5c59c38ce2197bd914207884d08d215707561a8ecd2007ac43955f83b395ee3923aef03b9ab36c43910983c01 SHA512 caefa91632f4ec575ed94212fc013cbdcc5e4d0c5a87cfa9d375bbc0c837c9b3feaa874cf25b12aa057c8c3b3c2d855fd57d8cc4a7a6fe6922f2f34b2b596412
 EBUILD nodejs-11.14.0.ebuild 6486 BLAKE2B 9098ad26511d8d268fb0e1073f126570374aa3c6b81d0a69944e21da7d2cf6340a9df14eb30296f192dbac31c3c8574128f500055e2370f3ee5f5c3e3e0022c8 SHA512 006b48fce401ec454df6a41fe050a865d5f7372448d778a775ec67c10960341812f39f8411e67f7b6797b0362f23d6fce870cda6ba682a687adf87e3d069723a
 EBUILD nodejs-11.15.0.ebuild 6458 BLAKE2B f5eb4de9847e708dcc43d8917671592459ff9357c7a26128ba9b9ed1e0fbfba19c419a234dda9c7fa528ff75590793cab2ea66abbb6929766289be87272f741d SHA512 9aaa1c5b5cd446f7f11896ab53ddf19c1552d5b635dcb5cc50745e9e3e886d6539becffb9f9568a39bca6930ee32485f82f4e426ef1da3a44ec7ac414ad5f442
-EBUILD nodejs-12.0.0.ebuild 6493 BLAKE2B be374d93cd942b76cfd2efc9e56148d3e1acbc4b115929001710e9cf863365ab25b4256761edc78f3f67405d4ff6b44d1419317b5d397a62b410b492fa1c8b4e SHA512 73595ceacfa28f9db741840fe971fd88e26451d2c2ab039c936e5476f5b3ce043a4af1fa06485828bb8f6433b372d753671630869ff62251fbde0b26ba546029
 EBUILD nodejs-12.1.0.ebuild 6464 BLAKE2B 60a09e27725d915304e14d1e39341396d7e000ebe9cd7909d8eb1980b624fa892053ef4396b58423280503d23d12b43fe89aac418940e68028f0b7d411efb6a9 SHA512 00f28e753fed742c4757208dd80bb9bc37245f5850c76bce52b5a419182c4a0f9d0c30c51674235b1c501462ccccd07bed22b880825ca6329dc0d881bbfa4bad
+EBUILD nodejs-12.2.0.ebuild 6464 BLAKE2B 60a09e27725d915304e14d1e39341396d7e000ebe9cd7909d8eb1980b624fa892053ef4396b58423280503d23d12b43fe89aac418940e68028f0b7d411efb6a9 SHA512 00f28e753fed742c4757208dd80bb9bc37245f5850c76bce52b5a419182c4a0f9d0c30c51674235b1c501462ccccd07bed22b880825ca6329dc0d881bbfa4bad
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
 EBUILD nodejs-6.14.4.ebuild 6153 BLAKE2B 6b358c6e4361f34761a577c10f0bcdf9273ee75dbbbafb652df8a374db376257c968ba9bc40142920266cf58b857f055ee46f161f31e756ba6f7124414976380 SHA512 0513974058c7c878f1104ab95b14d6788e293e4850b0d2d72979f3a3f9538854564eb6bb55b788f3616a4a0cd18d9f8b20e407c5aa221195a185ffbea5d9ccb7
 EBUILD nodejs-6.17.0.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
diff --git a/net-libs/nodejs/nodejs-11.13.0.ebuild b/net-libs/nodejs/nodejs-11.13.0.ebuild
deleted file mode 100644
index e6048ec9137c..000000000000
--- a/net-libs/nodejs/nodejs-11.13.0.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-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 systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.27.0:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.34.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-63.1:= )
-	ssl? ( >=dev-libs/openssl-1.1:0= )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-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
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || 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 deps/v8/gypfiles/toolchain.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() {
-	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+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	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" \
-	"${PYTHON}" configure \
-		--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)"
-	emake install DESTDIR="${D}"
-	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
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
-		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-12.0.0.ebuild b/net-libs/nodejs/nodejs-12.2.0.ebuild
index 7cde2ae51517..54f1648d7788 100644
--- a/net-libs/nodejs/nodejs-12.0.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.2.0.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic pax-utils python-single-r1 toolchain-funcs
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -28,7 +26,7 @@ RDEPEND="
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.38.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-63.1:= )
+	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 DEPEND="
@@ -134,7 +132,8 @@ src_compile() {
 
 src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
+	default
+
 	pax-mark -m "${ED}"usr/bin/node
 
 	# set up a symlink structure that node-gyp expects..
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index bb36f4e1076f..523844e2e9e6 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -7,5 +7,5 @@ DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7c
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
 EBUILD serf-1.3.8-r1.ebuild 2125 BLAKE2B f8276c9af00f571b33933b2a6b2676694c8dfa7fdd1f465c3171997936468094a793ac747e419457addca1dd358983dcff2155cc72bfbb577d1c8f8b88eb85c1 SHA512 4db061cb8b0d4af9555eaef6ca6be13b2a731091974086cde09cd6f36b537047265fd56bff4cd46b1739915160a7705bca6e391045c5bc81628f3fe08b90d406
 EBUILD serf-1.3.8.ebuild 1512 BLAKE2B 79480348f4734e32d06e40f9ab7cdda4f464d9226b254d8f31a28f3468cef4af56f12c64e881b9bdc6b3aad0d926155706801729ad3645d70fad034fb33aba4d SHA512 92109ce007871baf0e52a100d8b88df475413b88e900beabb3598905ae41e8a4b8881ecebcd8788954a031c6c2c73742a43b4647aae46a713a0568083d4273a4
-EBUILD serf-1.3.9.ebuild 2130 BLAKE2B dc14d3d749b24c67e7d8469b067861ac7d7a07675d427d64b2a2dcaa97a423c9290af18fd5e5aaf4f0062fa881901f37030886558889e1dd333293097e4107a8 SHA512 1f26cb1d7669fcf404bf94065ec3c1f8c5c7afb31fbab7be7e0f21dc0e05cdc901c2dbfe8fb68f19317131fc53d198b01b09d531ac1cc911e5f57f262d675947
+EBUILD serf-1.3.9.ebuild 2128 BLAKE2B ecb76eb9d649cee61ee96464ac74d5de65623753693f30de0853e8d0cb1183333183ce5178d52ef80748b4370c94ef8c3c17c33efee7290da33b2f696e4cb197 SHA512 f2efbd21895ee9002dd54530d57315aba0011c3ec97ef101b7bdbc4051217a48132a5791adf6b2f1cc49860c01824d5f053f16c17d3cfd299ac7b87f6d5d30eb
 MISC metadata.xml 339 BLAKE2B ff1bd30899bf67f73610a584e1d012632c801f3fecc39b5dc1a79025abdc151c650d26e5363bce5aace53798b20ec8931fc3532e83814b89fce767a2ecdc4e0d SHA512 b98b7e682407dd662a866336f76031793f13b0d76a7dae86b542afb515fdda1224b8141c71ff1f502294c2bcd88f3f80d18d654dcabe77088bef049bf462f18c
diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index b12539ce5a04..7a9412df1fc4 100644
--- a/net-libs/serf/serf-1.3.9.ebuild
+++ b/net-libs/serf/serf-1.3.9.ebuild
@@ -11,7 +11,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 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 4fc40d6b991a..39cb4cfe175b 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -6,6 +6,6 @@ DIST srt-1.3.1.tar.gz 783953 BLAKE2B 647a67fbc8806f35b6ebc5c24236664262abbccaf41
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 EBUILD srt-1.2.2.ebuild 1055 BLAKE2B 3548583311b1ea6d21c20ff9752cd29968d8357b99821d56b7f894495efa11eb31e2624f8cc45d6ef50915c188ebf0f9ee7579fe4502c48eb3ab919ffcbe004e SHA512 a85446242b4830255ea70b9b2632dfb404178056b29009e6facffc6ac35dc708c018baf8c48dd9f97d5bed1bf7109fe6df0946173c072264f95635180e395c5f
 EBUILD srt-1.3.1-r1.ebuild 1347 BLAKE2B 99c91c175f9c3102e1b29a6f9802c4a73576c2840c5d815494632a77c2ff9334a17ae2cc4b5709132de4dd52bc7cb0db482fa6f5c6f85dfe532e03cefdeed543 SHA512 76c669ab9a37339d041a28fdd888fbab0ea1e36f4f29705fa262b7d68a4cce1d80b9f3e29289f342b951d20a61f65b0b074a03b42cf1ec62fe54ffc1f2d064b5
-EBUILD srt-1.3.2.ebuild 1220 BLAKE2B bf8406e8cdd7a583a0406626c0bd6e1e7316e30b70a8730790af91d98ad52e0231a60f09f61649f2692c3b92ffbecea782909852b4dfd0f69b25407731d03017 SHA512 05f7746a3dc8f589f5c2b28f22e875507eb9a8cadcbcdc07abfd15125c5df589541f0ee4f6f64b335d0978775d28fb4e21382d4234dc5820bcec28874c6cf7f9
+EBUILD srt-1.3.2.ebuild 1218 BLAKE2B 291dbced84a2b2e0a6ff6be866a651434697e0e32466913c57303b48a0407472966d0641d9ebe6567776175d3d4916516a079c184d14e83899bef8894c72fcd4 SHA512 873ccebc0bdb95087848c9a7dd6cb70a43bf896e2b29e8acbf0783eb1817246a24eb6a8137f0dffcb97bf0c1761681d268285346c71984dc50e56045c6c254db
 EBUILD srt-9999.ebuild 1314 BLAKE2B 190493cd65e60dfb2131cd64910dde9b4d62b10aca1dba5143dd1a34d5f353c22b89b9cfaaae03a3cf3b8f27ed31304aa10533f9c062d396a57be7943e3bd138 SHA512 4c7857ebec342fab43372b5baf7af31455a6a82addff0b5bdaba4df78f733abbaa75f4da5d263313962db51464ab496aca797d00a500bf1f8b0400c9dea1c596
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index 416d89756e91..97e04641afd7 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index 35fec6a63ba8..773010299724 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -1,7 +1,11 @@
 DIST wandio-1.0.5.tar.gz 385535 BLAKE2B a7911ab14ff9911ef19bf35b6e50d3f2e6dd0fa06f5689b6c353cc5ff2ee93175d7e758657f79fd35e7aff29fb1a4b4c343c30ab1e00a118ec3056ba9129cd60 SHA512 3bf2b4362355bb3db047ea12055b96cc6fdd759b4efbd9cf1caf05133ae9e7e1fab5f4a7e5eadda45d7c1b4dcf9aba1cf3a4c04bc23694934aa8aa67ec31e480
 DIST wandio-4.0.0.tar.gz 385706 BLAKE2B 7f6e7855a06ae2c23138598c5cf16c9a38f57932d488cf2c9d0fda2fe54e971b8e93b5768a487328afc2079add7f269cd8f0203314b06eb3d256f8739828c6fb SHA512 8ee4149439411e8ca784a434766c5c35144fb49c7166c2f135cf47625011815e2b27af5b61d75d6a4f9e64ab1091ce1cfd4ef114e34b57e0c53029be45f9369c
 DIST wandio-4.1.2.tar.gz 409755 BLAKE2B 90bf4cf9bdd6cdd87668614c91bbd5fd8dc7c526a8e985737d1dced760209be205052221ebfe9ebf92b7c05492298da275498aee1e3817d73235488da9ee2cc1 SHA512 0d74aec9fe2faf678d369fec420f56ae78eedc5f38b70b403034fb030a9c0d1d5a54225b111993ce59b79d8e02ad49a2b0ca4697c7910149f2ae54379d9e19c4
+DIST wandio-4.2.0.tar.gz 410273 BLAKE2B f133e783f6f47a6d55058684b4965d02816a0fe835bcce274292287492e53007ebfce3b447d6ac9f58d8d4626ba20b7b6a7e5e6ac3cc054ef49d70c843c0216f SHA512 befbca1479b32cca909c6125e54be0a061d1fecfc01d9bca7cbd54f86564d39a02714805c7583d9b50896bb553a197e0f86fd10d4424782f5e9798a0cb440923
+DIST wandio-4.2.1.tar.gz 15417543 BLAKE2B 704ed3846cda3755ad305bdb84febed75ba1f044d0380465041cab9f44dc16c1a7fc8bb5a8d4292d5f6c12d6783af45d93bdce70228afc5438bbe7d6f5714491 SHA512 eab9180e477f63e37b11d090b772037fc319554495e6f3656da66e34dcde25f47566e87b71255645d9bb5aaaff721f0dceace4d880cdca491c05a9de6852553b
 EBUILD wandio-1.0.5.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
 EBUILD wandio-4.0.0.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
 EBUILD wandio-4.1.2.ebuild 760 BLAKE2B 0882091040df94b87a0fd6fcd299ba996706dd57e69c6ba1f1661a77bd9f919e0d5cac8aded697073d79a3516f5937973467ae389b6c06c9939627728c81e8f8 SHA512 32a42584bf5d8a5366d51b24e8bc0a204ff94b9918dc13daaeb4fd33c729eae676b283eccca967cfe05bf16d5a34aed8b9af8728ca024c0d3525f992d8abbe22
+EBUILD wandio-4.2.0.ebuild 760 BLAKE2B ce10f3f5b9892f8d4559340d7bd658f6c81eb8386ac44cec033c92690b23e5aa7ba148cc3a17057ab0e80e1218639e2887886046a8aba22791e02cabccfac902 SHA512 2d65bb7cbf03be4bf7555d2f4af1f01d6c51e69b3fced3574604f90d695fe91b1d8f5ae05a990b8189d8b4d1b60bd4d6ade4e61c29de07a4aeb794c4f2e07d95
+EBUILD wandio-4.2.1.ebuild 912 BLAKE2B 8170f1be28ebfadb66a596ac78d49b12b41faa51c02a13567f83b2db35d6c291eb2b557efde0d94e18d9f4a928316743953029cbb7f7070478e8c9a87d45120e SHA512 414f23e9d3eb2a8b96810cafafe6001e6ae1461cb9b2100b9ac2c1615de6d25d8039cf00eaf21415691b82aa1fb2981764124ca990d75cc5d82f98909e0791cb
 MISC metadata.xml 325 BLAKE2B 83c3a11757f54887d9fa3ed48c2a9c5a5ababc6070875778a26157b04624c6411d406f810a1c9c02bdc6355675e41a130cb21cfd987aea39e1d2aac8d23c2895 SHA512 f6baf388df040729e65cf7b578f13650917d22989b89ba4adeaeba332fdc78fc8f3661fc37c238a495c75f4cc601c2642f13e2660e73b6e36da8db39dacb052a
diff --git a/net-libs/wandio/wandio-4.2.0.ebuild b/net-libs/wandio/wandio-4.2.0.ebuild
new file mode 100644
index 000000000000..7a923dc15cc2
--- /dev/null
+++ b/net-libs/wandio/wandio-4.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library for transparent file I/O with compression"
+HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
+SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 http lzma lzo static-libs zlib"
+
+RDEPEND="
+	!<net-libs/libtrace-4
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	http? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with bzip2) \
+		$(use_with http) \
+		$(use_with lzma) \
+		$(use_with lzo) \
+		$(use_with zlib)
+}
diff --git a/net-libs/wandio/wandio-4.2.1.ebuild b/net-libs/wandio/wandio-4.2.1.ebuild
new file mode 100644
index 000000000000..b2404e7e7a1c
--- /dev/null
+++ b/net-libs/wandio/wandio-4.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="C library for simple and efficient file IO"
+HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
+SRC_URI="https://github.com/wanduow/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 http lzma lzo static-libs test zlib"
+
+RDEPEND="
+	!<net-libs/libtrace-4
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	http? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( app-arch/lzop )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with bzip2) \
+		$(use_with http) \
+		$(use_with lzma) \
+		$(use_with lzo) \
+		$(use_with zlib)
+}
+
+src_test() {
+	pushd test || die
+	sh do-basic-tests.sh
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3c50280f2502..8615868d4e4c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca
+DIST webkitgtk-2.24.2.tar.xz 17908808 BLAKE2B bf53f27a5fa15067fb91cbfcff3c2287418c797a4ad03d3a71fbdb194c27e069ab5985b9c8e8df008ed80c80fe2a397d71297b4c187fd7c3acbfe2961d332c50 SHA512 8376167cfc4530886a2ac644ab84ff1021a63f6236d7be9eeb9e0ecade8bad5384b652dfe3720fdd31cddb39df6c935f859f1c0a59f42d7c71998992c4a9ffaa
 EBUILD webkit-gtk-2.24.1.ebuild 8333 BLAKE2B ba3466a372079f14ca5cc6e7add3f61c3e4aac077accfac1c5807da62bb7226bc366640873d654ef49301880ddcf0bff21126b5c0064301bb0ef0a9e086f212d SHA512 65022625db7ae7cf19d45525c18675ee3c53122f2c9a3939b80b3e2cafdcc129ae0dd32a319861e6998bc1a9f29e1a0d3806817ca60efc80bbee0fa3e334d9b2
+EBUILD webkit-gtk-2.24.2.ebuild 8335 BLAKE2B a6709f1772d78a91e089a5915ca70289d905b061eed84ba4611a775570de70b94bd88d9a665029c6cea2312d6f04a9a75357ebeca310be3e14cfb5fafbebffca SHA512 294e875fbd235e9d5b088cd92c60b5c32e6381b6d446086b6a263d03caf2ca7e53fc1094cf05687191128799fd31e232c7aec2cb56aefe3c899f966ba4a72102
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
new file mode 100644
index 000000000000..5c4c67891ba9
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
commit	eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree	3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /net-libs
parent	a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)