gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /net-libs
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
135 files changed, 1248 insertions, 2222 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 20109d3f98c0..75604242c7ad 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/adns/Manifest b/net-libs/adns/Manifest
deleted file mode 100644
index b8d1bd2808c2..000000000000
--- a/net-libs/adns/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX README.security 567 BLAKE2B bdb9ea1b121598a9771f30ac0d778714f8f3ffd2ea50705c5e4a92cc18693dbd2c2ab2c89840807695583035ccc6deec1fe1f9b17671d905da581af8ab246870 SHA512 5a1538d4d93abc5e465798c43a768efd62d913cd040cdd0d25be5a9232ec30742506a414b93ea8db0f5f9edee2cd5de92d792b85b06197aed6d0f06b97740aeb
-AUX adns-1.4-cnamechain.patch 5342 BLAKE2B d96cbd36b92f160a6242ce0c1f7f3cebbb269ad5334d850ae7cd6841d2d78ef25162e8719bafa4bb231465f70d3353f584ab16eb925f6f1ee6b2aa3c338712e1 SHA512 d625261f570951a42c1b7d61c3f84f9f570ac74855e20afba81ebd593788aa5789c56a99fdc6e81487d7388596b2c197381d0bfaaccd1a6ccf5069cafe8eb7c5
-DIST adns-1.4.tar.gz 252668 BLAKE2B 10373868fb322cb48ba5e2425b9e6ef7c1593240f22b412b1a7128349d29e05fa2be53750a06fdf29e3ef8f51e6144a27c19f066a80b195bf5ecf1a8da29ce6a SHA512 9c067def9467578edbbaa47d5e9bc822dabc96bb66f58d032f93b842aaf3746783102ecda9303b24c6437db34d1c4819d2a0e13d08c23c9c7be27c8180604775
-EBUILD adns-1.4-r2.ebuild 1092 BLAKE2B 742798e33b5cf9e091b26e3f0588f334c7212f7a84749e0a92d73263481ba6f6155e0fef5f311b1c00035aeebae5eb47e030000716e7e5300db8bc89d59f4da9 SHA512 bffe85e2a15cfb68a1b409ca25a98a01345168ae55f7aebce6da4622f58d772612db1a1594626d18e0effc433311cf990e88687a3a4ec07cc99afe42f2c98898
-EBUILD adns-1.4.ebuild 978 BLAKE2B 05afb861957192caca3c555817554df2a74d911d2b2de701335b073e3a66dc35a56d3dbd07a511d74e170ea4f224c07f5eee3e3c9b86717b758b82cbbcb3dd17 SHA512 81c9aec8b1c250c03515e69cea3471b814d96b9a2a854627afa7e2638fafbd56e62ba1f55400d000cf519e8167b479ecbc5f0c4cb004b242041c2afa796fb81c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/adns/adns-1.4-r2.ebuild b/net-libs/adns/adns-1.4-r2.ebuild
deleted file mode 100644
index 36e6d678aa28..000000000000
--- a/net-libs/adns/adns-1.4-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Advanced, easy to use, asynchronous-capable DNS client library and utilities"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~ian/adns/"
-SRC_URI="ftp://ftp.chiark.greenend.org.uk/users/ian/adns/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-cnamechain.patch
-	# remove bogus test wrt bug #295072
-	rm "${S}"/regress/case-cnametocname.sys || die
-	eapply_user
-}
-
-src_configure() {
-	CC=$(tc-getCC) econf
-}
-
-src_compile() {
-	emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB)
-}
-
-src_install () {
-	dodir /usr/{include,bin,$(get_libdir)}
-	emake prefix="${ED}"/usr libdir="${ED}"/usr/$(get_libdir) install
-	dodoc README TODO changelog "${FILESDIR}"/README.security
-	docinto html
-	dodoc README.html
-	MY_POSTINST_MSG=$(<"${FILESDIR}"/README.security)
-}
-
-pkg_postinst() {
-	ewarn "${MY_POSTINST_MSG}"
-}
diff --git a/net-libs/adns/adns-1.4.ebuild b/net-libs/adns/adns-1.4.ebuild
deleted file mode 100644
index ff58ec85e529..000000000000
--- a/net-libs/adns/adns-1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Advanced, easy to use, asynchronous-capable DNS client library and utilities"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~ian/adns/"
-SRC_URI="ftp://ftp.chiark.greenend.org.uk/users/ian/adns/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	CC=$(tc-getCC) econf || die "econf failed"
-	emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB) || die "emake failed"
-}
-
-src_install () {
-	dodir /usr/{include,bin,$(get_libdir)}
-	emake prefix="${D}"/usr libdir="${D}"/usr/$(get_libdir) install || die "emake install failed"
-	dodoc README TODO changelog "${FILESDIR}"/README.security
-	dohtml *.html
-	MY_POSTINST_MSG=$(<"${FILESDIR}"/README.security)
-}
-
-pkg_postinst() {
-	ewarn "${MY_POSTINST_MSG}"
-}
diff --git a/net-libs/adns/files/README.security b/net-libs/adns/files/README.security
deleted file mode 100644
index c09f544f3f99..000000000000
--- a/net-libs/adns/files/README.security
+++ /dev/null
@@ -1,11 +0,0 @@
-SECURITY AND PERFORMANCE - AN IMPORTANT NOTE
-
-adns is not a `full-service resolver': it does no caching of responses
-at all, and has no defence against bad nameservers or fake packets
-which appear to come from your real nameservers.  It relies on the
-full-service resolvers listed in resolv.conf to handle these tasks.
-
-For secure and reasonable operation you MUST run a full-service
-nameserver on the same system as your adns applications, or on the
-same local, fully trusted network.  You MUST only list such
-nameservers in the adns configuration (eg resolv.conf).
diff --git a/net-libs/adns/files/adns-1.4-cnamechain.patch b/net-libs/adns/files/adns-1.4-cnamechain.patch
deleted file mode 100644
index 9edf69461c01..000000000000
--- a/net-libs/adns/files/adns-1.4-cnamechain.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-[ADNS] Re: CNAME chains 
-Brad Spencer spencer at infointeractive.com 
-Mon, 28 Aug 2006 14:43:00 -0300 
-
-Previous message: CNAME chains 
-Next message: CNAME chains option 
-Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] 
---pf9I7BMVVzbSWLtt
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-
-On Fri, Aug 25, 2006 at 11:36:04AM -0700, William Ahern wrote:
-> On Fri, Aug 25, 2006 at 09:39:01AM +0100, peter burden wrote:
-> > Hello,
-> >    Is there any way to make ADNS follow CNAME chains ?
-> > 
-> >    I have set the adns_qf_cname_loose query flag and it seems OK for a 
-> > single
-> >    CNAME - e.g. (output from 'dig')
-
-I posted a small patch back in 2003 that made changes to adns so that
-it would follow CNAME chains.  See
-
-http://www.chiark.greenend.org.uk/pipermail/adns-discuss/2003/001072.html
-
-The patch included in that post is against an old adns version, so I
-have attached my latest version of the patch to this message.  (I have
-not tested that the attached patch applied cleanly to the current adns
-source, but it may be slightly more in sync with the current version.)
-
-> CNAME chains are technically not allowed. Such chains are violations of the
-> specifications. Also, I believe MX host lookups returning CNAMEs (i.e. MX
-> yahoo.com -> A mail.yahoo.com -> CNAME foo) is also illegal.
-
-I have also been told that CNAME chains are illegal, but I can not
-find any actual text that says that a resolver should fail when it
-encounters them.  In fact, RFC 1034 Section 3.6.2 says:
-
-  Domain names in RRs which point at another name should always point at
-  the primary name and not the alias.  This avoids extra indirections in
-  accessing information.  For example, the address to name RR for the
-  above host should be:
-
-     52.0.0.10.IN-ADDR.ARPA  IN      PTR     C.ISI.EDU
-
-  rather than pointing at USC-ISIC.ARPA.
-
-The above implies that CNAME chains are illegal, IMO.  But then, the
-next sentence is:
-
-  Of course, by the robustness principle, domain software should not
-  fail when presented with CNAME chains or loops; CNAME chains
-  should be followed and CNAME loops signalled as an error.
-
-This advice, coupled with the fact that CNAME chains exist in the
-wild, triggered me to create the patch in the first place.  My patch
-doesn't detect loops, but instead simply won't follow chains longer
-than a certain (hard-coded) size.
-
-Hope this helps!
-
--- 
-------------------------------------------------------------------
-Brad Spencer - spencer@infointeractive.com - "It's quite nice..."
-Systems Architect | InfoInterActive Corp. | A Canadian AOL Company
-
---pf9I7BMVVzbSWLtt
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: attachment; filename="cname_chains.diff"
-
-Index: adns-1.0/src/internal.h
-===================================================================
-RCS file: /iia/cvsroot/3rdParty/gnu/adns/adns-1.0/src/internal.h,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -r1.3 -r1.4
---- adns-1.0/src/internal.h	2 Oct 2003 17:01:46 -0000	1.3
-+++ adns-1.0/src/internal.h	2 Oct 2003 17:14:29 -0000	1.4
-@@ -206,6 +206,9 @@ struct adns__query {
-   int cname_dglen, cname_begin;
-   /* If non-0, has been allocated using . */
- 
-+  int cname_alias_hops_left;
-+  /* The number of cname alias hops we will allow */
-+
-   vbuf search_vb;
-   int search_origlen, search_pos, search_doneabs;
-   /* Used by the searching algorithm.  The query domain in textual form
-Index: adns-1.0/src/query.c
-===================================================================
-RCS file: /iia/cvsroot/3rdParty/gnu/adns/adns-1.0/src/query.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -r1.3 -r1.4
---- adns-1.0/src/query.c	2 Oct 2003 17:01:47 -0000	1.3
-+++ adns-1.0/src/query.c	2 Oct 2003 17:14:29 -0000	1.4
-@@ -63,6 +63,8 @@ static adns_query query_alloc(adns_state
- 
-   qu->cname_dgram= 0;
-   qu->cname_dglen= qu->cname_begin= 0;
-+  /* Allow CNAME chains up to some sane limit */
-+  qu->cname_alias_hops_left = 10;
- 
-   adns__vbuf_init(&qu->search_vb);
-   qu->search_origlen= qu->search_pos= qu->search_doneabs= 0;
-Index: adns-1.0/src/reply.c
-===================================================================
-RCS file: /iia/cvsroot/3rdParty/gnu/adns/adns-1.0/src/reply.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -p -r1.3 -r1.4
---- adns-1.0/src/reply.c	2 Oct 2003 17:01:47 -0000	1.3
-+++ adns-1.0/src/reply.c	2 Oct 2003 17:14:30 -0000	1.4
-@@ -191,12 +191,13 @@ void adns__procdgram(adns_state ads, con
-       if (qu->flags & adns_qf_cname_forbid) {
- 	adns__query_fail(qu,adns_s_prohibitedcname);
- 	return;
--      } else if (qu->cname_dgram) { /* Ignore second and subsequent CNAME(s) */
-+      } else if (qu->cname_dgram && --(qu->cname_alias_hops_left) <= 0) { /* Don't follow "too long" CNAME chains */
- 	adns__debug(ads,serv,qu,"allegedly canonical name %s"
--		    " is actually alias for %s", qu->answer->cname,
-+		    " is actually alias for %s and aliases too deep",
-+                    qu->answer->cname,
- 		    adns__diag_domain(ads,serv,qu, &qu->vb,
- 				      dgram,dglen,rdstart));
--	adns__query_fail(qu,adns_s_prohibitedcname);
-+	adns__query_fail(qu,adns_s_norecurse);
- 	return;
-       } else if (wantedrrs) { /* Ignore CNAME(s) after RR(s). */
- 	adns__debug(ads,serv,qu,"ignoring CNAME (to %s) coexisting with RR",
-
---pf9I7BMVVzbSWLtt--
diff --git a/net-libs/adns/metadata.xml b/net-libs/adns/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-libs/adns/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 27838d05b714..4e94a4a71c62 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,5 +1,6 @@
+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
 EBUILD cvm-0.76.ebuild 1451 BLAKE2B a869b351583def10291ee6f19ac8602fab654dcac0dfa9e09cc7003afe795a97a7d64243a1d331eb78a27781c6e57532f39298704b57a0a719bf8714760f2761 SHA512 e0cdea110fa6acff28b95bb9eede58dd63dc4dfd9c6c22aa9ae2c2ede0b8d926d5f4adf458be62054358aad5f9329ea9b64441ca0dada3b60d825ae4fd956eb2
-EBUILD cvm-0.96-r1.ebuild 2952 BLAKE2B 12224e99a5bf7ae32b85fd2ac30bb961e882130e909f10f0854ae4b973fc3a9357a008b200ff68aad5cc5c3b00e2896325fc2438c1038941a4ad3de32986db78 SHA512 9fa0300955f8bacc4f68ca8fe4b9a047fea132d7f5842c4b3892bed5706e21f968617e25be24b0a1ac9acf38c37d35115427797006a6f912d4338609a6f63ccf
+EBUILD cvm-0.96-r1.ebuild 3208 BLAKE2B 0ad53487cbaa52ca349b1e12abfced27584808a5d0c8e02ee56fc90bd091b79e413d435dd4a719237a5a2e945a6f1edae663fa14f007aee7badd65b3ed90cbb1 SHA512 b761512901a1a10b4d9c1f1952a3e63ef09a1257dacba6afec9588389c4967fc49b056a314a05c1b1fb7c644e0bd4f32b8cfd4767c62f09f4f46b5ccd7571705
 MISC metadata.xml 296 BLAKE2B bdd092a7e715a03179775af2fcaf170ac7ad4d640812b29d347484bbb986e09b429365201112a409b97b8d40615e561958da79e1acfdbb783ec3e6db30d41109 SHA512 75d265987a3c3e83685a00d760965bc8e4e796429017c05642de2fcda4e37891dd06386df57dfe2d0e2b294916316389a1d72dc09e9feebdf5db3abe2626e34b
diff --git a/net-libs/cvm/cvm-0.96-r1.ebuild b/net-libs/cvm/cvm-0.96-r1.ebuild
index c31bc931cc8e..4f150585b773 100644
--- a/net-libs/cvm/cvm-0.96-r1.ebuild
+++ b/net-libs/cvm/cvm-0.96-r1.ebuild
@@ -7,23 +7,31 @@ inherit toolchain-funcs
 
 DESCRIPTION="Credential Validation Modules by Bruce Guenter"
 HOMEPAGE="http://untroubled.org/cvm/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
+SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~sparc ~x86"
 IUSE="mysql postgres test vpopmail"
+RESTRICT="!test? ( test )"
 
-RDEPEND="dev-db/cdb"
+RDEPEND="
+	dev-db/cdb:=
+	>=dev-libs/bglibs-1.041:="
 DEPEND="${RDEPEND}
-		>=dev-libs/bglibs-1.041
-		mysql? ( dev-db/mysql-connector-c:0= )
-		postgres? ( dev-db/postgresql[server] )
-		vpopmail? ( net-mail/vpopmail )
-		test? ( app-editors/vim dev-db/cdb )"
-# some of the testcases use ex/vi/xxd and cdbmake
-
-MAKEOPTS="${MAKEOPTS} -j1" #310843
+	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
@@ -48,45 +56,54 @@ src_prepare() {
 }
 
 src_configure() {
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
-	echo "/usr/include" > conf-include
-	echo "/usr/$(get_libdir)" > conf-lib
-	echo "/usr/bin" > conf-bin
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld
+	echo "/usr/include/bglibs" > conf-bgincs || die
+	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs || die
+	echo "/usr/include" > conf-include || die
+	echo "/usr/$(get_libdir)" > conf-lib || die
+	echo "/usr/bin" > conf-bin || die
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld || die
 }
 
 src_compile() {
-	emake
+	emake -j1
 
 	if use mysql; then
 		einfo "Building MySQL support"
-		emake mysql
+		emake -j1 mysql
 	fi
 
 	if use postgres; then
 		einfo "Building Postgresql support"
-		emake pgsql
+		emake -j1 pgsql
 	fi
 
 	if use vpopmail; then
 		einfo "Building vpopmail support"
-		emake cvm-vchkpw
+		emake -j1 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.*
-	for i in a so ; do
+
+	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
+		; do
 			dobin .libs/cvm-${i}
 	done
 	use mysql && dobin .libs/cvm-mysql{,-local,-udp}
@@ -104,7 +121,3 @@ src_install() {
 	docinto html
 	dodoc *.html
 }
-
-src_test() {
-	sh tests.sh || die "Testing Failed"
-}
diff --git a/net-libs/cvm/files/cvm-0.96-fix-test-padding.patch b/net-libs/cvm/files/cvm-0.96-fix-test-padding.patch
new file mode 100644
index 000000000000..0db28d59553c
--- /dev/null
+++ b/net-libs/cvm/files/cvm-0.96-fix-test-padding.patch
@@ -0,0 +1,25 @@
+The Debian packaging of cvm is maintained using dgit.  For the sake
+of an efficient workflow, Debian modifications to the upstream
+source are squashed into a single diff, rather than a series of
+quilt patches.  To obtain a patch queue for package version
+0.97-0.1:
+
+    # apt-get install dgit
+    % dgit clone cvm
+    % cd foo
+    % git log --oneline 0.97-0.1..debian/0.97 -- . ':!debian'
+--- a/tests.sh
++++ b/tests.sh
+@@ -674,9 +674,9 @@ system directory: @TMPDIR@/home
+ domain:           test.tld
+ mailbox path:     @TMPDIR@/home/virt
+ 
+-0000000: 020a 0108 0100 2430 2470 6173 7300 2e2f  ......\$0\$pass../
+-0000010: 7669 7274 0000 002d 002d 002d 002d 0031  virt...-.-.-.-.1
+-0000020: 3031 3637 3331 3335 3800 2d00            016731358.-.
++00000000: 020a 0108 0100 2430 2470 6173 7300 2e2f  ......\$0\$pass../
++00000010: 7669 7274 0000 002d 002d 002d 002d 0031  virt...-.-.-.-.1
++00000020: 3031 3637 3331 3335 3800 2d00            016731358.-.
+ END_OF_TEST_RESULTS
+ 
+ 
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index bc9296dfff09..93185c1f97bb 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,6 +1,4 @@
 AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff80a53d7b3e0c1af03db84faa2a19a6b7076ba129a00db47a0513e412e66a853b27c4e389622799843d2b0ab8a37e2fbe314d3 SHA512 18894abf35e3e750282d8563e5fac8f8ea2306ced81909a8aca6a55f3a8075c4e13c69706814c257b486a32fa4b5f02ae3696cd04d468e0d2838b7ff74228a94
-DIST glib-networking-2.50.0.tar.xz 435380 BLAKE2B 02eea0692cf20c9b1df8efc7e65eb144675fa307851450d461a73df6ccd55cb2ad4e8db5790ca8b0a38a14e30391e583dada30e858154e7c5b7fa0970658410a SHA512 a1e9d28a546f83d461057f088ca2467a32be110f444c8ede1cbfeb20244637d8d5fb5b5b0ee4485feb517beebc3536671442bbfdd3ba01663b52e6da138bd7fe
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
-EBUILD glib-networking-2.50.0.ebuild 2298 BLAKE2B 0426bb0f2248be977e20c1f3f95df7283e56c08969f4f2ffe6b20dfa34b91bbe3d37200574f9e708803a4f8eeae450ce4a3ef2ec7028ac0ba76791225c755292 SHA512 9e84588bde50d6b13f36ffc0e0e906639eb38bcd4c0282fe531a42adffaca7a199b678f59878f443058a4b9489cd31eccab7a153f421d61f350433eaa58b7993
-EBUILD glib-networking-2.58.0.ebuild 1955 BLAKE2B b95b1357c7425694cba80908a5e30af8bed7ab7cceb68cbaa3efbfa2943da9bb8917891381e5e0016d662865ef2cd13ec5b669ccf96b1bd0212d53725112e085 SHA512 52cf4c6a7797690b5a2274156a1cb9fb2e7383240e1261bfbd75a521d79b0f10e0f9ed3c3c8b9792d1b2880ab8bde845e372343f976c102decca962a00d13bb3
+EBUILD glib-networking-2.58.0.ebuild 1952 BLAKE2B 3a801454107b9250a12912ecd5c82ff134558f853cd2a63081c449a5cb7fe47dcc475fb34ef10830bff4d4a0c5afde5753c894420a10b93ca1fd96eb999bbede SHA512 b0d2a0c4d7f654c955a6aa6f7979b6d81cc32217dd4a1f2dc6129cbe114a65e52c48ed7c068145f0d2ee2e8d6de072d869bac9c1b562b0d877ed2132e5fa0652
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.50.0.ebuild b/net-libs/glib-networking/glib-networking-2.50.0.ebuild
deleted file mode 100644
index fcf20f749d31..000000000000
--- a/net-libs/glib-networking/glib-networking-2.50.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="+gnome +libproxy smartcard +ssl test"
-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-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	smartcard? (
-		>=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-3:=[pkcs11,${MULTILIB_USEDEP}] )
-	ssl? (
-		app-misc/ca-certificates
-		>=net-libs/gnutls-3:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.4
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus[X] )
-"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-src_prepare() {
-	default
-	# Disable SSLv3 requiring fallback test, which fails with net-libs/gnutls[-sslv3], bug 595952
-	# https://bugzilla.gnome.org/show_bug.cgi?id=782853
-	sed -i -e '/\/tls\/connection\/fallback\/SSL/d' "${S}"/tls/tests/connection.c || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		$(use_with gnome gnome-proxy) \
-		$(use_with libproxy) \
-		$(use_with smartcard pkcs11) \
-		$(use_with ssl gnutls)
-}
-
-multilib_src_test() {
-	# XXX: non-native tests fail if glib-networking is already installed.
-	# have no idea what's wrong. would appreciate some help.
-	multilib_is_native_abi || return 0
-
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
index 99544bf7f56e..3c2e24b0db5d 100644
--- a/net-libs/glib-networking/glib-networking-2.58.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index e6ce019ebf72..657893523764 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,13 +1,3 @@
-AUX gnutls-3.5.19-idn2.patch 1569 BLAKE2B a6b309be79e09bd873f3ad305a4517c675f127bb54df6d9dd22854b8a8591a1551b3163bfb8596296b323a9a15008d5676ed132e1eaf36e59c6267c81f2552e9 SHA512 b39a091b55413b1be9042b898eaf37c57d6cc3485bcab25169b68b1c19f249b2489609afc5fe08f7103800687c01b1580124dd6433013ca9f89e5a5e47c4cd3e
-AUX gnutls-3.6.5-build.patch 1039 BLAKE2B 68db1ec474c173086b3beac504aa5cb6966c963e18cc8a2afbb3ba1b9399ddf405f2afa52124049edacab4a2244f00d4dbdb5028257dcfd69ccb37ae6d8455f6 SHA512 718e2d811251396facc5be449bd1390c305202c554ddd74498224c988a8f4f2d6141664be2504f833a598aae505198ad6a3c4cf5ace89739638488198d43818d
-AUX gnutls-3.6.5-libressl.patch 1844 BLAKE2B b86f019f07cad8369a57cc829d45098be27feaef9898e0029ce3e953653ef0cb65b3b03c995fbd61eb5a2553044a08091a4a0cc0483ce2399bb5f94ab4c625cc SHA512 7a5831992a46c8a894ee4fa29c290fdb010407a749065c7dda1e67a1d2dda0940c03400f3fcb3c74dbea54835fa805575c749b43fcfd3121557ddd0bab95d142
-DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
-DIST gnutls-3.6.5.tar.xz 8192888 BLAKE2B 1d305d49c461657b921a51e6c3577e8aea76ba2a4ecbb0ba165ca1f452560b691f12733e3b3ef6d1206096a7393a6fdd05bedb5d5653c7e18e14c5c2f5993de2 SHA512 127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce
-DIST gnutls-3.6.6.tar.xz 8257612 BLAKE2B 1b201eedcad7e4424cc6f53d21de5c8105fdea3f0bbc2ea1eceac6fed20a45ad8009fc0f4d9bd7c3e8e3a4cd261d6c32a180a273b22494c4b2f1982244bd4698 SHA512 4ff34f38d7dc543bc5750d8fdfe9be84af60c66e8d41da45f6cffc11d6c6c726784fd2d471b3416604ca1f3f9efb22ff7a290d5c92c96deda38df6ae3e794cc1
 DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81ebc5eb13d9e04a01f7f32ce6189f71f05a18c90c2e57aec688750e917ee948261726acdd7752d9d7d42a9c7ac2 SHA512 ae9b8996eb9b7269d28213f0aca3a4a17890ba8d47e3dc3b8e754ab8e2b4251e9412aaaa161a8bf56167f04cc169b4cada46f55a7bde92b955eb36cd717a99f3
-EBUILD gnutls-3.5.19-r1.ebuild 4076 BLAKE2B fc87e54e6220a9cd053aa99da22d0ea9510c2c08b09b6034d31a13e3629d091d454b23123b0b07bd8e2151f5b8748e2f611fb7a9db6a5e24753c8d8068a8208c SHA512 9631e193f752dcb8bcef414cea69672f09c3b1abc505fb27182c61808ad71f8a448555670fb12196b1781539fa5be05814aa8bdc5ede1d0981f31a0f30cda23c
-EBUILD gnutls-3.5.19.ebuild 4145 BLAKE2B 4da053f06d49a5e1e109cbb5691e51c7fe6c012a46bd68d7da329fbf5ce15080229013da2afe8d4f53ba91fb67fc511b64e71156dcb0282e03b09eae183d3811 SHA512 4856b74e9bcf1716c2202c94e075dbb2ac3f9077bd0d083dbd3a17f44d79a93e206de19b0f584b4bcc5f9436ab44cd6e88e2d828487edaa102fb2911905d3ff7
-EBUILD gnutls-3.6.5.ebuild 4178 BLAKE2B 5c96edf0869162b0c675b567827269e424fd7e6c32f2a15ec59cbcb2632eb830dfefc1445f0a64d5ae5e2ee6ffb79d43a5bb57b8ecc3de295bc732f6da6aaf09 SHA512 19f72f1e92ff14263397ef949065f4d536457e1b8a760cf7b736368d22cc1791ed9ffa4e8b4525efe0f84887905cc405b7d9e023c2b13324c7b680594e944fb1
-EBUILD gnutls-3.6.6.ebuild 4108 BLAKE2B b4501e92642faa08de2b35bc109601d3f6d170f80e0e54713cf0c4824d150f396e5881c12b40b12add1235d88c36f61ad421391478631eb89823a5bdde0c7370 SHA512 c54db18e14381188a2c83a1702108837bca6000a6cb1236dde5973f8be34bc5c3056233d0e6075e389fd9a694fe00a252bd7193dfebd6839ef316a7fb03c386d
-EBUILD gnutls-3.6.7.ebuild 3907 BLAKE2B 2dbce39fbfca85220f4adbbe2e462d9479aff2f427b7707a45785ed0c62072e9179d534764631a9d29569b630c8cfbc6a151b377e0b6ac578913e13c2c893275 SHA512 2e3f014cd62d08b0861d2f85271ed1029122c21fbaa938f41e7ffdb6a1607fafdb151ddbfb6981267db185ba1a0f8eeadfc778b3db8764f85cff1fc0de518436
-MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
+EBUILD gnutls-3.6.7.ebuild 3900 BLAKE2B 4c6eb444795f80a43e6e55be51129fabaf1dfc6596d089d7e45789ab8dcc6d3c6e521f22f96b2c6c478dba5e5b52ecdd6b4c5f68d96514d21307be56451c3b17 SHA512 6b08e474c649e168cb3ab05d4f36bfc18716eb57302a42346f5c937c1ba1b87292ada6b410e55755d47845da35f7330cd9fc8cbf34a36e958d894a644dbf29b2
+MISC metadata.xml 1194 BLAKE2B 2f5c69b9b4ed31a5bf470451931963cac503fa11a8d3d575279d2b8002ed5b7d5bfdb4ca2f141b1f2d7c8f802d2d51ea9de0875d4f9dcdd7febcef200cb8a932 SHA512 fefa4338d539e248747ef69447b20b7d5b70fd814bd9daee6a659f09888c7ff90dfa6bfa1d8778383cf14fbd3b0bd919bdccac2f5adc9b2d2decb00211325b0d
diff --git a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch b/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch
deleted file mode 100644
index 1f16302c81be..000000000000
--- a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b0dfccd2149086cf5d2db44c329664a56b126216 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sun, 6 Jan 2019 20:02:50 +0200
-Subject: [PATCH] idn2: do not use deprecated idn2_to_unicode_8z8z in
- idn2-2.1.0
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- lib/str-idna.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-https://gitlab.com/gnutls/gnutls/merge_requests/864
-
-diff --git a/lib/str-idna.c b/lib/str-idna.c
-index 3bf2db877..95ca9b769 100644
---- a/lib/str-idna.c
-+++ b/lib/str-idna.c
-@@ -145,7 +145,7 @@ int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsig
- 	return ret;
- }
- 
--#ifdef HAVE_LIBIDN2
-+#if defined(HAVE_LIBIDN2) && IDN2_VERSION_NUMBER < 0x02000000
- int _idn2_punycode_decode(
- 	size_t input_length,
- 	const char input[],
-@@ -153,7 +153,7 @@ int _idn2_punycode_decode(
- 	uint32_t output[],
- 	unsigned char case_flags[]);
- 
--static int _idn2_to_unicode_8z8z(const char *src, char **dst)
-+static int idn2_to_unicode_8z8z(const char *src, char **dst, int flags)
- {
- 	int rc, run;
- 	size_t out_len = 0;
-@@ -253,7 +253,7 @@ int gnutls_idna_reverse_map(const char *input, unsigned ilen, gnutls_datum_t *ou
- 
- #ifdef HAVE_LIBIDN2
- 	/* currently libidn2 just converts single labels, thus a wrapper function */
--	rc = _idn2_to_unicode_8z8z((char*)istr.data, &u8);
-+	rc = idn2_to_unicode_8z8z((char*)istr.data, &u8, 0);
- 	if (rc != IDN2_OK) {
- 		gnutls_assert();
- 		_gnutls_debug_log("unable to convert ACE name '%s' to UTF-8 format: %s\n", istr.data, idn2_strerror(rc));
--- 
-2.19.2
-
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-build.patch b/net-libs/gnutls/files/gnutls-3.6.5-build.patch
deleted file mode 100644
index 00c11da4ae7c..000000000000
--- a/net-libs/gnutls/files/gnutls-3.6.5-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b7fdb4125e4eebc5af2155b6d36cf17339a3abf5 Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Tue, 25 Dec 2018 14:44:11 +0300
-Subject: [PATCH] tests: cipher-openssl-compat: don't call
- EVP_CIPHER_CTX_init()
-
-There is no need to call EVP_CIPHER_CTX_init() after
-EVP_CIPHER_CTX_new().
-
-Fixes #658
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
- tests/slow/cipher-openssl-compat.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c
-index a4cb3522d..64adf25a4 100644
---- a/tests/slow/cipher-openssl-compat.c
-+++ b/tests/slow/cipher-openssl-compat.c
-@@ -106,7 +106,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher,
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
- 		if (gcipher == GNUTLS_CIPHER_AES_128_CCM
- 		    || gcipher == GNUTLS_CIPHER_AES_256_CCM) {
--			assert(EVP_CIPHER_CTX_init(ctx)==1);
- 			assert(EVP_CipherInit_ex(ctx, evp_cipher, 0, 0, 0, 0) >
- 			       0);
- 
--- 
-2.19.2
-
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch b/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch
deleted file mode 100644
index 16cac8c13b98..000000000000
--- a/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From bfd036b31f2a47ae40e104b2ea1a0e095900cf52 Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Tue, 25 Dec 2018 14:43:56 +0300
-Subject: [PATCH] tests: cipher-openssl-compat: don't fail if OpenSSL doesn't
- provide cipher
-
-LibreSSL does not provide ChaCha20-Poly1305 through EVP_CIPHER
-interface, so let's skip the test if cipher is not available.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
- tests/slow/cipher-openssl-compat.c | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c
-index c9b39d026..a4cb3522d 100644
---- a/tests/slow/cipher-openssl-compat.c
-+++ b/tests/slow/cipher-openssl-compat.c
-@@ -38,6 +38,19 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher,
- 
- 	success("cipher: %s\n", ocipher);
- 
-+	/* decrypt with openssl */
-+	evp_cipher = EVP_get_cipherbyname(ocipher);
-+	if (!evp_cipher) {
-+		/* XXX: fix version check later when LibreSSL fixes support for aes-ccm and chacha20-poly1305 */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+		fprintf(stderr, "EVP_get_cipherbyname failed for %s\n", ocipher);
-+		return -1;
-+#else
-+		/* OpenSSL should always work! */
-+		fail("EVP_get_cipherbyname failed for %s\n", ocipher);
-+#endif
-+	}
-+
- 	for (i = 0; i < 32; i++) {	/* try with multiple keys and nonces */
- 		assert(gnutls_rnd
- 		       (GNUTLS_RND_NONCE, orig_plain_data,
-@@ -88,11 +101,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher,
- 
- 		gnutls_aead_cipher_deinit(hd);
- 
--		/* decrypt with openssl */
--		evp_cipher = EVP_get_cipherbyname(ocipher);
--		if (!evp_cipher)
--			fail("EVP_get_cipherbyname failed for %s\n", ocipher);
--
- 		ctx = EVP_CIPHER_CTX_new();
- 
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
--- 
-2.19.2
-
diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
deleted file mode 100644
index 5917ea116d35..000000000000
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
-
-REQUIRED_USE="
-	test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen:= )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		app-misc/datefudge
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-PATCHES=(
-	"${FILESDIR}/${P}-idn2.patch"
-)
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	ECONF_SOURCE=${S} econf \
-		$(multilib_native_enable manpages) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(multilib_native_use_enable tools) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable nls) \
-		$(use_enable openpgp openpgp-authentication) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_with idn libidn2) \
-		$(use_with idn) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--disable-rpath \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		--without-included-libtasn1 \
-		"${libconf[@]}" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.5.19.ebuild b/net-libs/gnutls/gnutls-3.5.19.ebuild
deleted file mode 100644
index cb1358dae232..000000000000
--- a/net-libs/gnutls/gnutls-3.5.19.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/30" # libgnutls.so number
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
-
-REQUIRED_USE="
-	test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8:=[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)
-	test-full? (
-		guile? ( >=dev-scheme/guile-2 )
-		app-crypt/dieharder
-		app-misc/datefudge
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-PATCHES=(
-	"${FILESDIR}/${P}-idn2.patch"
-)
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# remove magic of library detection
-	# bug#438222
-	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	ECONF_SOURCE=${S} econf \
-		$(multilib_native_enable manpages) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(multilib_native_use_enable tools) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable nls) \
-		$(use_enable openpgp openpgp-authentication) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_with idn libidn2) \
-		$(use_with idn) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		--without-included-libtasn1 \
-		"${libconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.6.5.ebuild b/net-libs/gnutls/gnutls-3.6.5.ebuild
deleted file mode 100644
index 9d141a5165c5..000000000000
--- a/net-libs/gnutls/gnutls-3.6.5.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
-
-REQUIRED_USE="
-	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen:= )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# detect also guile-2.2, bug#673574
-	# aclocal/autoreconf will require more dependencies
-	# that we want to have
-	sed -i 's/\(_guile_versions_to_search="\)\(.*\)\("\)/\1\2 2.2\3/' configure || die
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	ECONF_SOURCE=${S} econf \
-		$(multilib_native_enable manpages) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(multilib_native_use_enable tools) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable nls) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_with idn) \
-		$(use_with pkcs11 p11-kit) \
-		--disable-rpath \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		--without-included-libtasn1 \
-		"${libconf[@]}" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.6.6.ebuild b/net-libs/gnutls/gnutls-3.6.6.ebuild
deleted file mode 100644
index 727e95bff15c..000000000000
--- a/net-libs/gnutls/gnutls-3.6.6.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
-
-REQUIRED_USE="
-	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen:= )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# detect also guile-2.2, bug#676402
-	# aclocal/autoreconf will require more dependencies
-	# that we want to have
-	sed -i 's/_guile_required_version=2.2$/_guile_required_version=2.0/' configure || die
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	ECONF_SOURCE=${S} econf \
-		$(multilib_native_enable manpages) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(multilib_native_use_enable tools) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable nls) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_with idn) \
-		$(use_with pkcs11 p11-kit) \
-		--disable-rpath \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		--without-included-libtasn1 \
-		"${libconf[@]}" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.6.7.ebuild b/net-libs/gnutls/gnutls-3.6.7.ebuild
index a4545942986d..270c34f25223 100644
--- a/net-libs/gnutls/gnutls-3.6.7.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 85804ccbea44..d90b1d71c770 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -10,9 +10,6 @@
       Build libgnutls-dane, implementing DNS-based Authentication of
       Named Entities. Requires <pkg>net-dns/unbound</pkg>
     </flag>
-    <flag name="openpgp">
-      Enable openpgp support
-    </flag>
     <flag name="openssl">
       Build openssl compatibility libraries
     </flag>
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 2c68bd9c8da0..53de6f5ba097 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -25,11 +25,11 @@ DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f7
 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 4257 BLAKE2B e88648e02078ed041a513893673699dbc6f69ef2f6a1c1d5be4f794576ffbb386c081ddbf2a184db082561b3a2b6b5f6c11d38aa470c166657aa4b601c9de8ee SHA512 dad67ee4714ff90844524a28a989b2bff3a1501c25bf2b2ac272430beb2749aaf0f901824f833e754004e319a55cfa066159a291b5d9d9493dfa7d0b9975e19e
-EBUILD grpc-1.13.0-r1.ebuild 4366 BLAKE2B 7c2638c2c350bc552ccb75da9b4ea08f520a548ca2cf7f4211d69b81ff9889e09622e726ab98ad0125943dee058bfe26415d85ef43f4fd8b26eceeb12fd283f4 SHA512 be7df5c35761c12472856bb244cd4f5838d1e0e176e2db53ba867c2a1d64ec8f6019b0f9e4c5394b9efd5c556f299587ababa34333d1c5675d34a830274feced
-EBUILD grpc-1.13.1.ebuild 4379 BLAKE2B f3bd95162997f25317d26beb9b37d73b126c25f0b004cc687e05bc40635a43545ed4d7c11a657028a0e0b6b89b9d066b6f297373cf9445f071beb813ca76b2fa SHA512 33a782024f2e2299cb07647f9baf9188d7b7f53d8875ad86ce59224e74e10761dc58e1bc1e2f6da1fc35a2d8a1fee0581686a3be8d6c757b3e58104c3598d9df
-EBUILD grpc-1.14.2.ebuild 4482 BLAKE2B 527731a7613488f4fd344d8d3dc4d072dc86105ff8f8c98598b9ea91a4e488010180f150b61e8ec5bb253be3b6660ab7da8f3c16e099279c17b44900ef67eb25 SHA512 9add91a48299c56be331aa6a20e456a364b27cb4d79c21b0f3fe89ae8c72bab26ea96584cbcaf6a0aac31d5991ce3f51e243800312d15375687103a234187ad2
-EBUILD grpc-1.15.0.ebuild 4477 BLAKE2B 924634776e7258bf0d1e407bf3f98edb0af932c33a7e9ceba65f39bac58990c64951fce51208363ba4ee5d6f76a3d8102ba7d84c238d7312c04b577de3bdb451 SHA512 142a6d60aa75fecfe27195bd222dce80e40dbcb57b3e868b38619df923f6cc968e296d520f6f60e76443d0e60f0c2868fd55ab04da2ac5579287973b4f2b4e38
+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
diff --git a/net-libs/grpc/grpc-1.12.1-r1.ebuild b/net-libs/grpc/grpc-1.12.1-r1.ebuild
index e5ea7b0998a7..7f3ee9f18a82 100644
--- a/net-libs/grpc/grpc-1.12.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.12.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/net-libs/grpc/grpc-1.13.0-r1.ebuild b/net-libs/grpc/grpc-1.13.0-r1.ebuild
index d04a6152ea2a..138531249bfc 100644
--- a/net-libs/grpc/grpc-1.13.0-r1.ebuild
+++ b/net-libs/grpc/grpc-1.13.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/net-libs/grpc/grpc-1.13.1.ebuild b/net-libs/grpc/grpc-1.13.1.ebuild
index c754e09e6eba..e4d1903e6797 100644
--- a/net-libs/grpc/grpc-1.13.1.ebuild
+++ b/net-libs/grpc/grpc-1.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/net-libs/grpc/grpc-1.14.2.ebuild b/net-libs/grpc/grpc-1.14.2.ebuild
index 8c453555b084..b88634bc3de7 100644
--- a/net-libs/grpc/grpc-1.14.2.ebuild
+++ b/net-libs/grpc/grpc-1.14.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/net-libs/grpc/grpc-1.15.0.ebuild b/net-libs/grpc/grpc-1.15.0.ebuild
index 9aa1447c2c75..9a98d75031c2 100644
--- a/net-libs/grpc/grpc-1.15.0.ebuild
+++ b/net-libs/grpc/grpc-1.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index b0cddeb2e86c..9f60db809499 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -3,9 +3,9 @@ AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6
 AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
 AUX gsoap-2.8.70-xlocale_h.patch 660 BLAKE2B afe47e3394b7417defc0cf38a08f1d0c44dbbe445f6042ea361011d97af3b321681912e3cecff574e218804aaf954239ef8eccb6a8dfd2e6d50c14afa4d70e2f SHA512 c86e465752a90519317d61399f09925d5dfaa6ce11651e5013d63ceb49a92aa3728c880d6d57c50e830b1fcabf359cbc18f1b78c0fc2168d98acfb73c89bf57f
 DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
-DIST gsoap_2.8.80.zip 32686918 BLAKE2B 63a49b09696be0eb7318233bc3df1f44b118a238a206cf25a47bfbdb1d60ad08cc0eb5c24c6d0952e72bfcc850d3780c56e09153a935450aec3c543c9ef2dc79 SHA512 7018f9904d6b3cd5f0d6dacdd03e399fa01df450ec37a4fd29988657b639b86027da62ffc8b03b79a05547e80250fb974b56784fb57e4583899bc8c1958aa8e1
 DIST gsoap_2.8.82.zip 32514214 BLAKE2B 4945fc9e8c6fcbf364235c31aaf5eff5546b4f927a69cc973ba9e855a97ba2e40af2823448c2ea7d371aafea3ea6f6a71cc2d0527049fea53a2d6e1bbeecceec SHA512 daf6a1870fe43beb20d0faf646b171c92629885708baabea5bbce79fa5a8030f014dbe5c0bf4024031df993dd3ed3a90449db813946cfdfa9c12318096b57eec
+DIST gsoap_2.8.83.zip 32703770 BLAKE2B 1750a25bcd38c020c83d644395e9b3ac3e0c1080fb82f26b11ea0d0beea98c7dc8f3f24a77e093c6ac7e3598d416430990105eeb93e565809844825e1e937ec1 SHA512 7f4ae6feea26ec2d0e970e77cf476a0049c2e3fe47feba4e3b3b57239e7ae0016c409a74d3e865e56d2c01a8098be282d74a33c686d177d203cb8c2dff6bc407
 EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
-EBUILD gsoap-2.8.80.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 EBUILD gsoap-2.8.82.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
+EBUILD gsoap-2.8.83.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/gsoap-2.8.80.ebuild b/net-libs/gsoap/gsoap-2.8.83.ebuild
index a36f6c5466c9..a36f6c5466c9 100644
--- a/net-libs/gsoap/gsoap-2.8.80.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.83.ebuild
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 1ec7c7951553..d4f760fffcb4 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,5 +1,3 @@
-DIST gssdp-1.0.2.tar.xz 312352 BLAKE2B 0712ce4e698fb9a455bf217863aecf4e4e87654d9b78a4e0e9c2f618a8bd9c62dd3c85ab7bd4c4400a8a658b2743bbe3a6b0d454f1b7c4a3383c893bc5ae2e7c SHA512 eac1d3db495d0433c27ad84c33c23a25b3ebdf5c85bb2d5f5b2198c00aae484f2128c22838534b9b4bf4c9787795241acafe30d00407912bdb9945422cbdc103
 DIST gssdp-1.0.3.tar.xz 316740 BLAKE2B 50293e653ec5596a986770f3ea81a244b8f9772e9d0c13df0e48f00ee34445c2fc7250702d7928e7dba081715e6d4e379d7a899905c35da84915e6b4058a3307 SHA512 ef72335c3f796aff0d3dce1781d5a0b015508f614d4a73699ebce411b0593419b40c09839ffb62e50cf9d77e16ec0e31d0e23f92d35abb4d105dea47c00a0506
-EBUILD gssdp-1.0.2.ebuild 1430 BLAKE2B 5fc2822d44a31e045e0d7f452613301b9e0058946ab10d21458f384a65645b109337d498c86b52125d84e3af2cb78e36a0eba510b8f4eb12c7555034cffb210c SHA512 0cfade0dba0442915247ff4474e5518edd214158148474b8726d60aef3d1bf66553881c93c9c51f1eda5bd46a1a7a748e0509be8d5faf394496255a05ecac20e
-EBUILD gssdp-1.0.3.ebuild 1431 BLAKE2B 5d25a88c62791304f4a1567dda7cb029813c326845f974b10b4e57e6944f3cbfd4e6687f13563a17576767ae7d1888b90b1b12e3264ffdec7a7451586609688d SHA512 a2972cf95ffd9976a81083a6c5b28f24ad766e707472cbec7d8f0d359986c7d0fe1c4871f1a1054e7e02db3e23cec0d2b8e505c54f01c59789b77469fa66366e
+EBUILD gssdp-1.0.3.ebuild 1427 BLAKE2B 3c8f417547f52a3d3e924e1f0d73fa6606c8edd11af669cefb0f442efb76ea9dc5aaf2e805e3196ba90bf62da04fb4a6f3272842911bbcb473c7819e1d1303ca SHA512 c13194ce03a1159d6e39b16387dd2a17d843979b33ff264ef25978cb09b2392e70cfcfd86ac935d8309b3b2a8278507d8255206f26b04e304a20c3ccb688fcd1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gssdp/gssdp-1.0.2.ebuild b/net-libs/gssdp/gssdp-1.0.2.ebuild
deleted file mode 100644
index 1e4733766a17..000000000000
--- a/net-libs/gssdp/gssdp-1.0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multilib-minimal vala
-
-DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="+introspection gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.44.2:2.4[${MULTILIB_USEDEP},introspection?]
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	introspection? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-1.36:= )
-	!<net-libs/gupnp-vala-0.10.3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	# Disable functional test as it requires port that might be used by rygel to
-	# be free of use
-	sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
-		-i "${S}"/tests/Makefile.in || die
-
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_with gtk) \
-		--disable-static
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/net-libs/gssdp/gssdp-1.0.3.ebuild b/net-libs/gssdp/gssdp-1.0.3.ebuild
index 1a709e46cf25..fd37730761b2 100644
--- a/net-libs/gssdp/gssdp-1.0.3.ebuild
+++ b/net-libs/gssdp/gssdp-1.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+introspection gtk"
 
 RDEPEND="
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index bab14638fe32..31c8e46dd0a5 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,6 +1,6 @@
 DIST gtk-vnc-0.8.0.tar.xz 448984 BLAKE2B e9de98a969297832ff6eaba79707a44494b20d944264ac6902596f882b95e8ab1bc6b7eb25e040d17f939d678a81eec730f983942db38d73c81751fc2afd45df SHA512 9b66e4028e56b01af8d0ded5b833fc6c0ba752ac72cd664293b0009868bbec0bc8750b619ece9786eddc06155e390ecccc4c5bc84717c49ac4bd866e6febd8e3
 DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b70459afd8bf92630d69cf32d380264814304a68a93d8a5a70d6573b6754658450005a2ea2b96f13ae03f9e87fcba SHA512 498b368eb53ac58172db280c80f9da71ce82b636c39f186046e4f674e44c574ff4b63c3f777acc79d32c17d70e4efcdc207768ed49b3d1842bc4b73618296215
-EBUILD gtk-vnc-0.8.0-r1.ebuild 1701 BLAKE2B 9e04a4d20d36bf14f9494cd84dcfeb841a0b3e5e911d2f610db87e63527fa078a0d0f4ee8369179d2b5641315bd23fd4626c17719a10a3d6ae9014b49e27a2b4 SHA512 45e50f0fac67504a6f573b38f1f40a791b60e14a01bd010e66fd6ef3dea3b1acdc49b0c866df2e44e95cfb4e1ad0f200672c33783b93f6186fc0193fc0b07ed1
-EBUILD gtk-vnc-0.8.0.ebuild 1668 BLAKE2B 2e86531f529ae179dc07cf1a4b71975422fe3abcc06ef3acabeda89fc287d77b73df1ebc238509c806a3d4da62fbc51854622e28532e64d86452ab94af7a2cb0 SHA512 b618a30a9c9503787a819e113457f33978ec85d90e21c7fc41df55fa20c9db88cc64047ca487156e5c353880c5be86bbe92d06d80b87e9d4c5a1a11a928c25c6
+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
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
index 0a28696fd004..61f919fcbe1b 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
index 75ca0f822fbb..f914952ea646 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
 
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index 5cd014fc824e..1081991d69c5 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,5 +1,3 @@
-DIST gupnp-av-0.12.10.tar.xz 370552 BLAKE2B 0ccbbbbf88ba48e926634efcf550924b77a8fec1a1e660dc4f6aabdeba12db87c7e2dd4ca6875e34ae313e90cb9ee715c7176f29d6456a68799b68fdcab763a0 SHA512 dbecef1f725dd05e1d4f7f9dede02f26a022d8d3c98ed2344d28746b74fb81703026df8cdd7ed0f3060b55a5da6d88def1e92a80e1f1892ad7c0806124ef5269
 DIST gupnp-av-0.12.11.tar.xz 373052 BLAKE2B 3c324f790f0ffbcbd6cbf3b95dfdaf9dce51c6bf7bea3051fd5ded31b930dd6ff7b77b16a297cf54a49e738c195fd208dd4e83961f5ee3d302dc84f37b36924c SHA512 f6fb8897ccdb589446d8c83c5fe66918f0f569a624287881aaf41d928e429e41f3306443e24ef4d43d3ddffb24da2ad2c058cd39211176558c9cd7acd7af0ff7
-EBUILD gupnp-av-0.12.10.ebuild 884 BLAKE2B 947b39a8e30f1f4adecf6d37f68d12d6db9b862470370fe0dae8f845e24e1966a60eef1c2309fe70d8417c250cf7543da6e9d2434c7375305eb5577614ad48d3 SHA512 3af4660bcf16c591283bbdacd5e99ef67b1c58b52a9eaafad415c779eea1d31ffc7115712e8913ab48071c3ef6b37679a5e01151692521e749b221eb2af8fe48
-EBUILD gupnp-av-0.12.11.ebuild 883 BLAKE2B b04a5eb73e63f0a58c7baa729cb0304705876498926d7020ac0f7a7434c9b1b19ffc877d16ac9485dd95d4adadb2957ce939f16c880a4b15e86de2747cd0435e SHA512 ed2281ef701ca32ee9a7e2286be472ece67ad815d5f6439b7031153caa6eb9b443d44175edf025df6bb883725f021a1675bdbd66c304f94971f08fc6454bf87f
+EBUILD gupnp-av-0.12.11.ebuild 881 BLAKE2B 626f2d855f4b980946a971217c1b5af6896abf4dc4144eaa82f25c411892c49169a762b91589c3a37ebe8944b6d8e0040aea6367ed15d3d55d1505e46ff9b126 SHA512 ce696ef103ec85ffe33384ce66d191c4d3d543463b232739db6079302b95988bb7ff2298a063248291ec284210049f57fa7a89c29f060f94a07d1b3478c1d654
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.10.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.10.ebuild
deleted file mode 100644
index 0f2fc3c91fad..000000000000
--- a/net-libs/gupnp-av/gupnp-av-0.12.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/2" # subslot: soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=net-libs/libsoup-2.28.2:2.4[introspection?]
-	dev-libs/libxml2
-	introspection? ( >=dev-libs/gobject-introspection-1.36:= )
-	!net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild
index 62aeb5dc34d2..5711803797ed 100644
--- a/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild
+++ b/net-libs/gupnp-av/gupnp-av-0.12.11.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/2" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 621786cd4fac..94c54b2ae3de 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,3 @@
 DIST gupnp-1.0.3.tar.xz 422912 BLAKE2B 900a2a81982a50239b26ddd5df3f57caac1ee66103e857b9014db7dc694e303c1eaa0633cb467887f3370e97058abc221bd0175c9df11ca4af31e3f802145a66 SHA512 f256757ddf1a31f1dc93dc138401329e40aa063e7452dccaabe53682eebcb1b98cb6429c01d806290587ca9d01d91afce0603627d2d8675ddb68ef919efb6448
-EBUILD gupnp-1.0.3.ebuild 1953 BLAKE2B 25d9856c4fca99e56777ccdded0e21c37a0a98f8a338806da4ee2d9e2de76e3371a12599899eca20b9a586246868274ead71c4f208d46541e284ec3ef66cb0ca SHA512 899fff5cafa4f03f1c410d69a1b71f65ef25e02c914622772b0794a48115a34d399a7ef5ae7b0f77ff9a102b39a140ca348976fd6ba9b5c8ec21c7607b414b7f
+EBUILD gupnp-1.0.3.ebuild 1949 BLAKE2B ce58a03211d074f71cf7464f566bb4ab462a5b0618eb34c03a86dc96fc2a19f0bd1a4eeb6ce8bec0a5f2f17aef1fe99a71b16de1f5324c1e20de0069d18c45b0 SHA512 74a323364230323db1c7a5f8533744c793523a0831d03530b77f33ab1b7b439228b4851370c2290e3501118a5dc1f92d6a237765f0b267a713c1a8a4bce4001c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.3.ebuild b/net-libs/gupnp/gupnp-1.0.3.ebuild
index 0a5d8ef45c6e..7da3070c8835 100644
--- a/net-libs/gupnp/gupnp-1.0.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 multilib-minimal python-single-r1 vala
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index a03c595980d7..f42ffcf82f2e 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -1,6 +1,8 @@
 DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
-DIST http-parser-2.9.0.tar.gz 51324 BLAKE2B 5607f3b3da087ba7d7352e896e209a4fd118428f526cf5465fe86253cc01779c79c867f5db6467df8e3b7bad2ca8675050ef9ed1877a945ced8d3fdd47bfabde SHA512 40acecbf71b9f0b4ae857c74c3ec0784d7f341a0cb83cf82b308387d0c5b56d38b282241aaf8ca93816970f2a9e67989f3d9d456459f3986c29fe51ab520155e
+DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691faef9cc6be3fb99426a3c1e3f24ae50689dfd8e46fa52a22d713780476130ee6fae6294b83cc3526bb5131cf16b98f2 SHA512 110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052
+DIST http-parser-2.9.2.tar.gz 51298 BLAKE2B 5d37ea197acbac468de03081010fb3b755a093085e56c9fa5a3d4dbd70dd2903335a8113ec21664ca54a74aac4cbbb1cc64b861d021df944790453c2de9baaab SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
 EBUILD http-parser-2.8.1.ebuild 1010 BLAKE2B 41fd9e9bc96b39e583f49ec1c01befc7a0b68af0ae21dfff5523c5a8e54bd141fb7b470e47c7ef7c5ab9eda7a19ec64ce290371307c974e753c5477daa70330f SHA512 e1690bdcb1a2b1bc9f1e255e8d494d0e53f46937f89abf24a8106e1194961213f2f2d72370e81be29e3d1a8568df143c9a7fd80967a5d4df3975ba724e89bd56
-EBUILD http-parser-2.9.0-r1.ebuild 988 BLAKE2B d9bc9eb32473fdb043c382ba95dc52a91ee6b9e2d50cd9051922647fc38d877418df96bfaa8c5ee1dfc47c235b752ff8ad2a343f424b5e7221aa1924f652024c SHA512 75d669298b05089742760207ce4ef40ebf8a0b55ae2fefedfc5e50257ad88b80db2eecb99f3e84be57113503e27f53a0a4933c881989b760ba5d44b5de19a58a
+EBUILD http-parser-2.9.1.ebuild 988 BLAKE2B 22e14115cbd3f6bf6ba95751ac1f5bc891823b18b9c19c024458a964f2beade70b5c2a8591461f82de19fc336f604b94f8f1fe819ce8af8454d5f960a1dba624 SHA512 c37817c6f5c2eadfa559616c9c2ff4115ff84cf0bb5fd575c119b57833516885de0cb8d6ed20b522aaccd2ab122e0314231ed0591632ecf1212c3fb52eb8fe4c
+EBUILD http-parser-2.9.2.ebuild 988 BLAKE2B 22e14115cbd3f6bf6ba95751ac1f5bc891823b18b9c19c024458a964f2beade70b5c2a8591461f82de19fc336f604b94f8f1fe819ce8af8454d5f960a1dba624 SHA512 c37817c6f5c2eadfa559616c9c2ff4115ff84cf0bb5fd575c119b57833516885de0cb8d6ed20b522aaccd2ab122e0314231ed0591632ecf1212c3fb52eb8fe4c
 EBUILD http-parser-99999.ebuild 848 BLAKE2B a34ef61acb4072b1b51e13f4381fc6076b8b5e2693a281d1d41a0a15455ec29532aa7c69e474ecaad23b2230ff0d9894d02302e6940148ae19dafc080b508761 SHA512 b74380f265418b2956102b0d56c34ebbe8a439eb81dfd75f91b80eb266094d19940f29af59d50c894f832499af6aca11710ba14631b6111f5a9ea2c4ff4d1735
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.9.0-r1.ebuild b/net-libs/http-parser/http-parser-2.9.1.ebuild
index 0d1ea38cc555..2abe7cff69f8 100644
--- a/net-libs/http-parser/http-parser-2.9.0-r1.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.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
diff --git a/net-libs/http-parser/http-parser-2.9.2.ebuild b/net-libs/http-parser/http-parser-2.9.2.ebuild
new file mode 100644
index 000000000000..2abe7cff69f8
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.9.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="HTTP request/response parser for C"
+HOMEPAGE="https://github.com/nodejs/http-parser"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2.9.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	tc-export CC AR
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
+	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
+}
+
+multilib_src_test() {
+	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	use static-libs && dolib.a libhttp_parser.a
+}
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index 415efcaa9b71..19b140b03e08 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,6 +1,6 @@
 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 1030 BLAKE2B b0c0419d01edcbf57c676580c98715697960afdfa1c2c7c66ccca711a157d98958fa27e6e20d6d400140ebbb4bb9c91d780f631f71c797a0b9d9815240486150 SHA512 36c4b424a7f0c96407ec1f98cd1467c6a926e79f44b83c93aff5a4641c58e0e9b143e08073be95b796df309b949deb59aeb34a9f65d3d7112839e0df0788d7d5
-EBUILD libesmtp-1.0.6-r3.ebuild 1090 BLAKE2B f9251bd0e7947538d93de0c8daa3a4252d23a1fe0f8bb91bded6fc68b714a23487614564f80d1446a0c2e68e3f06211ee5fab63d2ad63f0e67cb2e590db20435 SHA512 2e353aac3a3ca122389173b468b1f20be85850f6a37fceb518f1753ba46079c003f1d0675ceb72b1dc990855a5c1a1322c0826bd5ab9ebd52e42a262dca34953
+EBUILD libesmtp-1.0.6-r2.ebuild 1031 BLAKE2B 4ab3082dee4a2862e51a7007685b7bb6bb323b8f5db3ec7251be93be3fbe43840400ae34f0806377a6b7ccf8a4227bf9177abd74be0ef0cc547d8a36cefac859 SHA512 2a819f32e22f13d4de8d8a7907e7b052645d525c6715237a4e99882e3dd22be7ad47e1dbcd893412cc0826a26f6fcca78651b0ae57c28960ff6d4d12f71335d5
+EBUILD libesmtp-1.0.6-r3.ebuild 1083 BLAKE2B d302f409ba4a63252b75c2d98dfc32e0120cc9773b9e92e2bf56dc6ca68990ba1b8c4acd14e15f6dddfcb6b55b083ea6143978b457b8bdf14c64670bd2bf0233 SHA512 8bc7338cdbbebdf1f154582c0168c0b9579246424bcfca1d76e4b4eb94b8232491bb17ea34ef72fe7277274f841a81636b8ef74ce8268f6e6f05342e0630164f
 MISC metadata.xml 245 BLAKE2B 8d60530acac96088463f7357d79430c34c12384bcda5df24a93a92789a40fb34014c14fb73ea1e80f7e96f5afb8e70a4600a651b46322af25c404bea3c75e004 SHA512 8f811f556e1fb3b6c4955a0815435a2b54897133a5a545d05fc3c47a6f8ad2448fcce4644e2f7f3d5b6835fdbfccba521a49a8c11629a89ab53770d6bc620c25
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild
index f019d160ae51..1bd5ae76df71 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="debug libressl ntlm ssl static-libs threads"
 RDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}"
 
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
index c0d28b116e78..5fcc6616eaa2 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r3.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
@@ -10,13 +10,13 @@ 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"
+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:= )
+		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}"
 DOCS=( AUTHORS ChangeLog NEWS Notes README TODO )
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 3d701d30582a..ef1105eb454a 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,4 +1,4 @@
 AUX libgsasl-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
 DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
-EBUILD libgsasl-1.8.0-r1.ebuild 1313 BLAKE2B 2de2084e281c2b8053e5be5eb3062c4f0f211048e153020d5b21604f12f951619505a675fd04824bdcc452b55865e01819c9d60ae5cf3d2e758bb520c56ebe71 SHA512 0cd3e343d725f245be81b8e1782bd712819d4d1cde9a959d93c4d27d110e0bea0019c367b1ce1e7e69948a70b36c67e42eacca16e15ff267a0558133c4f30bf0
+EBUILD libgsasl-1.8.0-r1.ebuild 1312 BLAKE2B d492dff20c2ef2e05cd55473d994ef98ea9fcf3ef7b1b73cf2ce6882bcfa087ef80f2048510bab69a5ece074e7ad2c0c3f62f79983ee7d8eaa356e3d4131c759 SHA512 ec484f83c951f22a546e62f0bcea894a8779c6cfd94b56d7c65d112374b367de1930f0fb36962a79e500cd7fb949708dd2f94f4cfcfa46f72c5a0b02f79010c0
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index 68e688d81f87..76c3906bfd65 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 DEPEND="
 	gcrypt? ( dev-libs/libgcrypt:0 )
diff --git a/net-libs/libiio/Manifest b/net-libs/libiio/Manifest
index cf9c19dc2e73..a782f7e763ba 100644
--- a/net-libs/libiio/Manifest
+++ b/net-libs/libiio/Manifest
@@ -1,4 +1,4 @@
 DIST libiio-0.15.tar.gz 192704 BLAKE2B 7eeaad1535f69ca11fe3f716ac70a161f98d24513fe910cb34ca11a0b63c07f5b5321447c96c247cc9a76ed838d806fa9f160e87fd10f1aeac5025edfa16b8f6 SHA512 7e3ca1a8b97486f20baf38afecfd26c626bed1fef535d88020d11eb4e49fc1226390c6383799222f6811c13b8b7e5cc77fb899c776c150a9d1c2024bf8ab338b
-EBUILD libiio-0.15-r1.ebuild 662 BLAKE2B e59b4222302bc9a4f52e561f3c710460198ade34f65588d33fcbd55afe9536f965d96283ae244968f3d855dd6cc8bbf24107d1b1fcbd8147018919285dc0ab0e SHA512 3f669cadb91c1697387d8484206ee6733c49fc16d937c73ca0830e0bcbb629af5f1d7c4c9635e2232876df638b09f5666898fa3a5ac7e35e5eaaa63c61935158
-EBUILD libiio-9999.ebuild 662 BLAKE2B e59b4222302bc9a4f52e561f3c710460198ade34f65588d33fcbd55afe9536f965d96283ae244968f3d855dd6cc8bbf24107d1b1fcbd8147018919285dc0ab0e SHA512 3f669cadb91c1697387d8484206ee6733c49fc16d937c73ca0830e0bcbb629af5f1d7c4c9635e2232876df638b09f5666898fa3a5ac7e35e5eaaa63c61935158
+EBUILD libiio-0.15-r1.ebuild 665 BLAKE2B 06d334a64348f8d53a202856872cd96b457384c55f5ba823ddae3d199cdbbf91f649a3485ba718855b089df3ed27ce3b738664e8c42027225a6db5c301d12079 SHA512 94c5233cbf63ee675fe904e00cd1d9570678551d08c3863008ae93134ec180a08f235c62243f9694d792efec29719d297269ba6c4bb16366cf478c6b4b41bbde
+EBUILD libiio-9999.ebuild 665 BLAKE2B 06d334a64348f8d53a202856872cd96b457384c55f5ba823ddae3d199cdbbf91f649a3485ba718855b089df3ed27ce3b738664e8c42027225a6db5c301d12079 SHA512 94c5233cbf63ee675fe904e00cd1d9570678551d08c3863008ae93134ec180a08f235c62243f9694d792efec29719d297269ba6c4bb16366cf478c6b4b41bbde
 MISC metadata.xml 506 BLAKE2B a3be5b15b8043c7e52b3a3ed6a01dab5731286ba3266285426ef8c56bd1124fbf8a2b3083cad85094ff5d0ac0f06a6127ccbfcdc89502d909797deacb14aabb9 SHA512 c408630124499db22c21e2f2911fb7dd023f1e704b895c770c2510a08f7b3516cc83aa8d50a6e6aa2c0365ca7e91064a1cb664ce80e1ba153d68a381182264ba
diff --git a/net-libs/libiio/libiio-0.15-r1.ebuild b/net-libs/libiio/libiio-0.15-r1.ebuild
index 64bf1679f217..3a277614bfbe 100644
--- a/net-libs/libiio/libiio-0.15-r1.ebuild
+++ b/net-libs/libiio/libiio-0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,10 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-IUSE="+aio +avahi"
+IUSE="+aio +zeroconf"
 
 RDEPEND="dev-libs/libxml2:=
 	virtual/libusb:1=
 	aio? ( dev-libs/libaio )
-	avahi? ( net-dns/avahi )"
+	zeroconf? ( net-dns/avahi )"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libiio/libiio-9999.ebuild b/net-libs/libiio/libiio-9999.ebuild
index 64bf1679f217..3a277614bfbe 100644
--- a/net-libs/libiio/libiio-9999.ebuild
+++ b/net-libs/libiio/libiio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,10 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-IUSE="+aio +avahi"
+IUSE="+aio +zeroconf"
 
 RDEPEND="dev-libs/libxml2:=
 	virtual/libusb:1=
 	aio? ( dev-libs/libaio )
-	avahi? ( net-dns/avahi )"
+	zeroconf? ( net-dns/avahi )"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libinfinity/Manifest b/net-libs/libinfinity/Manifest
deleted file mode 100644
index d2ab50bf15a8..000000000000
--- a/net-libs/libinfinity/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX infinoted.confd 395 BLAKE2B 74c3e1867db538ada0b721621cc03691deb2e15fb987771110a689d136c9c8c9dc199ae319204e962d46b6af3055f19d1d1c19beaedf0e240e3ae6c9a0a8f03a SHA512 c2c68e2af841699c33d71acfad6efd3034f4944b25a56bc912fd117590d8e8862684ed061065ebeb0de0c18cb75a9abdeeb997cd785abca4c5278f53a51cae95
-AUX infinoted.initd 527 BLAKE2B 158aba0ab854f2aec7bb02cff127cb781491dfa0b553a5de2b39beb83eda3508c426e8703539f5229cb62749e4f1ed2fee6433570cb9f2ecdafd1b4e34858ee3 SHA512 f652f40e82746bb9592968b65c64a59dda9373671d04a17e1054d69047f5463f72f9d7f08fe3eeb0b718a3631f286d60713e48d4178ab5850f44b71905def72e
-DIST libinfinity-0.6.7.tar.gz 1989993 BLAKE2B 4b5e963dc0d20f95d5acef5056ddc6f45fdcbe1c7044911d1c529b81291854721cffd119316c153516d0a6feff29aa9a2b298f774e02c87b4ce7cf06dddf6449 SHA512 9142badee0976019937c29d9badd404d64e49031007863c254c312d999b9790fa4f2ff80ac982b709744e1bfa532b1bc331b3bf1d55aac3ac70c9cae6a7afd3b
-EBUILD libinfinity-0.6.7.ebuild 1668 BLAKE2B 1c106a2301e3a484a23668370e1f442ab3aa83f293ee855628baa523d59aa1a7ae1a02c8e37fe19f321809d9bf970e621945ea9928abee1f74aea47d8dce6ab3 SHA512 68609acd0b74fb5bbfefd428940a27b239f0d3fb49d96af82d24a722b7bc85f4fefdac2c094b26724680df197568bc87f3fa2c9916128bcfd81526ea88cfccec
-MISC metadata.xml 360 BLAKE2B 96b11f0422fe80df4ca8902684fa2fb53593eb88027099cac7d95bed9cb71f105cb34c773fa044acea17d43f526efa61f3cb8b89bc17c48f703737a4a91da55e SHA512 b8ad86dbb81a83888c29b8faa697bbea0c7806bfcc74afda474a6a009d65bd14782b243358fe50103551963bd160874875e39bfc81a308434b26b68d61e6fd69
diff --git a/net-libs/libinfinity/files/infinoted.confd b/net-libs/libinfinity/files/infinoted.confd
deleted file mode 100644
index 81e62a4d9515..000000000000
--- a/net-libs/libinfinity/files/infinoted.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Config file for /etc/init.d/infinoted for Gentoo Linux
-
-USER="infinote"
-GROUP="infinote"
-UMASK="007"
-
-PIDFILE="/var/run/infinoted.pid"
-
-# Please read `infinoted --help` for other options.
-# This is a fast setup for local networks only (maybe not even those),
-# make sure you use appropriate security on untrusted networks.
-OPTIONS="--root-directory=/var/lib/infinote --security-policy=no-tls"
diff --git a/net-libs/libinfinity/files/infinoted.initd b/net-libs/libinfinity/files/infinoted.initd
deleted file mode 100644
index a235ceaec463..000000000000
--- a/net-libs/libinfinity/files/infinoted.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting infinoted"
-	start-stop-daemon \
-		--start --quiet --background --make-pidfile \
-		--pidfile /var/run/infinoted.pid \
-		--exec /usr/bin/infinoted \
-		--user ${USER} --group ${GROUP} --umask 007 \
-		-- ${OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping infinoted"
-	start-stop-daemon \
-		--stop --quiet \
-		--pidfile /var/run/infinoted.pid
-	eend $?
-}
diff --git a/net-libs/libinfinity/libinfinity-0.6.7.ebuild b/net-libs/libinfinity/libinfinity-0.6.7.ebuild
deleted file mode 100644
index ebfb42c2b8b3..000000000000
--- a/net-libs/libinfinity/libinfinity-0.6.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils versionator user
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="An implementation of the Infinote protocol written in GObject-based C"
-HOMEPAGE="http://gobby.0x539.de/"
-SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk server static-libs zeroconf"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	net-libs/gnutls
-	sys-libs/pam
-	virtual/gsasl
-	gtk? ( x11-libs/gtk+:3 )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-DOCS=(AUTHORS NEWS README.md TODO)
-
-pkg_setup() {
-	if use server ; then
-		enewgroup infinote 100
-		enewuser infinote 100 /bin/bash /var/lib/infinote infinote
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc gtk-doc)
-		$(use_with gtk inftextgtk)
-		$(use_with gtk infgtk)
-		$(use_with gtk gtk3)
-		$(use_with server infinoted)
-		$(use_with zeroconf)
-		$(use_with zeroconf libdaemon)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use server ; then
-		newinitd "${FILESDIR}/infinoted.initd" infinoted
-		newconfd "${FILESDIR}/infinoted.confd" infinoted
-
-		keepdir /var/lib/infinote
-		fowners infinote:infinote /var/lib/infinote
-		fperms 770 /var/lib/infinote
-
-		dosym /usr/bin/infinoted-${MY_PV} /usr/bin/infinoted
-
-		elog "Add local users who should have local access to the documents"
-		elog "created by infinoted to the infinote group."
-		elog "The documents are saved in /var/lib/infinote per default."
-	fi
-}
diff --git a/net-libs/libinfinity/metadata.xml b/net-libs/libinfinity/metadata.xml
deleted file mode 100644
index b3c3a5e76107..000000000000
--- a/net-libs/libinfinity/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="server">
-      Build and install the server binary including init.d/conf.d-scripts.
-      Needed if you want to host an infinote server for gobby.
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/net-libs/libmicrodns/Manifest b/net-libs/libmicrodns/Manifest
index 7445cf7eb351..fdb77363c8ad 100644
--- a/net-libs/libmicrodns/Manifest
+++ b/net-libs/libmicrodns/Manifest
@@ -1,5 +1,5 @@
 AUX libmicrodns-0.0.9-null-addr-fix.patch 945 BLAKE2B 40b777b9d0d1a781d1ee3ff82a2370d0ca414c687d665b0df1aa9750e9bde79c027e661c9ead963edb366858c46f6118139903f77d8d4ef99df99b8c28d28268 SHA512 83ef122e8192f34608965e9d6a479ce73abf98c28028f5749e0c53cc677225fae25f501573b671425754b14fb1b871a29caff6e116ed19700cae464b4b7b4236
 DIST libmicrodns-0.0.9.tar.gz 57333 BLAKE2B a9e1d099d4588863dee3c2735a2e3f9cd46212729c342e06cccad1a8e997e85964e7f917ce97f50c0cccd21c1662ef9baf7392333ea666ff65b0577f57bab692 SHA512 6f7dbf1a324fed847131745498895ab0773dfc3c7bb96a05bf0fd3df0c0ce19d7f607789f7a5350d34e91e7ba323ee57196eb37ce351f83a9faa82c5fc8d89a8
-EBUILD libmicrodns-0.0.9.ebuild 619 BLAKE2B 5c83ebdfe3d57677d05ed2c82383bc8052b8aa9710a42c37be97487568d47c00428a85932543fbc71e1d3293bdfa6e1921872e646b5d11f2c66f628fb646e272 SHA512 40909d1473d50c62583ad128a3252852efd22bad92dcf35dbd277d4fe53ddebdbab4d11cffb846f6105c44ccd4877ff97a132aadf575d64473d00e668f754b8d
+EBUILD libmicrodns-0.0.9.ebuild 623 BLAKE2B 274fc4ea614171bcb6f61479659f2e7121f00e4ee5f9100c17c5572c7576969edfc8185663e483c9f5c1d13d5f08fd5f5d81ccad130c8ee6587e15970d82560a SHA512 830dada25fbe415d49029fb8f7a8ce5491bdf9aa6e5bcb43ea8ac1ed5b18741284e62c3c182c7e86731114836797c67895689a1537ee73eeffd6ca024b56fca0
 EBUILD libmicrodns-9999.ebuild 547 BLAKE2B 9e2f1b42a8bfdf1ff226c6ab31c69d4925b7257d1f8f63f3442b42bb3001acdd3c34d96f6f8078f426db8c7a687842524910efacbc2486f6da28619a847414bf SHA512 fcb52e9ec7308571d795fd4449e4ec05ee4ff46dc6b9a7d3f3c4509d5481c16d1240cce3fbe739cebc2a8f67bad3890dfa4b657047e3bc30f1aab9468fb14c9f
 MISC metadata.xml 430 BLAKE2B 94c8e7b19ca9899428db5b67c33d492423ab83f354e878271bdc6ce9b6602c78892b5069ce38032e837e68285c2979bfb43ea11650d734ae6061089a3f2d1232 SHA512 7ca90565928898c788ac8b87abff3909c5d1c0947c57e4ba30b0929a794ac943c20f2002601d2614dca35c2e3b09432653378bd66eaa6f53881c8cc6f86b892c
diff --git a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
index 917e4787ca94..2ac4653346f0 100644
--- a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
 else
 	SRC_URI="https://github.com/videolabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index 6e80463fe188..8de0fac33102 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1,5 +1,5 @@
 DIST libmnl-1.0.3.tar.bz2 337375 BLAKE2B 7054b5f2eaff639bcf0bb836ce16d7787ea88422326d2faa5959b47e4652cd9d2d8d6ea94e2f9addeb87f8c018392de0eca08343ed201895dc8c2d6974435779 SHA512 c47b76a6125271ef9dce13bc8bebd415d2bbd79b6d50491d8ba23344e7e6fe0c1413fe055913ab9444203f0d73166b79f0d4b532b13b62feecde3e5a8cd442a7
 DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
 EBUILD libmnl-1.0.3-r1.ebuild 736 BLAKE2B 9c5e8a4e192833d07880b2f6388ae862fa3482348fb3cf1b9a3892c2f3549c550ca109a745cb593b3e5f0f45d6ee5d5e341832238b69b6b26dcff9847a7da1fd SHA512 2c885890224f6538bd954f6b1e1b82a1b854ba4f177128d142b3862b6f4cda9616a454f14136258ffe6a7b3632de2181f1d41a15acd2744ddc079644cf0d11cc
-EBUILD libmnl-1.0.4.ebuild 747 BLAKE2B c92e003d2858147f4a602f53c446979476617ebabed0345bea38a9c79f8324ac3cb21af189356f10098aa40c1ebce20c97c32e5c099ad7537afb87bf2311c2a4 SHA512 de77e19c0380cfd6c20b4ae3c242a09352b84871cd4da362216bb3a8251c32871b03f98f5870e7ca4b528b6615d7b6b36eaf26dcfc6b493d18187119d6f3976f
+EBUILD libmnl-1.0.4.ebuild 740 BLAKE2B 62acc7a154697ae32bc1f7510a430b5b2fc634b6d6c8bcc8643e5f1cfa0c674f95bf48f898a41496fef9585c4a1a5ed134206ffc2ce6affc1f74760b2784ffbc SHA512 94a300f0c8da2a494426522061af2a3c2fe1495caebc12efb4d3161917fa83cb07ca7bc1a0494ed044ba9bc30eb865699bf4b15360b5a311777f596aade1943d
 MISC metadata.xml 664 BLAKE2B 4245edfc6318a54d3ea1f1cb29113cf0a97be7303aa8861eac42b591a92f79372d771f73cc73f6820496444f05dfef8d798bd7b30adf5911b53b0d969b9eeba7 SHA512 92caf3829016e88cd6560da7ac0bf8140068b69abe8341b5a5c88ee353bdb9bcd5a5b5a1563cc9114d91529b8a134b42b685734e62127b2834393a76e01c5cd7
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index 6bc0f66ce37d..78dbfedd5e86 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/0.2.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 7bd1882d72c6..6a85cad6650a 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -5,5 +5,5 @@ DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b0
 EBUILD libnetfilter_conntrack-1.0.4.ebuild 968 BLAKE2B c1d3943def2e1b3d8eb61006a6426fb23ca0f9062522d8f197c8af3baa366181ba11f1e3ea797d9a461898d8fbdf40036425d36897e3b570dd3932d47f40b5fd SHA512 c1eb29f822d2ed62dea906fb0040b49a9edb966372959cd98a2297dcc88b718c2eb04d6b36d79030d2e473885c299795541a9017005f9f90d6fce176360b660f
 EBUILD libnetfilter_conntrack-1.0.5.ebuild 981 BLAKE2B a6cf9640745c047eb38ef0cbac268ef21e379289b6230d4042b10b040d8fb0faaecc1bd37a026356e6c2d28c5ba68f73c4172584b63db2eb0f19341c4a3538b4 SHA512 23b8a125ed2dbf01c324411085e8464e60d6eb03980a185b34ff6675065e5a1a6963c001f24d242746f8b8b54e02db20925543f853962dc18694246723b45af2
 EBUILD libnetfilter_conntrack-1.0.6.ebuild 968 BLAKE2B b4e9b7a61352bfe98370bc1279307663e22f0aa642f12a8b76a2cf662b30cb12a5daaae01f32ce6fa3cbf7f7697b49903c0022b925d1f4cfa9dfd60ab30403e3 SHA512 df358cda920583fae2ae4f6e5a02f5ef06aef910dbb37222751949ae3b28acb8cac2019b5658376ee237865a3597ea286b4fb1fe2fa7cdd9f484301c544b2931
-EBUILD libnetfilter_conntrack-1.0.7.ebuild 978 BLAKE2B c22a0f8eeacff0f5908716efe68dfa89dca8a86a81fbcdb029d0ffe188b8c1d57147cffbf8ba525b730b61cb405f3d2522dc39a70209d950e7de9e61de6bfda7 SHA512 1c09a5f80586138c21b668e742e3cf13520381d8d3755d5da441dffcb048f2720954df1d034da82237127ffe780e25965a20201ee4c6f5dac662e691dc0a166c
+EBUILD libnetfilter_conntrack-1.0.7.ebuild 974 BLAKE2B fdefcada9c6454dc1d9be25672fcadc22b183c7642aded4d0fb5f057ded436994852fe5fab9032c17c673063795441024116dc2c939cc5b41a92cfbae7b30d89 SHA512 3cab91cd3a0d774d23173e9597fbd07b5714a8f5caa95e20c4db42b654599204f3fe7cdee073516aa7237d721fb5f7c82968a882273bb0cfb3e8493cf7cb4eab
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
index 9d57a35c161b..e80e7dcd9078 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index 2950aefefb11..fe4d345b0202 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,5 +1,5 @@
 DIST libntlm-1.3.tar.gz 518803 BLAKE2B 7cdb4a27c4598d935a7f4916359fc6b177eb6407f45d7b3832956fd9a0378cfa6c6e2e490577c843d3c92cdc283681b3b1fc796c4ae48b7f40a99b5a3551b5c9 SHA512 d375d472167e9c0f142e2415428f48ef692c9fcfe4d882ca442e0fbff86554a5bee23747ad1eb27f81d32ec2f3f5ff654e5c095e4b62dc25dc4918e6664966c0
 DIST libntlm-1.4.tar.gz 568414 BLAKE2B 2a622cd2d7b944128e29503845a3c9789efc9d14a93935ea24f9001d10b279969a8869f7ca68e6e36728638a32ce1ef693a5e8c28ab3bcaf702e114d4bf21dd3 SHA512 888ed2e9ee3e01a53bec951534966378a21c8a0baf555b65d97fed4408568c6b67f4199396cf3e61bb5a73b8e47dbe1333449369a92499e16478b0b60ac78274
 EBUILD libntlm-1.3.ebuild 544 BLAKE2B 53a01c011e1d72199e2ef85ddeb6c19c948b0efecad8644929d312fcb0c61c05c10d03d022c7adc240ebde6a1673ed0f583e9a3a42c15531fbc0b6f03f79fb51 SHA512 9dd07a7c1ae43e096cc74d52104cdd2bfcaeb1de12708ef60c23767d477ead55c369f2e02ac0ed07080a39910921224e2380b660aafc104ab673905a12755eea
-EBUILD libntlm-1.4.ebuild 446 BLAKE2B 2f3d17d9c34759b64b775c5768c1de3a2fd2673b99d0696ccaa28ea042ea75219c3e496a046cc3aa486d43b85619b249332a7ad6884f00bfea324c1f81f21d0f SHA512 86a4668146889e56bf1b4c295d84b4c529f70aa671d0fa81e501bff29b84663911368cf6fbc4bddf02ebf27e28a4b8f65e83c4db6e88efb2bc19a60fe4dd38f3
+EBUILD libntlm-1.4.ebuild 445 BLAKE2B 53b25ce4fd6947072fb4bb4aa724ce2c06fb4966c195bb7d407b6ae55c09d9b2b9570447cb9a82cae61389c709f06764c385a8d5c6bb7929c9a2e46014684163 SHA512 6912b45ad4e81f059e58340b01d366c2381680b00387b9acb1cfc6f926118878a84bd1a55b7045a0d7cbefef16eb7eee0edadc0b7cfa3de22255408f5ee6854d
 MISC metadata.xml 561 BLAKE2B 400bca5cfe90103ba77808cdf4fbd777b3c19dfabff4336df9bde7e8529da948a4b48b06f1f5151e6f62aa45e5a4cad51b4af7dd2799c9aa8dea89f390936eab SHA512 60e06d45b1482e819824259dcc992d355961754d481700ab41f1e3050ec70893f9075c19bc846591f3aaba9a135de5610686cc82feff1b8119a1466865b08a94
diff --git a/net-libs/libntlm/libntlm-1.4.ebuild b/net-libs/libntlm/libntlm-1.4.ebuild
index 93be97556d4c..b3a65b533dbb 100644
--- a/net-libs/libntlm/libntlm-1.4.ebuild
+++ b/net-libs/libntlm/libntlm-1.4.ebuild
@@ -10,5 +10,5 @@ SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux"
 IUSE="static-libs"
diff --git a/net-libs/libprotoident/Manifest b/net-libs/libprotoident/Manifest
index 14a3ba1bf1c4..c423e70b9f6a 100644
--- a/net-libs/libprotoident/Manifest
+++ b/net-libs/libprotoident/Manifest
@@ -1,4 +1,6 @@
 DIST libprotoident-2.0.12.tar.gz 571466 BLAKE2B 604dee2d33f7944615211ee3ab0a3ba610354bd604bcbf5296d58698ab963b5e667ea3e08fc2df62dfdb1e7dc7a336a57be6e61b6f410fdd7a96f3b46c35d70c SHA512 b8ba13ce9286a026062f47ffe3bf9407b408f64fbf0521aeebaf0e39e6ddf70cfbc6574f8e9c0f35fc2c2e5f9c4e71e200536665988f88c65bbdbeb9b7baed16
+DIST libprotoident-2.0.13.tar.gz 592008 BLAKE2B b8e4ecf5fdc1b40881709e9a572148e666f6d1a56c00cca39efd81caba3c3344a57bbc57e0794a92d1ec23bac3c928ac2b06323c1785cb8fc08cb33f55f2195c SHA512 905c97ba3f994d7b63c95ee80bc7b2c2be13b86745d072f5aecb4df88f791c02dcda3f851f01b5cca3cd36ad87379759789238a8c05f3209a5aad3d854e6ff20
 EBUILD libprotoident-2.0.12.ebuild 750 BLAKE2B 2983aae00b276a2a02b1e6c4ce7fc31759f35596ea38035f78ec6be5c3cc430cafad517f39c6909c03f37784fb17060269ab567378699216b3ed737e8c14b2ce SHA512 2e31e2aefa07348e63fd459c44ab68555e63a2194b0b33fbadb9895d4a51a447337bcc0d862d716765b716964271837b67d6566d1f5e45ee805cc031d9c0fda6
-EBUILD libprotoident-9999.ebuild 770 BLAKE2B f89f6d3feed6cca0e4e69d6656338e1dbb61e95223b3d37a575180f4e4f0e686e0719a7cf69de52b6dd20b370377bf2c30ba9694281d85745381c698efdd409c SHA512 0ad2d0ab2ffa956bcee2adfb7873d30f455dd7e75af76c910df54d327409b2267de44c3ec038cb743986634f7797e8469dbdb2cb7ff01575b9dde7beab069800
+EBUILD libprotoident-2.0.13.ebuild 755 BLAKE2B bb6a60f761e7e0aaf4990ac71b1a7fed86f10028df8829db8ddb43d196d617732648e7c93c8ce7a6cc98253f74a0c67f0cd7cf1868d0c789e891a37361769e5c SHA512 e52dd8c021325e157c632cbbf4c157322d8e777a2b2b0759811097b11a924ab4bb76f1be3f6899b5a042c6fd0710130407b32bbff52a542ace03ed8431a9771c
+EBUILD libprotoident-9999.ebuild 783 BLAKE2B 6cc2e12379d71d21a3031969cca20dfadc9d256eaeddf65b67fcf88e33b3a4f3ebbd8def18755e46d337f69ad9927e8e2fbd4b0229d18e2af79c8dc3e5a3a4fd SHA512 4adfded1639d62cd0b5d8ab7685dd1e74a0cd3c65d56d86282fad7a3421be57fabd8361da7c6359763b8fc63069eced42864a9a4253bf10417b4521d131cf938
 MISC metadata.xml 360 BLAKE2B 17e614f06987241150e84b3738ef722bf680c8a9601307140767b78500a709849e71242774ecaa9c423771331365b4ba9e4293a859365527bfe11031339d91a7 SHA512 3de118bb358e064950487fffd58a49bb2fd5fc6597e6f3d0bf96a93d955e4879727fae386bdaf1a4a89388e471217903ce92b520edf257e1d1e66a6099e04b37
diff --git a/net-libs/libprotoident/libprotoident-2.0.13.ebuild b/net-libs/libprotoident/libprotoident-2.0.13.ebuild
new file mode 100644
index 000000000000..8d80ce7cabdc
--- /dev/null
+++ b/net-libs/libprotoident/libprotoident-2.0.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A library that performs application layer protocol identification for flows"
+HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
+SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs tools"
+
+DEPEND="
+	>=net-libs/libtrace-4.0.1
+	>=net-libs/libflowmanager-3.0.0
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/-Werror/d' \
+		lib/Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libprotoident/libprotoident-9999.ebuild b/net-libs/libprotoident/libprotoident-9999.ebuild
index 397ba5fb9253..89b8578c07c5 100644
--- a/net-libs/libprotoident/libprotoident-9999.ebuild
+++ b/net-libs/libprotoident/libprotoident-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils git-r3
+EAPI=7
+inherit autotools git-r3
 
 DESCRIPTION="A library that performs application layer protocol identification for flows"
 HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
@@ -38,5 +38,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 08a04938d878..4cd58a14e9d9 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,3 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
-EBUILD libpsl-0.20.2.ebuild 1454 BLAKE2B 28c1e1c78e913245e0210b08cfb9dddba48cd1c995222c884a1c39fe43567bd0913ab4e2d76c3bccc522162fa1a8848a7bd13a1bcd71cb4ed5501a720d243c56 SHA512 8f15cc0b55a3b7fa388fe249fe34c1158727c420f0bdbce38c591b88926191eefb5b38dd76aa99e4e1c91d20aa4be5c830ac3a3634714e325e0ac5c2563713d2
+DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
+EBUILD libpsl-0.20.2.ebuild 1461 BLAKE2B 2f07b01bdd6afe98646c0bcf8c3ad7cef361cbc1b47348a2add40031a0975a35a6c69dccefcd5eb7bbbb76895d2f8d320eacf230e48a13757288fe90fef1cb99 SHA512 f38e604f17c5a6c329cd32ce218d41a49ef2d8ac65a52fb09ce1ea3a10a8ba89bf79b7348e7a0d9d05a11ff3e60c5bdc340c257dc833094aec2e0d54b1686fff
+EBUILD libpsl-0.21.0.ebuild 1461 BLAKE2B 2f07b01bdd6afe98646c0bcf8c3ad7cef361cbc1b47348a2add40031a0975a35a6c69dccefcd5eb7bbbb76895d2f8d320eacf230e48a13757288fe90fef1cb99 SHA512 f38e604f17c5a6c329cd32ce218d41a49ef2d8ac65a52fb09ce1ea3a10a8ba89bf79b7348e7a0d9d05a11ff3e60c5bdc340c257dc833094aec2e0d54b1686fff
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.20.2.ebuild b/net-libs/libpsl/libpsl-0.20.2.ebuild
index 80c11e68aac9..fd6aa857e238 100644
--- a/net-libs/libpsl/libpsl-0.20.2.ebuild
+++ b/net-libs/libpsl/libpsl-0.20.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~amd64 ~hppa ~ia64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~s390 ~sparc ~x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
new file mode 100644
index 000000000000..fd6aa857e238
--- /dev/null
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_{5,6,7}})
+
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="C library for the Public Suffix List"
+HOMEPAGE="https://github.com/rockdaboot/libpsl"
+SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~s390 ~sparc ~x86"
+IUSE="icu +idn +man"
+
+RDEPEND="
+	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
+	idn? (
+		dev-libs/libunistring[${MULTILIB_USEDEP}]
+		net-dns/libidn2:=[${MULTILIB_USEDEP}]
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	man? ( dev-libs/libxslt )
+"
+
+pkg_pretend() {
+	if use icu && use idn ; then
+		ewarn "\"icu\" and \"idn\" USE flags are enabled."
+		ewarn "Using \"idn\"."
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-asan
+		--disable-cfi
+		--disable-ubsan
+		$(use_enable man)
+	)
+
+	# Prefer idn even if icu is in USE as well
+	if use idn ; then
+		myeconfargs+=(
+			--enable-builtin=libidn2
+			--enable-runtime=libidn2
+		)
+	elif use icu ; then
+		myeconfargs+=(
+			--enable-builtin=libicu
+			--enable-runtime=libicu
+		)
+	else
+		myeconfargs+=( --disable-runtime )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index 4c5ef06391eb..0359842f311e 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,5 +1,5 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 BLAKE2B 600b936552c64473dfce637d60a782526a42858d3b7e3118c78ec442cb6d53e167503407d0bf3ded34024a7065d5fdbf3f487edd7e3fb701d0a009eff158d094 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d
 AUX libsignon-glib-1.14-default-opts.patch 1714 BLAKE2B 8c00bcf5b056cd0fe05f58ed5727569cf9b917d6e4e7e11d90bd52ef343f8b26e02f98ab463e5c2a1121ba48f0260896f1301b1446c0f26146a8e2e5d6ce3c05 SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430
 DIST libsignon-glib-1.14.tar.gz 54019 BLAKE2B 9ffdb96a374ef0848c1b70cb369a533ea826b24856a32b4b454a0fd8982533041fcc88382fdf1eee6857aa36ec8d076885fc769a058e148e91da54dbddaf7125 SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d
-EBUILD libsignon-glib-1.14.ebuild 1707 BLAKE2B 83820f82d77369a290a7aa5cff399eaf44c10363a334eaae7bb7b7836093540ba645600eb641ffc0d5f4f974fbcbdb4814eb7fd4265b537d4e6256fd3da5c246 SHA512 5ca086d810cb3025bffbc8d90458adc36f33c9e20260d39c362743711123b33266dc099d05528b19272cf19b0b17c627b4d4087a6db33a422f9312ed9bf2e4f2
+EBUILD libsignon-glib-1.14.ebuild 1703 BLAKE2B 13bcf21991d2f108df3a4f794e2b413df276c277678009de0d72a23ffc86bf4422dde204330e13c604365c047ecc09b874f36f9deda1de56ae286a272bd1f34d SHA512 63a653279412ab2274591d2b4783250edec3727a67552c82985e35ed166fd847dc494a9d5de74a5ad7553c8431d2552dd33c9256dad2a059c92fe286d495b9b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
index 96092a132047..8320fafb01b6 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit autotools python-r1 vcs-snapshot xdg-utils
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 702b0f97dba4..200cabb9d27f 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -2,7 +2,7 @@ AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
 DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
-EBUILD libsoup-2.58.2.ebuild 3019 BLAKE2B 927adec018c8e02235c0cc6390d1ff4c1c2fd9fe96757e3424389fa53a4310887364d6e4c1c2a375d8fe625cea1f0490b734e5dc6ffcb20a0fc821638344211a SHA512 d07cc7c0c4228f262a43c04edaf39260ec7f95a269969115f8efd3b7357f35054cec7913e46f3bf86837ed792301d0f6b47c96c84ac8eb802d1bea6b11350315
-EBUILD libsoup-2.62.3.ebuild 2930 BLAKE2B 29db8ff029eef9df452555f5a7e3371f48fa2f38212ceb10aed792d95cf069f4fd947eecb52619dc451fee87cb24fd82f3f1f192e654941631d28ad5c3bd323b SHA512 652aa6e4355ad2855cf7f16482754b15c95c14ac4bb7bf4bc0e7b7d2bb5ee6a8793bf2686b179d9d152884f98b511dd53c8cc042e2725710871dd228338873c9
-EBUILD libsoup-2.64.2.ebuild 2798 BLAKE2B 038bfdbbc1295507a7ece2027dc16adc82d176e84226e053eae66c6c9c44057a997efcee72f5c95f30c0d002c3336c5a8005a4ba7125199facab96a68e98fac6 SHA512 e3a6ca76ac8cd5b4725e8d49c58aef7b6eeead9828a022b39cc72f93eea497494aeaa33278b94466f7e77ede07706510cc949c7281cc09c8844d5737c596fdd5
+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 2797 BLAKE2B 3bdf773fb35b5df5bdbff9a7a51a2c34029385fd9426379300081d553cfca2ff5a76ba93f9d6a3c56218ee1a89146ad24150fa7264ea6512d05616dcc5b1babf SHA512 332bc4a9a10acd5dec4131ba998b654c8c0304488847848e073df4f81fc3bd80f72a41e8f6ec66634c1b29eab91a26997affb826d2da61c16b135b7a2a5d3dcb
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index 8fbf3fbe6a37..fa7ceaf700cd 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 multilib-minimal python-any-r1 vala
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index 0fd9a010737b..6e215a497f5d 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_3,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 multilib-minimal python-any-r1 vala
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
index 0c518a6ed028..8215bf2a62a5 100644
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_3,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 multilib-minimal python-any-r1 vala
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~amd64 ~hppa ~ia64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index ddaf4dc8888c..9ae2139aed63 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -4,7 +4,7 @@ DIST libssh-0.8.5.tar.xz 427372 BLAKE2B d1cd94a50f09b1562f7267ff435b2d180b84d413
 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 2942 BLAKE2B fba9d98b846f549a2b52f130154e7421d7a4ee2b1a342cbbb2ed75e84c484b566bfe0b9ec6a73045c34ccf92c4ead34d0c93939613c9f699074d3df73a5f7deb SHA512 c85cd243150daaeddaf15f29e97898a1301cbc22edc0ef5708ada5d30690d865c767a2ada377e6217e79a0e2b9b4e7faa281fb096c1d384fb4a8cd1b7ad22707
-EBUILD libssh-0.8.7.ebuild 2898 BLAKE2B fbbba7c5130f3f6f6fec9d7a215a67f569b2ad1d667ba5ed923087141d963aa15bca24746d2424481e3927bd4c43084ffa4334426add7627f3845d57ebfc17f4 SHA512 837a9c9e4f1ff69972496cfa83a2ad50246822e3964c72948542a51bafc24b6e4ffd8360b5e0ffe710d5cd7aa7b6fd7ea03629aee25bc92af7da1322330c404c
-EBUILD libssh-9999.ebuild 2897 BLAKE2B 45f5872ca4ccd8b8e51d45ee218dfe82367cee5018dfd34e59e8f453ec1d480244632431e3d911efb55ec1c8d2707114292804bcb18e909a2132f2a3ac72eb7f SHA512 4e974acf3d5a821f11822d4e36a8ed8b965ebe1b047992a7b1b344764043d8f81f925269766e98bc61a61615b6d61f24bed7cd5e9a19795bffe75f810f284dd6
+EBUILD libssh-0.8.6.ebuild 2939 BLAKE2B 16b54d58cd6aa7923efca0b1132fc7f5bed7e12545eaaa2201f663728d3f7fb5c7b236a6b51489b14f0d5b14893206675e7cd370e2d5e54a448075552e3fc3a8 SHA512 6900dd493a183bde532051377e6bc4f35ab24d36c36198bc0ba23ba31883367cd7c2dff0fc5597575fd416d399f1b281f0c777bb26911b25aa447df11bd66c32
+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.6.ebuild b/net-libs/libssh/libssh-0.8.6.ebuild
index 6f55d3dc320e..51ecadb40e69 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/libssh/libssh-0.8.7.ebuild b/net-libs/libssh/libssh-0.8.7.ebuild
index 4a55b7bbf1e7..a2353f90c6bd 100644
--- a/net-libs/libssh/libssh-0.8.7.ebuild
+++ b/net-libs/libssh/libssh-0.8.7.ebuild
@@ -59,6 +59,14 @@ src_prepare() {
 	sed -i \
 		-e '/torture_keyfiles/d' \
 		tests/unittests/CMakeLists.txt || die
+
+	# disable tests that take too long (bug #677006)
+	if use sparc; then
+		sed -i \
+			-e '/torture_threads_pki_rsa/d' \
+			-e '/torture_pki_dsa/d' \
+			tests/unittests/CMakeLists.txt || die
+	fi
 }
 
 multilib_src_configure() {
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 5137fc6f8d22..d88693448ce5 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.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
@@ -57,6 +57,14 @@ src_prepare() {
 	sed -i \
 		-e '/torture_keyfiles/d' \
 		tests/unittests/CMakeLists.txt || die
+
+	# disable tests that take too long (bug #677006)
+	if use sparc; then
+		sed -i \
+			-e '/torture_threads_pki_rsa/d' \
+			-e '/torture_pki_dsa/d' \
+			tests/unittests/CMakeLists.txt || die
+	fi
 }
 
 multilib_src_configure() {
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 1026859bc178..6fedeacb6bb1 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -5,7 +5,7 @@ AUX libssh2-1.8.0-openssl11.patch 2551 BLAKE2B 32875e90a9cfb754050559a315c24d510
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 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 1621 BLAKE2B ce45c14d1f62ca3fc41bb1c0b3f3c51bb7b752fce9f24b53b4b6b59567ad89a02a0191e67935d93969b8b464eca017c5e2d6025c4dc648eed07103964793a08b SHA512 472bd3eadc918e6d785ce0af09bce7a811236dbe3a62de12612556a66d7c89fc20322a47c4779b389175ed39041a1ad710fd8956c2d11a1f79685b2f862980eb
-EBUILD libssh2-1.8.2.ebuild 1621 BLAKE2B f3bea26503e369179cd8556d82441456a7e11ccea46ca0166f4e2f512f5ba6dbf2231e95deb3645fcc7973a1d0b48c522f32cf6863fc8229865687d5e4febd2f SHA512 d27e38c726d87b19f3107dc0744343d5618226037fe8a751a73d31b785acab40dc5101ec91d570ee601cede993587e451d63fd78b3943f81629854ad4be46c4f
-EBUILD libssh2-9999.ebuild 1324 BLAKE2B 2ceb2fc6efd161d8c2f42bc3a2bf28273d9084311f4749859a757a8d31663e7dd9806793bf1f00b8cbbb8524549ae154441459fb03e15daba8d84ad6d2d82a87 SHA512 59e65c232c435fc439bca3d2ee4f0010c50684aa3f7e519050e5fae309f25b0a27e737dfd6bbf6540a9c5b08601546979aa4824736becd0c0d5cf03700f9bd3c
+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-9999.ebuild 1350 BLAKE2B 4c235624aeef7721a3488a1dac91d406f5f83b8e7b1482bdddf7a71f0d2ad19c0124aa64b00b228d713a5da0c394accc9d3dce19374d588256e2905139176b64 SHA512 e12db58e8a20272414575ab19378dec2ecb2c97aa79d3f8d4397ec9638a2377d9218f21302c2c56af03dbc8620e807189b50442cb8d86b3b50d9c8caf15d717a
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
index bdab253bbeed..7eb5156df2c0 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-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,16 +12,18 @@ 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"
 IUSE="gcrypt libressl mbedtls zlib"
-REQUIRED_USE="
-	?? ( gcrypt libressl mbedtls )
-"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
 
 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+	!gcrypt? (
+		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="
diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild b/net-libs/libssh2/libssh2-1.8.2.ebuild
index 75e39f52b68e..7eb5156df2c0 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -12,16 +12,18 @@ 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"
 IUSE="gcrypt libressl mbedtls zlib"
-REQUIRED_USE="
-	?? ( gcrypt libressl mbedtls )
-"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
 
 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+	!gcrypt? (
+		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 456ca9203854..d1797b7dcfa7 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -12,16 +12,18 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE="gcrypt libressl mbedtls zlib"
-REQUIRED_USE="
-	?? ( gcrypt libressl mbedtls )
-"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
 
 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+	!gcrypt? (
+		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 85c74fa2853f..f2ac5320efc4 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,7 +1,7 @@
 DIST libtorrent-rasterbar-1.1.10.tar.gz 3902542 BLAKE2B 3a78862ce2825c9da32ab38122db05c2816daa237559446a60702f562e971c5597210dfc2612235294cec3f60fa3de8cab3a0246887ac4779b01171a460f70f0 SHA512 414deeb9765bfb6072af5fa00ad836bfe3751622a80783ea84389e31355b342a4371f0dc195b2d27b154826e515b2e6063c8786f792afa347abba9caadaa5b2a
 DIST libtorrent-rasterbar-1.1.12.tar.gz 3897237 BLAKE2B 0988b16d79df9499e2f7ab9d568ec560fa701e78fa0c6cc0158629d219259a73f3b2aa8b79d6f9c3a757f97559bc6b354148d5885b29f089a41893df65c92b11 SHA512 6f264ca9fcdcb93c4e16ced4b2657ccb19d47cbd483c3ad9f14909ee7de280b50c15d180c05ebd454236871fceca48cd79647bf89f8cbebf234b8f0f351aa699
 DIST libtorrent-rasterbar-1.2.0.tar.gz 3546062 BLAKE2B a02ef8f273d8e6ec3b6f6a42d518f7cbba669f109f907e243bb90cd674009894b9edce2f355b52d77275f3fcd9537e9c26280f7b78dfbb1792f52d6c7f50f7da SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
-EBUILD libtorrent-rasterbar-1.1.10.ebuild 2385 BLAKE2B e463383b63362472e800c89ff9bf4c06d567999c552f4c5d5dbba79293e6af996721dfd9db56a60278343dc15836bba15ddc22885cba19056f438e417e5eb0e7 SHA512 54e4a0e6e3ca32b4866541fae61eb0d6024b89af47e086d74abb9cddd692d00d40e9d4d5514201f41cbc085d789a4d613f01d724caafdc827359d411822bdc76
-EBUILD libtorrent-rasterbar-1.1.12.ebuild 2385 BLAKE2B 244142352ea27de5ac88ce03ec9ed64421aa9feec919486b9a5040658694044e186f7370ea0e0c7a875e293045fe4cb0d041e366a08256c56e8117f7ae5f2196 SHA512 2703b8dfde95ac4d70773f3305c9c5d2984d5e85ad2162d20473584a8f141f3146660ac97ed46b4811b9f0b0aa478992a4d23890dbdc5d0d73f46a5947402bb2
-EBUILD libtorrent-rasterbar-1.2.0.ebuild 2517 BLAKE2B 04fc673ffdea6b03293d285baa95f57118348f314f3259e23bd4cef2c4babf81f52b839e8da2f363e5d73fb373395a65c6039123e6343ed4b3c8b109d05dd591 SHA512 50f8a2708c668643319519edc6e234a9dd1cd9b4be796d1d041de7574ed5d840f3b95a299b90812dc0bd4ad768ba9c6df0051ce3c4714d0ded3c6f8ebed696bd
+EBUILD libtorrent-rasterbar-1.1.10.ebuild 2383 BLAKE2B 8aa73342140939d5842d80d686c127e62e8ab1f3186a2af48144274ea7c531c70ce5bf4ed45efbfe87aa7b341111dbc0158f86810841a4877d3cc1d6e0acff6b SHA512 b493746cc819c8f43e68a53bc06ea7091cec77959bf6d51d3c204c5c793e2871cf093352e6a854c0b79744552e8005382468447a86185b4b58a0c38d20007fd2
+EBUILD libtorrent-rasterbar-1.1.12.ebuild 2383 BLAKE2B 919a3ca47460f14e9e22dbf3bba66539122960051bbbb4957d56e15f7f8dcd7edf8807f637f23b89022b6b2574747edef90f2edbc9b28f4ee005190d7aa384cc SHA512 4365325228634965e650d633ec1378bd8acfcb13398bf98de79b5190782c6e312e525ec8326b7e3eea48d8efddd64c7accae6e3ed138625098fbb1b305e5e381
+EBUILD libtorrent-rasterbar-1.2.0.ebuild 2515 BLAKE2B 05610fdb0e96e75eec8c3ed9e65be02ae5cfa811cd827e13b2f3c9a3474c258580355fe04befda7a66e50f72c34ef977fe2526956407d95658b032212df65cdd SHA512 123037531086ec81e71c0a1d37cb284418e3fc331d0092f8167d0ea77b553f41a3210bbda56571a25b372bbb3f300678470c060cb31083a2d5a4748ece4a901b
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
index 83687710f615..1b537d16462a 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
index a6d541b19872..273b0b56ad16 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
index c18af82cf1ac..ff391a34b944 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index 0b2612940b63..61cf95971545 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,5 +1,3 @@
-DIST libupnpp-0.16.1.tar.gz 470523 BLAKE2B f587633e796c34ed38c35559c935a7f1f4b6042f69d5cc76f268312b0a871988ee5521fba2de125a50c0067d4a5674850eb7d01cb36ed62c0f2b17267a1b3ad8 SHA512 c63eb8ab8a76b7e161625631bee645e7a1f8d779ea6b16ed0bbf43d0972e8875613f04dbf44cd43796273f7b20b4fa71b791d10867c6d220f0d78c15c016c275
 DIST libupnpp-0.17.0.tar.gz 475725 BLAKE2B 568ead87791db1a41a4e5f93280cc8560336516cf676e1b64c35d0835579501ba61b75ee41e1dd1e58024d771f6f077c3c85515929be1c059a51ca314756fbfb SHA512 da7ef2453a8fad1e226c6252a84d76bf874128d306d4f9ca53e77e64734d113f3ad6dcd79549b2fe2a3cfab22243b5dceb1b7bd1fffeb512ed996b8fc680667e
-EBUILD libupnpp-0.16.1.ebuild 528 BLAKE2B b8642e512974e10f081013e5722dff178e4da1e4ee6d88f1879091d5150d2656c7d36e8ed1fcbcead1e0a5e7bf10ed7118ec21c773dd8f1cf336c96072cef9e7 SHA512 8844b8d81e1b6738838f1644dd34f28f82e85f21e4883030ffc562f446f59701aa2d3cb80a013f02aee3a21caa68ae40c1756e57ddd8ccfeeb4fa54ca36404b6
-EBUILD libupnpp-0.17.0.ebuild 452 BLAKE2B 51a3de1bfbe3c7e95ea1f04cdd4de3a4454cb65b9f44d26b1950785045f50589f5f418582eba88dcc94103b0aeb228981e3a1e1a64779f7c494d8ae806a9d81a SHA512 b7ebf6f3e31cbeb06f10eb34c7fd3af1422293751fa5eeb07c2c28bba53035a1539ba8c1387d269c916bd4fbd5e6d0e78d002253fce62f4a5161e3966376739e
+EBUILD libupnpp-0.17.0.ebuild 452 BLAKE2B 55b83c65a1b5bec4a5bca172acde911ae00c91aa6a5e8d44bdef1e6cb52ba3a0a96e6f60addf614e07fa2d998c258e8e4edcc9b65091279f2b189283b51c6664 SHA512 9514fefb30efe8737b99700ba7820e5ac094efd51cb008e576d5b92b7e7b7e7d60fc16ffc83973885fe3c065b5fed60e6d5be2ca3ee33ee6ffcbb5d63c84cb5a
 MISC metadata.xml 332 BLAKE2B 7d198d8b62aacf867ddb819dfeaf466ce052ae797b0d512fc14c294a2b7bb0adf9514ab0ae0055a38b5eec6d79ffa4b4e0970d5438b9d9b38a29ca8ea7022cc6 SHA512 1fc1d07c136b613f42418b92272c3d4093c9a3691fa9ad8a96ed0dd09639f50a5f55c2d41584511f64e4675f075fdd74faa33922b0b75a1ae6451250dacda682
diff --git a/net-libs/libupnpp/libupnpp-0.16.1.ebuild b/net-libs/libupnpp/libupnpp-0.16.1.ebuild
deleted file mode 100644
index a9708d584ec7..000000000000
--- a/net-libs/libupnpp/libupnpp-0.16.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="http://www.lesbonscomptes.com/upmpdcli"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Unfortunatetly I receive segfaults from upmpcli on any newer version
-DEPEND="
-	dev-libs/expat
-	<net-libs/libupnp-1.6.24
-	net-misc/curl
-"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/libupnpp/libupnpp-0.17.0.ebuild b/net-libs/libupnpp/libupnpp-0.17.0.ebuild
index 3806b746ec9c..711082d6f680 100644
--- a/net-libs/libupnpp/libupnpp-0.17.0.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.17.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="http://www.lesbonscomptes.com/upmpdcli"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	dev-libs/expat
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 01b9f5bcfe85..5c91ffd40c2e 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -3,8 +3,8 @@ DIST libwebsockets-1.7.9.tar.gz 2915358 BLAKE2B 07aad4ab716212924177aa76233d743d
 DIST libwebsockets-2.0.2.tar.gz 2998585 BLAKE2B 0eaf2301abf9a0e47bd865b6e653f3ea23f3b00d4c6da785a8bd871f3ca729dc43152cad10aeaa9a3cd360aeecd0be87e434102e91e0eeaa6b1865031310a362 SHA512 6cd0cfe14ab9aa2ce26624d41290ed3bd0ae4167e93d5db738883dbbe2db851bd75037929a417922c2ef78eae3ff00583134d42da575d961c777e4a1ad0fef4a
 DIST libwebsockets-2.1.1.tar.gz 3769593 BLAKE2B 8d3aaa0a844925fb927fffaf0d11ba1bdbd013db8a680ce4b85cd5d951219598288fa0f2b97ec22bc00ef879586cb5c2c076b774f3411cb6d8ca553e66fb90e2 SHA512 429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683
 DIST libwebsockets-2.4.2.tar.gz 3777160 BLAKE2B 6aedc0d340e9e03745309cd1a9674b6c7e84ebdbd5232a265c7a4e0deb612665982353c3ba973b58a835b1747448d415a3625ed044973212b5a897b221d73106 SHA512 7bee49f6763ff3ab7861fcda25af8d80f6757c56e197ea42be53e0b2480969eee73de3aee5198f5ff06fd1cb8ab2be4c6495243e83cd0acc235b0da83b2353d1
-EBUILD libwebsockets-1.7.9.ebuild 1190 BLAKE2B c13f3292d000ca410dc8007f9e31e833780e26ded88d6a20818eecc7d0c5783da741ec69d78ba712cf7ff0fe9f244027672411318cf6c4419328f3af22953b13 SHA512 ae405094c922c0004a2b5f312b8a8c0c8b7674208bdb89b969643ba0444624ade3bbb5a8264c1c58c955e320ddb60ca6b06f0d6ab1a823e12bf1e8a8890c8afa
-EBUILD libwebsockets-2.0.2.ebuild 1191 BLAKE2B 786470eb779e4dc27bf18edb1d53940bfde004b6661e2d07d43c16edbdc30c53e60e15e6a425cfeaa443a727fe8a76607c361a3d54d3f900d23409bbe54bba6c SHA512 8f4c590d1a9c72d752190dbfb8e4e9a99f940851ea52e3ef2e1959a981a03169409d71c38e3adda3284d554bf7126342984f1861844d9f762227bdd7c7611d8b
-EBUILD libwebsockets-2.1.1.ebuild 1864 BLAKE2B c3002a67df06bff1d6f9459103557e336b701139ab165137638052c382b771af75f4cb347e9e9ff9bd2c10e1b5ba8c7f52feeec50a1ce7e69ab281dfdba2ff32 SHA512 ce55d4465133c73062ebb2fdcd28e58b277da6f099f3c020d1921e66dac3b64838ada69eb6ce5b6b3d8a4551e8d714600cf1d5d42a348096d1d8b5de7b3b4d99
-EBUILD libwebsockets-2.4.2.ebuild 2143 BLAKE2B f6f3dbbbec4e227305552552239438dc1c0f14048c69046d3580e5d90079466fca692b9e2c5f90f2fa362d88019f5550e7aba0040ab25e1d4859dbd612a0b488 SHA512 07729c4069c8a70f207b16a1076caa6c5512601a4a1e319c4dd989ddd674da2fb356ec2cc30f136b5009c79ca6ff47238426cf80322d668d1edd781e9e646261
+EBUILD libwebsockets-1.7.9.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
+EBUILD libwebsockets-2.0.2.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
+EBUILD libwebsockets-2.1.1.ebuild 1841 BLAKE2B c79cdc197d2800a7924cfa134269e1d679c0f6df185f83de157b1211a55e01d0a4cb05797e74ce8946dcda0b1b7266be030824af6fe136aedb89fd21e1535cac SHA512 5561f0c233aad102971bc9d4e626178771b349543bca91e816eace0502672e2e8edcd71e26b9791f657d2f9864b93f5aadcd63f18057ec632d939354d475f191
+EBUILD libwebsockets-2.4.2.ebuild 2120 BLAKE2B 2276db115471732eb30f81cea4fb54aa01fd0f2202c41d1b26234d9468988eca8f376ea3bac3ea105133b56a1b7ef802b9d5ab22de6e107037b1cf2d2d6aaa3a SHA512 4be547c69cfa37ad311270927512d2825facb5ed2fd3aa30498d9301b54fbe05d6138977bdcf2f8fb5672df94ccba2e835757ca6379dadde5bd199fcfe27be2c
 MISC metadata.xml 1829 BLAKE2B f5f9a3e819382eeaf1a024ef53ff6d2c94f34566b4d0220f9a3a289ba5fd55c0d3d3d73d8ac46a9e10b7a5223cce44ebad2048efcf0d896762adfb04c6a2b67c SHA512 b29f893c28c5c27260838b440ae98a42d30291272c2c78aa80f61ea2ba877c29c2bed1bf10e68e59f98c732703c6a975938b7aee04f051cbb775d85cd93e00c2
diff --git a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild b/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
index 12fa48d815be..b9bba7e9a999 100644
--- a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,16 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs"
 
-REQUIRED_USE="libressl? ( ssl )"
-
 RDEPEND="
 	sys-libs/zlib
-	libev?      ( dev-libs/libev )
-	libuv?      ( dev-libs/libuv )
+	libev? ( dev-libs/libev )
+	libuv? ( dev-libs/libuv )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl?  ( dev-libs/libressl:0= )
-		)
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
diff --git a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild b/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
index 47332620d0bf..b9bba7e9a999 100644
--- a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,16 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs"
 
-REQUIRED_USE="libressl? ( ssl  )"
-
 RDEPEND="
 	sys-libs/zlib
-	libev?      ( dev-libs/libev )
-	libuv?      ( dev-libs/libuv )
+	libev? ( dev-libs/libev )
+	libuv? ( dev-libs/libuv )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl?  ( dev-libs/libressl:0= )
-		)
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
diff --git a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
index 86151e80cb69..3dcea8a73465 100644
--- a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,6 @@ KEYWORDS="amd64 arm x86"
 IUSE="+http2 +ssl access-log cgi client generic-sessions http-proxy ipv6 lejp libev libressl libuv server-status smtp sqlite3 static-libs"
 
 REQUIRED_USE="
-	libressl? ( ssl )
 	http-proxy? ( client )
 	generic-sessions? ( sqlite3 )
 	generic-sessions? ( smtp )
@@ -31,7 +30,7 @@ RDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl?  ( dev-libs/libressl:0= )
-		)
+	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
diff --git a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild b/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
index dc1e64652689..38798f5926c7 100644
--- a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ IUSE="+http2 +ssl access-log caps cgi client generic-sessions http-proxy ipv6 le
 	libevent libressl libuv peer-limits server-status socks5 smtp sqlite3 static-libs +zip"
 
 REQUIRED_USE="
-	libressl? ( ssl )
 	http-proxy? ( client )
 	generic-sessions? ( sqlite3 )
 	generic-sessions? ( smtp )
@@ -34,7 +33,7 @@ RDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl?  ( dev-libs/libressl:0= )
-		)
+	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index f620d93765ad..9ed9de5a1ebf 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,7 +1,5 @@
-DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
-DIST miniupnpc-2.1.20190403.tar.gz 94204 BLAKE2B 6dd23a2b0b497a95bf8a92d63b95b8d3c85074845d1f2d9380701107e12262cacc2e80d4c324b95aeca76412ec85d5e6118eecc2131f352c8f2a5d489f833d40 SHA512 810ece8f3679c8caab447a621a7bc128a2f1780b455574d3514933c0601223cb14033e97f8e667c596632a75f651dbbb0294523d873e8212fdb5fd3cef61e65f
-EBUILD miniupnpc-2.0.20180503.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
+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.20190403.ebuild 1342 BLAKE2B 671942063a16c89ec176127db3463e507df02b0096c74fc52ba3423ff0d5cd323d1bf5ce576fc8104650d3c2441ca393b1fe70d555430caa15fa35b02811ef10 SHA512 2d0673f006c620441a8762c68da93eeb34d77772b3bd36834f5e363b7750380ffdf16c4e4d82414a1b2e2603b2c7a886918b0f5a70c604ceb43fc63433cff206
+EBUILD miniupnpc-2.1.20190408.ebuild 1342 BLAKE2B 671942063a16c89ec176127db3463e507df02b0096c74fc52ba3423ff0d5cd323d1bf5ce576fc8104650d3c2441ca393b1fe70d555430caa15fa35b02811ef10 SHA512 2d0673f006c620441a8762c68da93eeb34d77772b3bd36834f5e363b7750380ffdf16c4e4d82414a1b2e2603b2c7a886918b0f5a70c604ceb43fc63433cff206
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
deleted file mode 100644
index bfae17481afa..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-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"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
index b170db612f20..b170db612f20 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index f27ad2c17085..326c5df432b2 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,6 +1,6 @@
 AUX nDPI-2.2-libcache-include.patch 819 BLAKE2B 5a0698bc19917ebfd737e886937d023e83452bfdd812010e2b2622461ca8eb6758533ecf5c1b01495eab21de72fd7f0608dd826d864336446f893d083b68ed55 SHA512 854b65c5dbdb19bd73040ed12740c945e0f31e50c51a0ebd32c646177043e28eee79e572747fe23580f7c2cca7cf59a22655f084e111bec3e146a4d4b6d941cc
 DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
 DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
-EBUILD nDPI-2.0.ebuild 630 BLAKE2B eea945c7fdb4c68e7dc87fd754dc58d6816470b4872639c2ac867978d8e1507c1b9f49f6f07adcc24a87a6343fc09b8af0c917f12b5951893fffbddfe1886493 SHA512 269357550fde0644e13e2597ad9af379c2eb11525d00579bda9a8d67442ec233eaf8b501686c81069f9e1fffa41bf85133d9b94ca8eef0da11566b31238b6fb8
-EBUILD nDPI-2.2.ebuild 1007 BLAKE2B 1af51273f98e60a3b00dae950f500b7cb709bba212efc12e8722afe17a9e0ad7eed4b2cb22b0def165a6fc2e758d20f864cba5bcaecc1c51ae45fc82f7cf6e2e SHA512 acfe331941841949ea601f23a8ac8269a7d19474ba6ed5d7f61289075ca8b8c08534abd8e502b8d5da74ab0110cf3bb22fcf7ffe7f32ce9da92e05d4ff73fb31
+EBUILD nDPI-2.0.ebuild 628 BLAKE2B 22d7c6797b085bd92a24e8fe85c4509c832857d10f6158a54ba2e9dfe0a0d8d3d3731def8fe3df7363d4e7b6191977f15b24a4a9010eeac1462bc9c9f8f866d9 SHA512 af0f66872a28048b36a994727c756e365a611e875976568698160ee59f1c0e6dc9401e743c1197e7dbe51e083611ac0557f18d02dde2282a769054311a49e3dc
+EBUILD nDPI-2.2.ebuild 1005 BLAKE2B 21c2bf8c4ecca6458b8023b2fd530193c2986cf6777db3d981a50b80cf22b002c3d041e70f092c917bfd4570b3bd2679a746f7f7d07c09ca406f1d9c905555c5 SHA512 97821a39be0ae0a1a58d8c9b275a674a1a2fba937588191292cfa7d8b281b3a755259e10845750ef22860d57b2d66016d56b1c680ef4741b72224ed83825227d
 MISC metadata.xml 297 BLAKE2B 2e455c6a6ad027d81612f6f4ec28e25389848def5c8f8ad836ddb920f6b3dfb83a8038c2114194ea7cf79fb63b9ce720f946e02776b0915a41e7eaba0ae4026d SHA512 5f765ad3cc06c790fb16873bc7a759ebb0a432cde847b4e7b8e9dc0f2049441c44d90d54caf007e11deaeca4282ba213f927951060a0ec62bb1836a9cb94e22a
diff --git a/net-libs/nDPI/nDPI-2.0.ebuild b/net-libs/nDPI/nDPI-2.0.ebuild
index bb584aa942cb..4ebbdd771cb6 100644
--- a/net-libs/nDPI/nDPI-2.0.ebuild
+++ b/net-libs/nDPI/nDPI-2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools eutils multilib
 
 DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="http://www.ntop.org/"
+HOMEPAGE="https://www.ntop.org/"
 SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-libs/nDPI/nDPI-2.2.ebuild b/net-libs/nDPI/nDPI-2.2.ebuild
index 6c0160ff6cd8..5900e30b80b8 100644
--- a/net-libs/nDPI/nDPI-2.2.ebuild
+++ b/net-libs/nDPI/nDPI-2.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools eutils multilib versionator
 
 DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="http://www.ntop.org/"
+HOMEPAGE="https://www.ntop.org/"
 SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 9315c8f57646..bd9a3779618a 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,10 @@
+AUX nghttp2-1.38.0-boost-1.70.0.patch 1950 BLAKE2B ed9f72c2f01912176d963fdfb955388c7d40a9ec4e7674f0629166de1d3c249c2f31a3e06c2f82c4186e1f48319bf0bc367e4b4aa25c10faa26ac6e0a118af25 SHA512 7da6199d64b2b1b6b5258841d2ef52fb5617f200de4c63021b4e9b85b9faa6894f4a9c8c9b1b0c35b2984845de5bd80c3ff6d1a67c1fb44cfb24eae0f0afa806
 DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
-DIST nghttp2-1.36.0.tar.xz 1629020 BLAKE2B 7c116988c22801688c50d6d514ddb904920cc54d3c3d141137e6ed8b2182ef4e670f0a0fdebaeabfe0df8cdea4cfd1ee3fb083628f035201f104de6f3614dd25 SHA512 4e0d5c5cdb4f1b7e5f12790850237f36649af4aa9596033392725972e4e0e5a33bb78bd1aa0735e35e489b523b7e9a236a7b5847dfca69bd7583fcab36c13c76
 DIST nghttp2-1.37.0.tar.xz 1628248 BLAKE2B ed5cdfda44b4e38a03d92352520eb765cc1da99080e0cd3e9d663efd5ef2ff219c6ccdbc16cfde001a8377afc796acef250913e1eb422ae2cac2eb95b8f98089 SHA512 67a4b9df3f7f0edad719011fa289d9aa9ef04f31ef3ccf826b861c8830ed24e0743a33b54ab66d198fec7edbf723852b38a2007b335d7f566f702f4b02297b0f
+DIST nghttp2-1.38.0-unbundle_http_parser.patch.xz 2616 BLAKE2B 3f15154d33f32c91aad87f23f56d761501e19e0b53b99d4df720f9e04d6d9c49a52118acbe3da87f8585c2b71b7b430ef60fc33465605f3bf9933635aabb924d SHA512 1b4377b34cf6428164011be9fc86efdd7ab8d3443edf197c45768beea0f843084a842c4cb2abc5179d6036ec99174557e06344ce67a07d98992de64d99faf3a6
+DIST nghttp2-1.38.0.tar.xz 1628356 BLAKE2B 0568d4ac5c1e5e6d7adf762815836502524d59fb55c623f344a8427638407a19447fe1a7753142aa205898f7bda6ebce8ef6f4d85edc6da98ffa98b83d4e363e SHA512 e432d52bcf77379ed5c10ceafb587ec8d66c56bb728cda56487b237cbab1d0073689624419ed306162dab3a51b91cfe0f59cb173b5d81346e2b6d0abd56635bc
 EBUILD nghttp2-1.33.0.ebuild 1861 BLAKE2B 6bf71fd220cacaa02e17ee2ecc6c7dbd9810a0c45d92f63cc09bbf6631d27a4c9126a1691f42b7a42db4ea934c38c1cb753b364577ca89cc4ec318947cb2bdc0 SHA512 9026b56ba1d3b18b02473da0de7d880c95aae9eb208705938142be394424db9d9c7ed2d2033252cf68861f9b1ccb6811f68ed4f660bd92f38f320df5b8456c10
-EBUILD nghttp2-1.36.0.ebuild 1872 BLAKE2B 8e94360bbf5d914e4db55b362d60b8786a9158670b72134b47226c9d01a62b3b6004110ade64611dd653521092b3be2c19820fa9b5aa8430ff7e8da1efff62b2 SHA512 2a0c52c49d6d256e8b32c04100533cc73fed972d269a1d3ef3484159112537b24c8daea962893e031aeb4e4a49307fccb81c4ac6eb2d9d185df43fa617459c1c
-EBUILD nghttp2-1.37.0.ebuild 1872 BLAKE2B 8e94360bbf5d914e4db55b362d60b8786a9158670b72134b47226c9d01a62b3b6004110ade64611dd653521092b3be2c19820fa9b5aa8430ff7e8da1efff62b2 SHA512 2a0c52c49d6d256e8b32c04100533cc73fed972d269a1d3ef3484159112537b24c8daea962893e031aeb4e4a49307fccb81c4ac6eb2d9d185df43fa617459c1c
-EBUILD nghttp2-9999.ebuild 1949 BLAKE2B 56a3fc7ee584692bbf9219aaba3a56c0aa57f7b4479d6da0a12c77ce8b999a1db1aec3cf76203536cdd42254dd8c42ef2df63ba08fade93a0dc674502012858c SHA512 fe76714b538e6f49c44c3beb212f98b17644575a9b049981c44a4537d7501cf9b3f6bbdd2351a3c286d8c1e1c9acce09843eb86660b5ecfb38785ce920db4aef
+EBUILD nghttp2-1.37.0.ebuild 1892 BLAKE2B 5d49eb20ebd6563773800574e2f5c316846658faea3c3febd032da50e432315da6cd6fb83a08561d8410edae24144a443921bc8b7f85304eabf0e9e5219cd2aa SHA512 e3c3e507147a76f30f6668fa334f92d29e63eb9266c718546b256dbbf982002e610817a7cbc6eb4166831e7bbb83855a4a6ad0f7414524f2e5e0fa962265b0b6
+EBUILD nghttp2-1.38.0.ebuild 2339 BLAKE2B 72c0ef2b68b53ac0958777a24aea5ac86ce6af3645997c807b362330b390448086a90824880f62af8e8e83775c0f749c810f11130ddeb25f5ccbce63fc11145f SHA512 ace59fb64bf3e442c0717a72f94cf85f3c3af3b024bc531b7c16689cadb6511d26779c381933912480bb80c03fe0f1cc062ee2d397ad1d3d4c480c790025eecc
+EBUILD nghttp2-9999.ebuild 1966 BLAKE2B 162c885ba4fce06d57655a5d615c3dd7a1b6f01c1baa3b66b61b51ba5a5d83ee11426389f97ce74fc05dea22273418c8b0afe10e59fa52507b18de3ee48fdb98 SHA512 5be35f51f0e4d48e7e5a8bc47f21c73b20e2b7cb0da5c9800499a3387b761ef53e5f7e0b2643253c671481bcad33beaebea2320e154ce7d6f890739e9cd4ace1
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch b/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch
new file mode 100644
index 000000000000..cc1100a0b0ba
--- /dev/null
+++ b/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch
@@ -0,0 +1,50 @@
+From cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Adam=20Go=C5=82=C4=99biowski?= <adamg@pld-linux.org>
+Date: Thu, 18 Apr 2019 12:35:54 +0200
+Subject: [PATCH] asio: support boost-1.70
+
+In boost 1.70, deprecated get_io_context() has finally been removed.
+Introduce GET_IO_SERVICE macro that based on boost version uses
+old get_io_service() interface (boost < 1.70), or get_executor().context()
+for boost 1.70+.
+
+Commit based idea seen in monero-project/monero@17769db9462e5201befcb05f86ccbaeabf35caf8
+---
+ src/asio_server_connection.h | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/asio_server_connection.h b/src/asio_server_connection.h
+index 6be794060..56924c71a 100644
+--- a/src/asio_server_connection.h
++++ b/src/asio_server_connection.h
+@@ -51,6 +51,12 @@
+ #include "util.h"
+ #include "template.h"
+ 
++#if BOOST_VERSION >= 107000
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
++#else
++#define GET_IO_SERVICE(s) ((s).get_io_service())
++#endif
++
+ namespace nghttp2 {
+ 
+ namespace asio_http2 {
+@@ -71,7 +77,7 @@ class connection : public std::enable_shared_from_this<connection<socket_type>>,
+       SocketArgs &&... args)
+       : socket_(std::forward<SocketArgs>(args)...),
+         mux_(mux),
+-        deadline_(socket_.get_io_service()),
++        deadline_(GET_IO_SERVICE(socket_)),
+         tls_handshake_timeout_(tls_handshake_timeout),
+         read_timeout_(read_timeout),
+         writing_(false),
+@@ -82,7 +88,7 @@ class connection : public std::enable_shared_from_this<connection<socket_type>>,
+     boost::system::error_code ec;
+ 
+     handler_ = std::make_shared<http2_handler>(
+-        socket_.get_io_service(), socket_.lowest_layer().remote_endpoint(ec),
++        GET_IO_SERVICE(socket_), socket_.lowest_layer().remote_endpoint(ec),
+         [this]() { do_write(); }, mux_);
+     if (handler_->start() != 0) {
+       stop();
diff --git a/net-libs/nghttp2/nghttp2-1.37.0.ebuild b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
index 20f89187f0fb..f27032d7957e 100644
--- a/net-libs/nghttp2/nghttp2-1.37.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
@@ -64,5 +64,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
 }
diff --git a/net-libs/nghttp2/nghttp2-1.36.0.ebuild b/net-libs/nghttp2/nghttp2-1.38.0.ebuild
index 20f89187f0fb..23ae1e8d57ba 100644
--- a/net-libs/nghttp2/nghttp2-1.36.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.38.0.ebuild
@@ -5,16 +5,19 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
+# 675772
+SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.38.0-unbundle_http_parser.patch.xz"
+
 DESCRIPTION="HTTP/2 C Library"
 HOMEPAGE="https://nghttp2.org/"
 
@@ -30,8 +33,12 @@ RDEPEND="
 	cxx? (
 		${SSL_DEPEND}
 		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+		>=net-libs/http-parser-2.9.1:=[${MULTILIB_USEDEP}]
+	)
+	hpack-tools? (
+		>=dev-libs/jansson-2.5
+		>=net-libs/http-parser-2.9.1:=
 	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
 	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
 	utils? (
 		${SSL_DEPEND}
@@ -44,13 +51,26 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${WORKDIR}/${PN}-1.38.0-unbundle_http_parser.patch" # 675772
+	"${FILESDIR}/${P}-boost-1.70.0.patch" #683368
+)
+
+src_prepare() {
+	default
+	# Remove bundled stuff
+	rm -r third-party/http-parser || die
+	eautoreconf
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-examples
 		--disable-failmalloc
+		--disable-python-bindings
 		--disable-werror
+		--without-bundled-http_parser
 		--without-cython
-		--disable-python-bindings
 		$(use_enable cxx asio-lib)
 		$(use_enable debug)
 		$(multilib_native_use_enable hpack-tools)
@@ -64,5 +84,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
 }
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index e5d039fc7180..0950bfb1def2 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -69,5 +69,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
 }
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c74e04716419..048a85d3a3fe 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -4,20 +4,26 @@ AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5
 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-v12.0.0.tar.xz 22387124 BLAKE2B 7d596a5e7597c358c6b81b7ac1efaf27c2c3202a107c2ea76e55f6d2acced6e1271fe1ceb090df3c2377c73f501c11330f73f60f2f06c3459d7d9f19e9ab11ed SHA512 ca2f40c05e963ec54a8fffac2da1bf61c6f4026c96a4ce688e72d36932d750ecf9ca83c33d5688e565ee7609afc49ea385b4396f2082ff885226d307689299ae
 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
 DIST node-v6.17.1.tar.xz 15858444 BLAKE2B ad050f71452f0ddf989e66a4eb02e88e4e5001faa2bcb0eae6b57784da87ba1d8251201e3a3d15245bb4d846f31f39854ddfae47aa1212c0526ec717438ba778 SHA512 6938c4864a96f5698ebc4e9a1228644820789d5402f42348eb1ff9ccd64f31bb91309a1f3301636b1117424c88b0b41b42baae51a1070d5c532604e5d7d7b868
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 DIST node-v8.15.1.tar.xz 18501532 BLAKE2B e6da98902d665997b2e85472424e00f817353dcfc118b1d309f1305099b145eb0eae33429554ab5d563366182b34b24ac78f8b78794f8d21318ebcd137622131 SHA512 23fb4e2580116a69a58514c2dc1f42098c7d594ea9d0cd6e7090f37e12e1805ca6546df66ee68fcb61b803e287ce34422f55129412f6bdcdaa97f515d9581e19
+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-12.0.0.ebuild 6493 BLAKE2B be374d93cd942b76cfd2efc9e56148d3e1acbc4b115929001710e9cf863365ab25b4256761edc78f3f67405d4ff6b44d1419317b5d397a62b410b492fa1c8b4e SHA512 73595ceacfa28f9db741840fe971fd88e26451d2c2ab039c936e5476f5b3ce043a4af1fa06485828bb8f6433b372d753671630869ff62251fbde0b26ba546029
 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
 EBUILD nodejs-6.17.1.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
 EBUILD nodejs-8.12.0.ebuild 6362 BLAKE2B d2caec942c787ff4af79633f40d145d459df2e7ff7b15c7807a44086aa93dd3f21f4f0a84879ab61f9792d72c0855c3745400b6d791086184649bc22999e4f05 SHA512 b698140ab323e29eddfa4f3d579618206c4a31023ee25be2aff6ca03f321f4e9d3bde7735ac821093bdef62000e0d458e9fe4ae5cc9883b9bff9eb559135326e
 EBUILD nodejs-8.15.1.ebuild 6464 BLAKE2B 047682cbf31f62246cc571d5385918ca8563f83f11f659382ad660867fc3e8cd95bef0940fbb2b4adbcfa82a7e97fb34ccea4037be3eb8cdb3f07af3c6e8ebf9 SHA512 28aebffa55645c850572f8aac9d7aa0f0c233d0abe5b829f80a971e55a65f3b0621e69b52fe8ab2eb3000fe6b84c603bb7f99a56172bed0d9840830222e521a5
-EBUILD nodejs-99999999.ebuild 6394 BLAKE2B fdecf18886a531a438d1f313772370874d4a053a7fcf5c8e5278ce2158263244ce4ac16b8387e0ea9059bb1a9ded1cb4d3934faf1f4d97758a2cd27193ecdcd3 SHA512 c72bbbe0e5ec8f87ac2f2931aaad866625eb5ce8712c978c92bbe8853fcb3cef2591a79afed5e959a66e52d93c4e0595bdf59654d168994bff0947c4efcfc354
+EBUILD nodejs-8.16.0.ebuild 6464 BLAKE2B 047682cbf31f62246cc571d5385918ca8563f83f11f659382ad660867fc3e8cd95bef0940fbb2b4adbcfa82a7e97fb34ccea4037be3eb8cdb3f07af3c6e8ebf9 SHA512 28aebffa55645c850572f8aac9d7aa0f0c233d0abe5b829f80a971e55a65f3b0621e69b52fe8ab2eb3000fe6b84c603bb7f99a56172bed0d9840830222e521a5
+EBUILD nodejs-99999999.ebuild 6401 BLAKE2B d282c564f36650c52d606294f93fee10152bcc980bb37c41dd9c86bf3dea6b48ebabd41b09c3f736a79847ce25e0fdfcc8bcf5ab3f8193739b767f0f44b4c424 SHA512 5c8daea97070b1881a96eded79ac59f666445c869fe661120584c70b5652c820decededa0749e44e24d982980998e78519319bce63e46bf3e8aa49fcb97ee08d
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/nodejs-11.14.0.ebuild b/net-libs/nodejs/nodejs-11.14.0.ebuild
new file mode 100644
index 000000000000..6084b2ec3d4f
--- /dev/null
+++ b/net-libs/nodejs/nodejs-11.14.0.ebuild
@@ -0,0 +1,209 @@
+# 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.8.0:=
+	>=net-libs/nghttp2-1.37.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.0.0.ebuild
new file mode 100644
index 000000000000..7cde2ae51517
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.0.0.ebuild
@@ -0,0 +1,209 @@
+# 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.28.0:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.38.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-63.1:= )
+	ssl? ( >=dev-libs/openssl-1.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 node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	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 --openssl-use-def-ca-store ) || 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-8.16.0.ebuild b/net-libs/nodejs/nodejs-8.16.0.ebuild
new file mode 100644
index 000000000000..059aa2d524ea
--- /dev/null
+++ b/net-libs/nodejs/nodejs-8.16.0.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+RESTRICT="test"
+
+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.23.2:=
+	>=net-dns/c-ares-1.10.1
+	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/nghttp2-1.33.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-60.1:= )
+	ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.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" \
+		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
+		tools/install.py || die
+
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js 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_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+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
+		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
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 2515d4268536..d8f4436a0093 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -23,13 +23,13 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.27.0:=
+	>=dev-libs/libuv-1.28.0:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.34.0
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.38.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-63.1:= )
-	ssl? ( >=dev-libs/openssl-1.1:0= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -74,7 +74,7 @@ src_prepare() {
 	# 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
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
 
 	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
 	# seem sandbox related either (invoking it from a sandbox works fine).
@@ -102,7 +102,7 @@ src_configure() {
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
 
 	local myarch=""
 	case ${ABI} in
diff --git a/net-libs/pacparser/Manifest b/net-libs/pacparser/Manifest
index 76a96a39fbb3..7f42651559ee 100644
--- a/net-libs/pacparser/Manifest
+++ b/net-libs/pacparser/Manifest
@@ -1,3 +1,3 @@
 DIST pacparser-1.3.7.tar.gz 905596 BLAKE2B 122127b6e1d8f68fde4c5ca98207bf2a0fa2a081dbb60aaf34126700a3de9d861e7b5f881e78d3eefdd2a9af97a9ba677339ca2b2a0b4459d26e60a62226e839 SHA512 979238204cd352ecf502a5a6216a35d7c47e82a173c32c6f0a5166f1fe790c66ac74ec1d9d0a58b54038d19e893f8b365ed868664f84ab9d5e653584bf20130b
-EBUILD pacparser-1.3.7.ebuild 1602 BLAKE2B 24ad579d8dd2ddcee81bd046376afa497e729ef768c7b08ed17c42b8be973acdbc1358befb0fa35cc7e23d88bc3f7f3d3605994d8bf9ea1972dcfd6c70e3c396 SHA512 c40f3ea5279259ff52a05041d870797a23879f3a7a512af64e9f0e26bff9a7a52d7bf47f7e53baeb0c8a7cf5d0b2cbd75238d4892b349fe31117f28014b0a341
+EBUILD pacparser-1.3.7.ebuild 1595 BLAKE2B afd77f76ae43a70ca495ca2a40213ed3c491882af0d226fa6ed16cc28e1793cd4e7ffbe285db410f887d9ee357ea22479da96528e8d75d7b60885748f8c8134d SHA512 0034bf23286c3e8f020c7890e792fae634909bac00919eb569a0b4e4da6cab37d2202fafeca8ed87772eae2b0079ea456289378a499650d769e6687b42358051
 MISC metadata.xml 1156 BLAKE2B 6c4e195b94172823c0dc6bbf426c2d8a31d83a0bb7044efa92b9f07f846fa7a2e0ecd4f49678eb517ddeaca43f18942ca9256bc92909cbd1242ed2cfbdbc39de SHA512 e391221061937896f5f27a4d77f959756afdfd1c58f47f4ac5d27e2f289ca70bd7907c86efc6114ec02d03b6f5a88fd3b8d5755bf97dae6e613d7835f2c71704
diff --git a/net-libs/pacparser/pacparser-1.3.7.ebuild b/net-libs/pacparser/pacparser-1.3.7.ebuild
index 7256ae1e8a84..29e87f0c1277 100644
--- a/net-libs/pacparser/pacparser-1.3.7.ebuild
+++ b/net-libs/pacparser/pacparser-1.3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit eutils python-r1 toolchain-funcs
 
diff --git a/net-libs/ripe-atlas-sagan/Manifest b/net-libs/ripe-atlas-sagan/Manifest
index 6425b2e1e5fc..80adf8aa2fe1 100644
--- a/net-libs/ripe-atlas-sagan/Manifest
+++ b/net-libs/ripe-atlas-sagan/Manifest
@@ -1,7 +1,7 @@
 DIST ripe.atlas.sagan-1.1.10.tar.gz 128425 BLAKE2B ba2ec5c3c58d8ec4cfc03dad89d7b3d705796a3e8a37b518fb63cf32ace360c4790401c5ba384cd3ce6690cea30d83413472aeb26c32ba5dfe46908c5170b6ac SHA512 dab5aa200a77ca4f4a29b2cef79df7c12cee4e6ff2583e5cdf1e6e381b9ca4de2e4bf8c56e9856f9b79ed196f72304d62b8cbaa76b0aa9a5d5294559b8f6bbce
 DIST ripe.atlas.sagan-1.1.11.tar.gz 102136 BLAKE2B 21ca1745daa4073d392a50630355bf793e656efb24bb8c529222a5ce20ae209b886781fc51aff8b25b832e1d804ef10d55f8cb8d504021add93d0d23900a9489 SHA512 4c2ba0774be46cf9dc9eafe5904dd7915f21bfa047fcf5867d6e1a41a4370f70cc837d398368efa2f4b24750f655514287dcd5b97a1b47e725fba3f17f49d477
 DIST ripe.atlas.sagan-1.1.8.tar.gz 100037 BLAKE2B 1054dcedb7f31766fcb2dc388efd87c3a5ca12526757adfcf5b7a57a24caf84bbaa0f84c2377cab1877e95bda96b087f1139a950e5e6acb92f60b29fd9322396 SHA512 9e89eff270d58ac0d69abf5c589a129b468ad7adbe49144eae9e3ee1a73ada3278efbf395aea02b612fd3b3b3db2996d68587f5465b1cec29de79b112cb20b53
-EBUILD ripe-atlas-sagan-1.1.10.ebuild 832 BLAKE2B e81bf41f02039cf21770415ae7604bf91f08f35ebb855c3912de2987bb14e5013cb2b3e221daec40b590bab197cd922ccc509c555c220232cbb4d017c78df66c SHA512 38f1d4499182234929fddb6c3c12478d8e39a7c27e9330b28210fbec78a2fdcaf1dc62023dd96124dd1b61c21f433bd69b6fc9ccfbce2e97d4447448980d2107
-EBUILD ripe-atlas-sagan-1.1.11.ebuild 863 BLAKE2B fd97da3111c69b9e4234957352e5a188140d0fc5efa90fbdfd7f8e3aa1798a2fe9947c7055455a67a6fc74d3b21e100bdffbb36d8e995045b54a2a8cea0b660c SHA512 0d8b738097d9c941c16c6ad9689cad2ec7a47a3cb73dcc235916fafe2b51deeacd3a5679c3c1b95f8282b999707130bc7592df3a44188f9025f45ed2264af059
-EBUILD ripe-atlas-sagan-1.1.8.ebuild 864 BLAKE2B 9a80ac735a827b3a89ced89e3862c2386ea449b041d56be064949866fef4ff9968f99b23613e1eaef98fe6458a45809093e87571852a98850f2d90f7c173138d SHA512 3fd7439f7d6490f40403953c452a5161b84aa8a59376a9ac79ddbbebd4ef479617a1a66b887232a9a147af077053c4fc83f16c631f93af3d58bb6cb658370be0
+EBUILD ripe-atlas-sagan-1.1.10.ebuild 823 BLAKE2B 46a65babb7ae9990bf2e020b12a70471a84fc48d13fd7cbc1c1e9ce55a50c889de10aaf4a7cfb49577fa3f9de61b19e53d07acee9756f1354a97cd1692f4f8ee SHA512 c4eee9830df50b841f944956896c1cc4766bda0adb68e2b3e0b920205a84671760a4bf64eeaa79e35d0654abb2a28e1f7f4d98e8c50b0814ffcb4e47b346662a
+EBUILD ripe-atlas-sagan-1.1.11.ebuild 856 BLAKE2B 45359fc23e6bd24a561ba5608209df99834a8c0fbd4e24215eded258744ebecb8d905472c3cbaeb310b25df903b4400aa8b6976d1b61532d8f005afa0f92d861 SHA512 799dde2d232cd25e6d695557b1e8c3202a98ffd123ae2673d6fdbc8b430768a0a3f84143c6b1995c754384eea50acc874c45c4dfa830dff372bb5aa3eee49092
+EBUILD ripe-atlas-sagan-1.1.8.ebuild 855 BLAKE2B 1c0b04f14a3aa18e1e3bff3ecba1bc6742455177c091ae92a1a6c1bb161c583d5002b60baa8aefe816e120c8dbd665b68175723cbf9df5774e06af36726977f1 SHA512 54e487101113b84f484c9596c6e95f509438c45d475fdd73eeea3102546e4113b2d430be9a4148c4af4b9e0c0fa1a497a6da0e0e043ba63c2a1066bb79b4fed9
 MISC metadata.xml 245 BLAKE2B 8861d59570b93b8a74d1547866a7bc2fe18de2b72b16cac928c367570770a591ba1b288080c32f0d6228628974fe707c80c5f236317b4c8d2681d496625b8897 SHA512 a18c8deae207bd61184671671720a29b821623c050edf253b37cdebb500ea1ee84f219baa503cee046b76fb6a8d5ad1ca18cbf646754490aadb040d9b32bdf96
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild
index 55c64671ce04..2acecbf72e02 100644
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild
+++ b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+PYTHON_COMPAT=( python2_7 python3_5 )
 
 inherit distutils-r1
 
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
index e5b1ab37184a..8d0000b89214 100644
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
+++ b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild
index 1c6fe5182120..c573da8f16f0 100644
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild
+++ b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+PYTHON_COMPAT=( python2_7 python3_5 )
 
 inherit distutils-r1
 
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index ad7a6da208dd..f4f3df8b70a8 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 2137 BLAKE2B 89bf9822603a39f7b0d7e70dca6fac80833cf4f51bc11581210f7439e7349eabbb60831380924d02454613798d658cded8dfef694acd13ed4ae50343b9b99963 SHA512 43dc08a91fe547b4511aedf0c1f2d6d920d42935a9b1f9f2ae2950f344ba853e344d945044d2570ff67c2beb72c9e329ec47e65900d7d370164b4729f600e007
+EBUILD serf-1.3.9.ebuild 2132 BLAKE2B 6aa491df385613f5a43515ef4a847500f51f0f9f214be78273ec1916a785dcdb098433e8b4df8975aaa7511aaafff67d1dcacad3e1f581d16c2388eba42c1d09 SHA512 15febb62203fb93591bb31c2b72e1a97c9890e9499ddcebf71278764546d5aec73a9d45aecdeeaf77b3dc070a0157ccd628d54029927e1dbd4dd6f3e5cdd27a8
 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 66d367644854..72c24deb9ba0 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/stem/Manifest b/net-libs/stem/Manifest
index 68a176c7a54a..191aa59bab47 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -2,8 +2,8 @@ DIST stem-1.5.4.tar.gz 1915722 BLAKE2B 37c278eab0d7c7c305d7fcb498ff39460921ff59e
 DIST stem-1.6.0.tar.gz 2049999 BLAKE2B 10846dbd20f22b489fa885e8f100eb2ba4053aca46db140463882cbc1f5701893e6a4a28820100e05e3ed4fa5ff76135a3b20ec1af917a63f63b3abdf5361df6 SHA512 499a15b1cbd12d75865c93e253e797507564d5b5f2a9a0f021107d89c85db040e050944a9ac69b629f74e265d350467bef9d36ec52f7ef2e6a97180a7b93e94c
 DIST stem-1.7.0.tar.gz 2196759 BLAKE2B 2f4bf8a65e5e89b01e6d1054a9d7fe01d4775dc31f1846c300190320361e15a312ce35867fd7d6af2d0cb315894aa5f69f7e8a47cf184e1d9018342028ba1484 SHA512 10750266860f4f90df5d4a3bf24ec68e28d12c84c136c35d2f168f767f4facae3d02cc62dc972a08666689695ea17337a7a6b80ec1c5ed8b9e5035d7417b07f5
 DIST stem-1.7.1.tar.gz 2196854 BLAKE2B 318b762390ad5f1b8a7ad49bd442841d4552cf3d6782c7c912ca8251a076baa6d01bd6f60ea2d79f96994f7c29775c09b815ee41177c638c7e4089e5f4b1b1e4 SHA512 a275f59bba650cb5bb151cf53fb1dd820334f9abbeae1a25e64502adc854c7f54c51bc3d6c1656b595d142fc0695ffad53aab3c57bc285421c1f4f10c9c3db4c
-EBUILD stem-1.5.4.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
-EBUILD stem-1.6.0.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
-EBUILD stem-1.7.0.ebuild 1369 BLAKE2B 66637a43defc8025695cc1431ceb39a5ba3586f810d0d2d3cff6957f3c75a536de9308a2c00eae5bd1b35671c255e3731173181217b04ebaa241189296a4569d SHA512 6ee574e8276e7c446962604daf8896736461fb021c1eccd4c4db37ac85328d842e24929b0fdd5f4553f8f2ca8ffc12317fc94b18d4dc15dbeada6041dd5f91c8
-EBUILD stem-1.7.1.ebuild 1369 BLAKE2B 6b9e15874b40b503d5f5bc102ca885f6458798cb4f9a2fb556a311b4d0e2e641c84aec3b599f239a000086379bd96f38e6406b501b9760ddc90f72b236c8a6cf SHA512 0e736cf6eb14902c96fe24e65e6d15c79600e7b8942b6cd06995fc57885ee561becaed3e115e259af9556f2b460c0d6ac8d793935f2454a37288ae028c8db8d3
+EBUILD stem-1.5.4.ebuild 1266 BLAKE2B e511f2afed177017e6bf017741911b6b212c6c8c94c83fa1495da8d4f0c0ca448c454326f74c425a17a6473708c0b09305691ddd9580e577cd840d4200ed6543 SHA512 9410dd7d125bb313639e90ce54c1e5eb8d0fc4b15bf672dff038adae7799d11665b32e0cbc613c525066446211d27c9e234950a330b9dc220d3304e59a8d5b91
+EBUILD stem-1.6.0.ebuild 1266 BLAKE2B e511f2afed177017e6bf017741911b6b212c6c8c94c83fa1495da8d4f0c0ca448c454326f74c425a17a6473708c0b09305691ddd9580e577cd840d4200ed6543 SHA512 9410dd7d125bb313639e90ce54c1e5eb8d0fc4b15bf672dff038adae7799d11665b32e0cbc613c525066446211d27c9e234950a330b9dc220d3304e59a8d5b91
+EBUILD stem-1.7.0.ebuild 1365 BLAKE2B fe42e20450033d4685a23f8baeaa2c1c549e4af028ae43a0a8100df540551be8149670b951a0697f6b7b017488c03ee649e72aea3098c24254d01ed01a3489a6 SHA512 96ac3ee40126a463c3895d2f9cd841183945e7a51fde91a1302d1960f7ec862382d5bc22242f129213c78f142f05a7fe43b05debab2a4b2041697056b9216795
+EBUILD stem-1.7.1.ebuild 1365 BLAKE2B fe42e20450033d4685a23f8baeaa2c1c549e4af028ae43a0a8100df540551be8149670b951a0697f6b7b017488c03ee649e72aea3098c24254d01ed01a3489a6 SHA512 96ac3ee40126a463c3895d2f9cd841183945e7a51fde91a1302d1960f7ec862382d5bc22242f129213c78f142f05a7fe43b05debab2a4b2041697056b9216795
 MISC metadata.xml 329 BLAKE2B 78eb533a5eea08ade1c17f2a70d204af1452de6d09cab0e4e06582291469b2abfca6cf86dffcf339797285590d3cfca481f14078f9cd5aaf138ba88f95877bb8 SHA512 e0be0234c4994bfff08e1790f82b8728a33961b9896ff5483b19591e2f00fe4b4ad83d42b59e64c056b393c35ec9ae92737f181d9549655853605537ac017974
diff --git a/net-libs/stem/stem-1.5.4.ebuild b/net-libs/stem/stem-1.5.4.ebuild
index b61e4b7f54ef..5387c107ba22 100644
--- a/net-libs/stem/stem-1.5.4.ebuild
+++ b/net-libs/stem/stem-1.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-libs/stem/stem-1.6.0.ebuild b/net-libs/stem/stem-1.6.0.ebuild
index b61e4b7f54ef..5387c107ba22 100644
--- a/net-libs/stem/stem-1.6.0.ebuild
+++ b/net-libs/stem/stem-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-libs/stem/stem-1.7.0.ebuild b/net-libs/stem/stem-1.7.0.ebuild
index 1d52757c667b..5e021eb49a68 100644
--- a/net-libs/stem/stem-1.7.0.ebuild
+++ b/net-libs/stem/stem-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-libs/stem/stem-1.7.1.ebuild b/net-libs/stem/stem-1.7.1.ebuild
index 9a38c64d97dd..5e021eb49a68 100644
--- a/net-libs/stem/stem-1.7.1.ebuild
+++ b/net-libs/stem/stem-1.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 685de829b610..66cea0986429 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -3,6 +3,8 @@ AUX initd 533 BLAKE2B 0e5b218af1b78b3613bfcd33b9c6c941ff708e55dff6383d234aea19b1
 AUX tox-bootstrapd.conf 2171 BLAKE2B 25021453c2be24bad5ff8e5484c41ebf0c2487f326e30af305fd13f949242098c4a0392caafed2653196b56b8c7f495964e465a5ef0d0dbe22100ee58e8aae89 SHA512 b2fc5db3facc47bc9ae13824ff355b2e7fb496f489ef5e5cc01d17d8fe31befa740d510d76130967c858930ae6ef6183a5feff5a6a0b6853a008100859e4afda
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
 DIST c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c3248118846cc17e51f33ba04cf3da12a64578744e47daa27bb8613762a6f562eb550f0b7af05a66696412f6d0a6360 SHA512 a23a87a74fe97091b00ea76676a22578ed1e2426ac777146bb6efc984f1bfd3fff0d7fb149691155b8e2db56e1e088a1884536e5b717ff5c45a87b437f275735
+DIST c-toxcore-0.2.9.tar.gz 510806 BLAKE2B e67bdb86757d1431cc9d627dbc9afa9f54c3deb7814b38c2126849d10e9225aa58d2b23d175622678be74894ea197d3084719422a605d95eb4c55c4597a79f98 SHA512 917826a906a9ca4f04f34494616b8e36ec9e74c6b0709c50e8fe2dd9da680d170013fef242a3fe1b834e8e54cd2dde6be1c14e5d977f8531436ef34280bc3966
 EBUILD tox-0.2.8.ebuild 2757 BLAKE2B 6b95692af1fb7b3aa1ecba363536769a7466c3b0110bb2ce1b0f885767d6d624b7cda900ac891cbf3dcd9b3552b7a99db1523688ace5641ea5799b08ebfcb1c9 SHA512 8bbc00c73c02246985712429187095765677e08f1161438987fe38a26165c45c5dc1bd71acca27001040f6337ad4a307f350bf8efc6b83e56b02d739ff2168a0
+EBUILD tox-0.2.9.ebuild 2698 BLAKE2B 6ca306040efe329b02f083a143f45253f08d1e9580b7dcde040b227927a0a03353e31233cd947e52176423ae951eb81b0a0e3f6f0cb11d3fcbd9162db0e65f70 SHA512 d0f6f23e05d9fe3a291f45d01cc294ab6255f5af958ef8e88d50c66b6615a8d9585648c8b312d0d5e341411fede14181b2fb0c4832d6876d5ef71d0ff71d5504
 EBUILD tox-9999.ebuild 1803 BLAKE2B 68f3351d491a75643265226fc47e90d23e44cc66f772fe859cff87fcd6b88ced56ffead16ebef992701d023bcd97edd7be45b4075ec72b5afd37b91488b22d01 SHA512 f5dc655a65c4f5f6566008367208d71e017889136e02ad0f023b5a065e3b719c447c9918a3673ce6e9b4c8b0cffdcf7e81b0ca6f701f97b21f3ac04b340ba083
 MISC metadata.xml 875 BLAKE2B 0768a021d85945b52d6b62b91b7c374ac97824842f807f66e6dafa9a95a2701cad54b4c41cba8d567848dc5815d1b52ebd670d23699feb8dfe434b7ef0a20950 SHA512 d0cb0ec14129a7c6ddfc4743fc8ebd2e3ac21b0f01738a4a7f2f3a59a6e062097b046764fe8f6e868c6bf6a56041b750bf769c4451eb5265825fb918cde611f4
diff --git a/net-libs/tox/tox-0.2.9.ebuild b/net-libs/tox/tox-0.2.9.ebuild
new file mode 100644
index 000000000000..046b33fd197a
--- /dev/null
+++ b/net-libs/tox/tox-0.2.9.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils systemd user
+
+MY_P="c-toxcore-${PV}"
+DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
+HOMEPAGE="https://tox.chat"
+SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/0.2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av daemon ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+
+REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )"
+
+RDEPEND="
+	av? ( media-libs/libvpx:=
+		media-libs/opus )
+	daemon? ( dev-libs/libconfig )
+	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	#remove faulty tests
+	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
+		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAUTOTEST=$(usex test)
+		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DBUILD_MISC_TESTS=$(usex test)
+		-DBUILD_TOXAV=$(usex av)
+		-DENABLE_SHARED=ON
+		-DENABLE_STATIC=$(usex static-libs)
+		-DMUST_BUILD_TOXAV=$(usex av))
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_AV_TEST=$(usex av)
+			-DTEST_TIMEOUT_SECONDS=120
+			-DUSE_IPV6=$(usex ipv6))
+	else
+		mycmakeargs+=(
+			-DBUILD_AV_TEST=OFF
+			-DUSE_IPV6=OFF)
+	fi
+
+	if use log-trace; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
+	elif use log-debug; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
+	elif use log-info; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
+	elif use log-warn; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
+	elif use log-error; then
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
+	else
+		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
+		einfo "Logging disabled"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/initd tox-dht-daemon
+		newconfd "${FILESDIR}"/confd tox-dht-daemon
+		insinto /etc
+		doins "${FILESDIR}"/tox-bootstrapd.conf
+		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
+	fi
+}
+
+pkg_postinst() {
+	if use daemon; then
+		enewgroup tox
+		enewuser tox -1 -1 -1 tox
+		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
+			ewarn "Backwards compatability with the bootstrap daemon might have been"
+			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
+			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
+			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
+			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
+			ewarn "Then just re-emerge net-libs/tox"
+		fi
+	fi
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4d8b8eb361e5..3c50280f2502 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,3 @@
-DIST webkitgtk-2.22.6.tar.xz 16773696 BLAKE2B 06ef81168f2c5c6a10362d7ebe0270c863e7eccc02a6b1f1486a01c3e583295d12f7ba5aa0ccc1ffa36f7e1c884b144ccc4203cf00f3096afa74957bc6875d71 SHA512 18f4a4c145b524bebf1eaae58057e1e6cb74ba5a162c5195f072ba25c4399e7749c74fe6f8e9351bb9f2630a2c43f59935943e5bb318a5c4977f727a68602709
-DIST webkitgtk-2.22.7.tar.xz 16777676 BLAKE2B 3be5559fce7a07828a7c2a4742218efa5a8434b6e019301b70b969718a3679336b6cb6cf4270bbead814e29c7c19a7c4bf8223df2aa86e1a799364fd9bba393e SHA512 c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126
-DIST webkitgtk-2.24.0.tar.xz 17894000 BLAKE2B 55b43ce104c976f73f9fb71a9c395f0636de5547f62f829c098a709b28668b78dab06f90110e387c5c6f33e2c5033cdfafd6adcafb83d03f77b361d315881397 SHA512 7a1444b22fb59ecdd638344acf3525f1ef9204215a568e185f2ac7f4e43cf89c7be307be31d51ec46231bbf5e9470e48d56395873d7368aca8022ff5c4100dab
-EBUILD webkit-gtk-2.22.6.ebuild 8591 BLAKE2B 2e4fe708fe0f447b8dac402502121436e74349efc97dd431523e520c6224a6f106df6f8b1003161136936d7170945a158310e5e6b1713364f4906ff53d940432 SHA512 ee6190bbcfe0d606d008e8fefe794924a7d4775f7fb607969979f881e85d303d9147f5fe7984c41b41ea51ddf9951137b37bc3152b0666ec21498642b1e63642
-EBUILD webkit-gtk-2.22.7.ebuild 8593 BLAKE2B 8fdc7760528157cd87feb2b8f8c96cc1ad62e68bbdcad93581502478b9799382a6feed8ad63cde0201c9a2674247572d1afe20d752ffc4aa7b04a7946260eeee SHA512 e2596a89b2c2b9efd4c7fab362bb5eb9002c678ddfe3b409041f0d29754bf61a51b6e43d4d195f67b3c6aceaea0a291e3d0a389562cd654011463df1a780ace8
-EBUILD webkit-gtk-2.24.0.ebuild 8592 BLAKE2B f6c61fa416e2499aa91cca91ef7e2c041a743e58531108d9ac5a1b5523d30cc807c93898b155b9327f835fdc45f42cce081f7928e9a001918b728fb01a797ec0 SHA512 0cef52d139318c3a12e7b951a603a7bf476cda1eb37767e6dcb3216d09cfbe663f98d22ee1e91bf0e7c3cb8532efad9f905082f56e37458a289bda776f80d6cc
+DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca
+EBUILD webkit-gtk-2.24.1.ebuild 8333 BLAKE2B ba3466a372079f14ca5cc6e7add3f61c3e4aac077accfac1c5807da62bb7226bc366640873d654ef49301880ddcf0bff21126b5c0064301bb0ef0a9e086f212d SHA512 65022625db7ae7cf19d45525c18675ee3c53122f2c9a3939b80b3e2cafdcc129ae0dd32a319861e6998bc1a9f29e1a0d3806817ca60efc80bbee0fa3e334d9b2
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
deleted file mode 100644
index 24f6c402a5bf..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-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 +jit libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-# non-GL builds are (temporarily?) broken - https://bugs.webkit.org/show_bug.cgi?id=193380
-REQUIRED_USE="
-	^^ ( opengl gles2 )
-	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.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[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:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	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
-
-	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-lang/perl-5.10
-	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
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	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
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# 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_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)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-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
-	use jit && 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
-	use jit && 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
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild
deleted file mode 100644
index a75cb189b4f6..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-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 +jit libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-# non-GL builds are (temporarily?) broken - https://bugs.webkit.org/show_bug.cgi?id=193380
-REQUIRED_USE="
-	^^ ( opengl gles2 )
-	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.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[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:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	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
-
-	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-lang/perl-5.10
-	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
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	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
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# 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_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)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-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
-	use jit && 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
-	use jit && 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
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
index f77fdc38578f..5e332dec8436 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+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
 
@@ -15,9 +15,9 @@ 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"
+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 +jit jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+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
@@ -113,7 +113,6 @@ DEPEND="${RDEPEND}
 
 	doc? ( >=dev-util/gtk-doc-1.10 )
 	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
 "
 #	test? (
 #		dev-python/pygobject:3[python_targets_python2_7]
@@ -168,9 +167,6 @@ src_configure() {
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC
 
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
 	# 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"
@@ -225,7 +221,7 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.0
+		#-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)
@@ -235,7 +231,6 @@ src_configure() {
 		-DENABLE_VIDEO=$(usex gstreamer)
 		-DENABLE_WEB_AUDIO=$(usex gstreamer)
 		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
 		-DUSE_LIBNOTIFY=$(usex libnotify)
 		-DUSE_LIBSECRET=$(usex gnome-keyring)
 		-DUSE_OPENJPEG=$(usex jpeg2k)
@@ -271,7 +266,7 @@ src_compile() {
 
 src_test() {
 	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
 
 	cmake-utils_src_test
 }
@@ -280,7 +275,7 @@ src_install() {
 	cmake-utils_src_install
 
 	# Prevents crashes on PaX systems, bug #522808
-	use jit && 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/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
 }
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index f857e0171092..d86fd7e840c9 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,4 +1,3 @@
-AUX zeromq-3.2.3-unused-variable.patch 4012 BLAKE2B 8ce02ae0eb5696977e65ee28687418ff929268ab93ea0e7207b3aa8c0ce38205d2ac3cb33cd4758811f99ab64b0efbfb276a0d3b4546f48475e763bc7b6d32be SHA512 c54ee2ff1d11c33c734b7696a3fa98be8e0a5025678ac31599c652a4f0e2b507f41de3aae8d6808086bbe72fd0d485945ed2b822f984c2053f1f6f69b62a7b1f
 AUX zeromq-4.3.1-fix-test_security_zap.patch 1008 BLAKE2B 17f5a316601af1c8e7c307a964f69bf0d59c55ee0a9076eee4a909768307cef8be0d901d6ecae10381505b96bda95f20ffa0d1bde09e8c1bf6f0fc2959e9f065 SHA512 e813dc7488c5a81731f5649b2ecc533e55c4a3f69b904a1fbf2446ad6282ece96a64850b70f675c6cb0e20636c4654786ffdc99742ae1325c16469735e7ea616
 DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
 DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb5e40aef85ae8cd8fedef4c655fd2698a7f81431e34550b5156814a75c0b1a738393e7c44acbfefe96acc4c4bc SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f
diff --git a/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
deleted file mode 100644
index 9fb86fa7d5c2..000000000000
--- a/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Fix building with -Wall.
-
-Description from upstream repo:
-    Author: Pieter Hintjens <ph@imatix.com>
-    Date:   Wed Jan 30 23:53:23 2013 +0100
-
-        Various cleanups to test programs
-        
-         - Patch applied using git am from libzmq commit 5f009e52
-         - tests/test_raw_sock.cpp doesn't exist in zeromq3-x, so that
-           file was manually removed from the patch before 'git am'
-        
-        Signed-off-by: AJ Lewis <aj.lewis@quantum.com>
-X-GENTOO-BUG:     483318
-X-GENTOO-BUG-URL: https://bugs.gentoo.org/show_bug.cgi?id=483318
-X-UPSTREAM-URL:   https://github.com/zeromq/zeromq3-x/commit/bdd72826c96fa7cb6a8d2e5cf688c973a8e8d42f
-
---- a/tests/test_connect_delay.cpp
-+++ b/tests/test_connect_delay.cpp
-@@ -61,12 +61,12 @@ int main (void)
-     assert(from);
- 
-     val = 0;
--    zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof(val));
-+    zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val));
-     // This pipe will not connect
-     rc = zmq_connect (from, "tcp://localhost:5556");
-     assert (rc == 0);
-     // This pipe will 
--    rc = zmq_connect (from, "tcp://localhost:5555");
-+    rc = zmq_connect (from, "tcp://localhost:6555");
-     assert (rc == 0);
- 
-     // We send 10 messages, 5 should just get stuck in the queue
-@@ -112,7 +112,6 @@ int main (void)
-     // cause the pipe attachment to be delayed until the connection
-     // succeeds. 
-     context = zmq_ctx_new();
--    fprintf (stderr, " Rerunning with DELAY_ATTACH_ON_CONNECT\n");
- 
-     // Bind the valid socket
-     to = zmq_socket (context, ZMQ_PULL);
-@@ -182,7 +181,6 @@ int main (void)
-     // block. Then we reconnect and verify messages flow again.
-     context = zmq_ctx_new();
-     void *context2 = zmq_ctx_new();
--    fprintf (stderr, " Running DELAY_ATTACH_ON_CONNECT with disconnect\n");
- 
-     to = zmq_socket (context2, ZMQ_PULL);
-     assert (to);
-diff --git a/tests/test_disconnect_inproc.cpp b/tests/test_disconnect_inproc.cpp
-index 7875083..d6b68c6 100644
---- a/tests/test_disconnect_inproc.cpp
-+++ b/tests/test_disconnect_inproc.cpp
-@@ -40,16 +40,14 @@ int main(int argc, char** argv) {
-                 zmq_msg_t msg;
-                 zmq_msg_init (&msg);
-                 zmq_msg_recv (&msg, pubSocket, 0);
--                int msgSize = zmq_msg_size(&msg);
-                 char* buffer = (char*)zmq_msg_data(&msg);
- 
-                 if (buffer[0] == 0) {
-                     assert(isSubscribed);
--                    printf("unsubscribing from '%s'\n", strndup(buffer + 1, msgSize - 1));
-                     isSubscribed = false;
--                } else {
-+                } 
-+                else {
-                     assert(!isSubscribed);
--                    printf("subscribing on '%s'\n", strndup(buffer + 1, msgSize - 1));
-                     isSubscribed = true;
-                 }
- 
-@@ -66,11 +64,6 @@ int main(int argc, char** argv) {
-                 zmq_msg_t msg;
-                 zmq_msg_init (&msg);
-                 zmq_msg_recv (&msg, subSocket, 0);
--                int msgSize = zmq_msg_size(&msg);
--                char* buffer = (char*)zmq_msg_data(&msg);
--        
--                printf("received on subscriber '%s'\n", strndup(buffer, msgSize));
--        
-                 zmq_getsockopt (subSocket, ZMQ_RCVMORE, &more, &more_size);
-                 zmq_msg_close (&msg);
-         
-diff --git a/tests/test_last_endpoint.cpp b/tests/test_last_endpoint.cpp
-index 5f121c4..ef3230b 100644
---- a/tests/test_last_endpoint.cpp
-+++ b/tests/test_last_endpoint.cpp
-@@ -29,11 +29,10 @@ static void do_bind_and_verify (void *s, const char *endpoint)
- {
-     int rc = zmq_bind (s, endpoint);
-     assert (rc == 0);
--
--    char test [255];
--    size_t siz = 255;
--    rc = zmq_getsockopt (s, ZMQ_LAST_ENDPOINT, test, &siz);
--    assert (rc == 0 && strcmp (test, endpoint) == 0);
-+    char reported [255];
-+    size_t size = 255;
-+    rc = zmq_getsockopt (s, ZMQ_LAST_ENDPOINT, reported, &size);
-+    assert (rc == 0 && strcmp (reported, endpoint) == 0);
- }
- 
- int main (void)
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /net-libs
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)