gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /net-libs
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
254 files changed, 1813 insertions, 2780 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ff25c3fd9a8e..52d44da8972b 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/NativeThread/Manifest b/net-libs/NativeThread/Manifest
index d4a274e3686a..8df856322e3a 100644
--- a/net-libs/NativeThread/Manifest
+++ b/net-libs/NativeThread/Manifest
@@ -1,6 +1,3 @@
-AUX Makefile.patch 759 BLAKE2B c6d93212714791d7d4dc316021f8efde41602bcc1fcf6d6b4aa469b868a9bdcdd6052cf2350613d4609227d9291a1b79e143a8e5f8ebbfaebbe24677b1ee42ae SHA512 6304da105ce09cb5fad241bd5ed6486ae237551143676feab1668c3e8777a68458bedc4d4a53710a115ec4d608985600ef54e0baecd162c1236fdbdcedf88b18
-DIST NativeThread-0_pre20080330.tar.bz2 2707 BLAKE2B d1b97be9b8b6ae33f716202b7acb246101175d2445a9f92fbada99969471ae06495f94cd03b9de9666af11e1e36506ba979f19707871c6e615dfc8887eb8171a SHA512 c6c4b26e82c02cb4039718e8085f54fad3d2492b3905dbd91b8798c1140a819cf1fab1b8346ab2524e0619d2921b4ae9de6ffa9c18138bccd965e67c28b05ed7
 DIST NativeThread-0_pre20190914.tar.bz2 3163 BLAKE2B b16aa3ceb3ea18ea13962e53d68fa2eac1854b9141055de251eedf0c9a2cc284e68f3f2601f49d1ac1d7fcef9fc502bf1877161fdb43b1b941a3b9983829e4a9 SHA512 ff0902b874c72f0e15f35374d0a409271ba236343cf24bc708bc7a72677a9a582013bfb7a1e8fdd2aabb741bb5dc04dc901ff4c09841a85324194644d40c58e6
-EBUILD NativeThread-0_pre20080330.ebuild 618 BLAKE2B 0ff63e6d26fe144179206dec92fe4efdd757709c663afe9224edaee3c9dd3712ccebe9ddeab61a819b1b20e9f458ed3740ee85e493b0da24346ce15451089ca3 SHA512 5ff966a63512638875078a937f25084c210e6275ce556abc83a928f8c510ad73a002ed1bfdffe7e4450416fee4e706b6a60e2d7b29ccbb0620492b68ffa809d8
 EBUILD NativeThread-0_pre20190914.ebuild 630 BLAKE2B f15e5af7589475f7f6681f83d108c58f3caba1ba9fe653aa3f55cdc5c6cd5efe1b810dce50151e0d8d173c5e332a8ccf2c74cb60346853b5ee428174cc3d9bba SHA512 7f92a4aa331cd637939ff3c87eee0cacf293c4312d72d2a04ea0645ecdb002dc662309cc3c3eca5dd76043f8309fb7b2223654b0997db2bcb1bd79a291d7a85e
 MISC metadata.xml 256 BLAKE2B d4cddf1e47808cc6fed0829aa4bfe16d930ee2e12bb3e7355ed4871b41e42dac196735be01fe9b38464183039f2df7f88cdd26750461dc9a3268f9844e3373fd SHA512 26e53ead25d8fef36a3759518b200c6a4ea0fc24d2c1f054ed85772cba5644118b231438d723ca25c22a55ed2fcf54e2c467279c9f3b49b6c1ced9997e3f098c
diff --git a/net-libs/NativeThread/NativeThread-0_pre20080330.ebuild b/net-libs/NativeThread/NativeThread-0_pre20080330.ebuild
deleted file mode 100644
index 219fd6f55fdc..000000000000
--- a/net-libs/NativeThread/NativeThread-0_pre20080330.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic java-pkg-2 toolchain-funcs
-
-DESCRIPTION="NativeThread for priorities on linux for freenet"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=net-p2p/freenet-0.7
-	>=virtual/jdk-1.4"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/Makefile.patch
-}
-
-src_compile() {
-	append-flags -fPIC
-	tc-export CC
-	emake || die
-}
-
-src_install() {
-	dolib.so lib${PN}.so || die
-}
diff --git a/net-libs/NativeThread/files/Makefile.patch b/net-libs/NativeThread/files/Makefile.patch
deleted file mode 100644
index e1f0209a6f3f..000000000000
--- a/net-libs/NativeThread/files/Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile	2008-03-03 13:59:06.000000000 +0100
-+++ Makefile.new	2008-03-30 16:27:12.000000000 +0200
-@@ -1,14 +1,14 @@
--CC = gcc
- INC = $(JAVA_HOME)/include
--CFLAGS = -Wall -O3 -fPIC
--LDFLAGS = -shared -Wl,-soname,libnative.so -I$(INC) -I$(INC)/linux
-+CFLAGS += -Wall
-+LDFLAGS += -shared -Wl,-soname,libnative.so -I$(INC) -I$(INC)/linux
- LIBS = -lc
- 
- all: clean libNativeThread.so
- 
- NativeThread.class:
--	javac java/NativeThread.java
--	mv java/NativeThread.class freenet/support/io/
-+	javac -classpath /usr/share/freenet/lib/freenet.jar NativeThread.java
-+	mkdir -p freenet/support/io
-+	mv NativeThread.class freenet/support/io/
- 
- libNativeThread.so: NativeThread.c NativeThread.h
- 	$(CC) $(CFLAGS) -o libNativeThread.so $(LDFLAGS) NativeThread.c $(LIBS)
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index ecbefed60ede..72136e0d2f21 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,5 +1,7 @@
 DIST aqbanking-5.7.8.tar.gz 3818825 BLAKE2B 6536b11251fda4977fd964f513f4b2bb23cd14d62adffdd18e7508afe85d660b86aa1aadc80fe4ba47c5b393659ba7139c65eaf342795f6f05599efdd2c3904d SHA512 4078c3bc2c0b6f38f853fed064e37b6188c0b8158416ca6482756232ef8fe71e9cc1df0abe8c6bcbe8a7e818c24210f553c367f540d60cb7b7cf0161a9ca7117
 DIST aqbanking-5.8.2.tar.gz 3824997 BLAKE2B 529867a9e814d0e46ff2aac1da25a369c9a8722f41364c6ef15dce0ed861b7a5bab104fb5b30a151c6e11071c0a067aa1192a4ceda67ee50698f80053ac8e33a SHA512 2a8d87396fa8926fa338cf0a7744649512ecd773741fa24ad69a52bf65d4df881365c0fc31c3a14f718184032a7f1a596e74f63d6ffdaa05c29aac23e26bd4ae
+DIST aqbanking-5.99.40beta.tar.gz 2483513 BLAKE2B 0da77f804fdca1b00558b9e88e7c04cdb89489b43ccabc533785a30ff604d8be3ee62d82224b079040e571e7a86daa18af5ff4aefb281164ff123c640778bb10 SHA512 10cde2d4f3015b7a077b7aeb189f122715663bd9d530af0f96748ace828d9ffa51d5751ad20fb9d1e3e71607730a9b68be55c3f12740f96b31ef517e61bc1350
 EBUILD aqbanking-5.7.8.ebuild 1597 BLAKE2B 23dfae67ac7874727307ac8bae890b804ff84cea65f1ec6f239cad33891541ab81e9ab80e6956dddeaf74fc365ceeba6fef5b71bc4eb159630a88f201c52f71b SHA512 5ff2f013a85766a9c292bbcfaaa51dfdad02871d98d7639444d72f02720a6ad616482738ed07064e037c42a64020fe50c586cee724c54027cb94db752eccfabd
-EBUILD aqbanking-5.8.2.ebuild 1442 BLAKE2B 820d35f33a90f08919e79f4be090e4c89728d0500434e4c8fdd2299a0cd4f3471fa8a66de15b9244ee517ac4a7e5884a1c511795b091d291fdf21a41465b1d60 SHA512 d6b99d4ce6f00cea20a412964434fadafbfd4e2d96c1565ce23061fe419a0f184daa3abe01c2be8a5fca08c66b377aebeaa40778296ab95a26ca62467873a631
+EBUILD aqbanking-5.8.2.ebuild 1454 BLAKE2B 9c008c308d7ba122076de9d94492619ab13fdbd0bda80ea46d17ef60bb8c5e712be92099e6db4b3a04d39022b39a88a250346dc9277e40623dae15059beb68f2 SHA512 5505c4150f5915cd349b6d6331c5025f9c996df59b377ecf0f441502a34f1c125620bf7824660ec4674d95028de724b11301c97b580a5e2084d823cd89d7b799
+EBUILD aqbanking-5.99.40_beta.ebuild 1411 BLAKE2B 7ee82cffff9f2ec359cd92d0d6184869b234d99e1cedffd6887aace370de08f9467498d2bf3918573476f274c4839275bc4fa24718f8c449f9986127da6d375d SHA512 e8930fa92cdf140d562296740b291e426bef3e01e7f6e72d0201390f5710ae0a5cf40f90376e3affe03229f8ad68545e8ff7aa793d33f6e7da87bc41bcc5bfd6
 MISC metadata.xml 412 BLAKE2B 71c913459f7d3fc1d6bede5ee1e78fd189b840cff496c1e0da86434143be173cb7f00f8457174f9e9b6b22a3a9673a316e7a80649ab6ebaa7cb4c4f7c10270c2 SHA512 d32767c7a1c63a22e61318687c3591d86b2adaab9773d3330b451c099306412003bb07f449c3cbf0791b8d2370e742ecc3922076e9bc8e6c0a1ad7fc92d24999
diff --git a/net-libs/aqbanking/aqbanking-5.8.2.ebuild b/net-libs/aqbanking/aqbanking-5.8.2.ebuild
index 1c31017cf4da..cc4d60b4f88d 100644
--- a/net-libs/aqbanking/aqbanking-5.8.2.ebuild
+++ b/net-libs/aqbanking/aqbanking-5.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/107/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="chipcard debug doc ebics examples ofx"
+IUSE="debug doc ebics examples ofx smartcard"
 
 BDEPEND="
 	sys-devel/gettext
@@ -20,15 +20,15 @@ BDEPEND="
 RDEPEND="
 	app-misc/ktoblzcheck
 	dev-libs/gmp:0=
-	sys-libs/gwenhywfar:=
+	>=sys-libs/gwenhywfar-4.20.2-r1:=
 	virtual/libintl
-	chipcard? ( >=sys-libs/libchipcard-5.0.2 )
 	ebics? ( dev-libs/xmlsec[gcrypt,gnutls] )
 	ofx? ( >=dev-libs/libofx-0.9.5 )
+	smartcard? ( >=sys-libs/libchipcard-5.0.2 )
 "
 DEPEND="${RDEPEND}"
 
-# DOCS=( AUTHORS ChangeLog NEWS README TODO )
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
 MAKEOPTS="${MAKEOPTS} -j1" # 5.7.8 still fails with > -j1
 
diff --git a/net-libs/aqbanking/aqbanking-5.99.40_beta.ebuild b/net-libs/aqbanking/aqbanking-5.99.40_beta.ebuild
new file mode 100644
index 000000000000..306c5d10f901
--- /dev/null
+++ b/net-libs/aqbanking/aqbanking-5.99.40_beta.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_beta/beta}"
+
+DESCRIPTION="Generic Online Banking Interface"
+HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/203/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug doc ebics examples ofx"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	app-misc/ktoblzcheck
+	dev-libs/gmp:0=
+	>=sys-libs/gwenhywfar-4.99.22_rc6:=
+	virtual/libintl
+	ebics? ( dev-libs/xmlsec[gcrypt,gnutls] )
+	ofx? ( >=dev-libs/libofx-0.9.5 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+MAKEOPTS="${MAKEOPTS} -j1" # 5.7.8 still fails with > -j1
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local backends="aqhbci aqnone aqpaypal"
+	use ofx && backends="${backends} aqofxconnect"
+	use ebics && backends="${backends} aqebics"
+
+	local myeconfargs=(
+		--with-docpath=/usr/share/doc/${PF}/apidoc
+		$(use_enable debug)
+		$(use_enable doc full-doc)
+		--with-backends="${backends}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rv "${ED}"/usr/share/doc/ || die
+
+	einstalldocs
+
+	if use examples; then
+		docinto tutorials
+		dodoc tutorials/*.{c,h} tutorials/README
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 629de0c5e795..22afadfa4886 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -5,5 +5,5 @@ AUX c-client-2007f-openssl-1.1.patch 2857 BLAKE2B 748933d521a99409234e62cfee1c98
 AUX c-client-2007f-topal.patch 1078 BLAKE2B 5224ac12119e25c3208865bf1904a21c9d4bd880b685bea1389cc32a30764e8673606085f2d58ec12532618807d61257e02ed2d9b178014c8ba78f9defba1f72 SHA512 f81914d9d0acf92625d2a4956aa82e9639bc36ab12c608dafb8137afe619f6acc5d9647d05a1827bfe27b21c9dd774bd458c8cfa2e5c2e449ed956daed674b00
 DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
-EBUILD c-client-2007f-r6.ebuild 4606 BLAKE2B 6e1f98e0e2cc0baf47216c7bbafa828c64589362820e5678afc5fec347cfa326c38867e369c02f228077a9be521b3733b0fb3729369e621c693e88d2bb11eff2 SHA512 cbf38189f21509d53b078a723c99349e318dc7a371a5509a96abbf3e7235bd9223b2bf65666640a32ee78ec3b82b1575f4f3b9ac3c29f3fe11baf52aa3b7173f
+EBUILD c-client-2007f-r6.ebuild 4584 BLAKE2B eab69e7acdb6691357123663d02daff808c5e892f935f358f2c9271ae8873ec42ffe44c2996b0c363c9ececf9f7b3e27eb9cf03c42a40fc5ee1764df989a8fd3 SHA512 821cbce58b6a6091956a10d51147fbf34d965dff7f489ea56c834f2a44004d3d2b648e47617d4f8a3531f3f8d976913d93733c50536d562f0d4c536034432821
 MISC metadata.xml 480 BLAKE2B 1e688b1b8c76882dfbce8625873104438c89652149a9a14069d8692a469101fb7cf4036151e42f888558d8eb4062817f9481e9552b4882bd285f1c73ed821364 SHA512 b59bb7820763cb1c5dab4b0166fafc424fa76aa24465c44c7314ca8ed0b0f0b4d5066fca335cad963d5c4737be1b1d02ff929f0b2a5c5d234728669ddb5379a9
diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild
index b46fffc10c62..46091dce4391 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa"
 
 RDEPEND="
diff --git a/net-libs/ccnet/Manifest b/net-libs/ccnet/Manifest
deleted file mode 100644
index 4a82cc7aa7f7..000000000000
--- a/net-libs/ccnet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ccnet-6.1.8.tar.gz 179374 BLAKE2B 8eb05a9d2c8830c501b63f939df56cb72a6b03f7dbdf511adf1a89eff86bdc85ad804de04a2ed57f235f76e95fe1a4ab317f415be0051024bfcd7d099e9e2cad SHA512 5eb3765969edd471a43575545f92f6317741a2099bb7af82851bfe726b0715420e5b946c63435c334c4447888f1454d7cd0703f29818571eaabc2250046c45f3
-EBUILD ccnet-6.1.8.ebuild 992 BLAKE2B 4793324c0cb4f581cb598fac1a13a5394a69990df05a16220b65110c1081a6d9f4cc511463d32e4b4b5bee7f065eedde9b2999ebb61e68ea30b17ea5961680a1 SHA512 34f4afe88309f9331ae8a5a8fd48a108f22ba956af0de0ef51a40112a280be1541fa311c486dca9b2aa1295a8e27a7e0978b2a00447cbd70ed94f0ea4084c1d2
-MISC metadata.xml 244 BLAKE2B 1493b7ed9db33a79674a643ebdf17ecaa25eb1ae07cd66eed506e5be57dc1ab624708a96e48e93746e967b0b9b36b58a1fb498e30a6823adaa74400aa8ff1d34 SHA512 79803b3a138023e170943c1446e54f3d310f91d16568c6a235627e456958a1531b8b236da8d3e961feefd75fc51837011904f8f3172c5cd520cb0136b9f9f660
diff --git a/net-libs/ccnet/ccnet-6.1.8.ebuild b/net-libs/ccnet/ccnet-6.1.8.ebuild
deleted file mode 100644
index 74947e965f55..000000000000
--- a/net-libs/ccnet/ccnet-6.1.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="Ccnet is a framework for writing networked applications in C"
-HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/openssl:0
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/ccnet/metadata.xml b/net-libs/ccnet/metadata.xml
deleted file mode 100644
index e77d26910ef5..000000000000
--- a/net-libs/ccnet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">haiwen/ccnet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/ccrtp/Manifest b/net-libs/ccrtp/Manifest
deleted file mode 100644
index fca024892534..000000000000
--- a/net-libs/ccrtp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ccrtp-2.1.2.tar.gz 764869 BLAKE2B 8fc3aa22e715078dae64407da8b8c2dc6740994dad7bf7dab6369b1708e6261619107dd7484b1ec801b7a8bbb30d3387d8fab9c3503adf09209b2b8aeb6df56d SHA512 a835f57a0eef7cba11c55c93ce2f11ebd8ab4099e7c723043c51e4872f3da87af946fc50fac18b47ea5d72b2a1227b377810e9134c1f3a8982d4ce5944d043e9
-EBUILD ccrtp-2.1.2.ebuild 665 BLAKE2B a6a192169ddf20c649bcf388c246a6c9437a8b9d6a05c1b0f981c6c118a2430a4fed90bc08c772c61ba9b1a8a03ae9d7ead41a3081e87c7c8479bc6d99e6a256 SHA512 bdf29138f4f548c55181392ea3b88df27c704028853491093b8c5cb0c1245b12bc21561291ff076dfba8a8582d314c0f4e7fa8398f517166da11893400ac4be1
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/ccrtp/ccrtp-2.1.2.ebuild b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
deleted file mode 100644
index 3a37c3fa5214..000000000000
--- a/net-libs/ccrtp/ccrtp-2.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU ccRTP - Implementation of the IETF real-time transport protocol"
-HOMEPAGE="https://www.gnu.org/software/ccrtp/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-LICENSE="GPL-2"
-IUSE="doc"
-SLOT="0/2"
-
-RDEPEND="
-	>=dev-cpp/commoncpp2-1.3.0:0=
-	dev-libs/libgcrypt:0=
-	>=dev-libs/ucommon-6.2.2:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	use doc && HTML_DOCS="doc/html/*"
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/ccrtp/metadata.xml b/net-libs/ccrtp/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-libs/ccrtp/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/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index a7e3a4652bf2..8de7d003c83b 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -6,9 +6,9 @@ DIST courier-authlib-0.66.4.tar.bz2 2192331 BLAKE2B 8fd68153b2defb63bbafb44b34c0
 DIST courier-authlib-0.67.0.tar.bz2 2194546 BLAKE2B 2ccb6ed15c2f02d206606f8bba04c9f2da415da3d739e456914e44010c955c9aaeae1f1c0746c8812f5165eb8db1997284e1c378132a6144da2b8f77d77a6eff SHA512 6e3da28d555761177727c44b1422bf5baf6ffbf28f53cea89a4a8e13daa5433803deba1614295d9679c41b5be4750f464e7869a2d3ecbfd91ae84e7281c4f3ef
 DIST courier-authlib-0.68.0.tar.bz2 2194982 BLAKE2B e463390b49bb3ca147467d3054a83d5a8ce96b604bde0b624c4d7ce81235c6f747e5d847dde794c81c4ad36aeef49bdd27cf904142b4542df833484c5eb7a57e SHA512 5c4adaf0fd69f4b9e780962aa3f9eeac6b15cea3f302288ff4549ce2b0be9ea0808b4501670ef3c4e0419c3d27505c256c082f795dea4683dd5265fd7dcab93b
 DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
-EBUILD courier-authlib-0.65.0-r3.ebuild 5172 BLAKE2B 2bc31ffdfa5284c3d7054ef698bd82bbd1a36156091dc7ca409940c26e95da1eb4a579229e2615341fd6f2d4d1001e2ad240a61894786b20315092bacefd9da9 SHA512 59c9da719125282e3a26b6d2e604dc49950b1c10fb3d66a685cade000a35355d5a824cbfb96ea1b16a9bf6cf64ed82b8d8ddd4f6af925dc29faf1ec075707a8d
-EBUILD courier-authlib-0.66.4.ebuild 4512 BLAKE2B c348788f85b636efe9d19d3d2e2b4b7155865a546898a099db5f20c40c996dec5cf841086060760d13b9064f226a87c5b8e71e35103b59b8d7c201255da40d40 SHA512 e46992d601717a0d5d3c5f52c345c61646e317bad878fe2ffaab57ae3e0c4339232bcbe87422ce8626de9807ec38bfe12b770a0be10edd4523d4b6261d388dcb
-EBUILD courier-authlib-0.67.0.ebuild 4565 BLAKE2B 421bdda6b5a0db98de2359ff6bca26da3675b16c833db575f98b8013d3fdb84e81d7b84f01f08e36f306213657e3db02dc08d9bf0e8762806aaa09a4309e95a7 SHA512 c1458bf707a9d03985351c0e25a648ced09a4545a5928a2a718efd4f15b9a0fceaf02e4634a56a7eb79604fea98f4531e093f73b96e6fe6a140ee4f1f38b2e8d
-EBUILD courier-authlib-0.68.0-r1.ebuild 4569 BLAKE2B 87a0fab1111584bdf4ae3c4e81b52d71074f1e1ecc7f5682ea83b35e20a941a86f033e0a50cbc0da4260627128b1357c55e5ab1c35b17a53241468a872c81deb SHA512 8e0a63aa39d46896e0c5ad90125867b552adcfaa8ea3d35175062abbb43bbff4c73da794f6cc2c5a547eeb4e1f5cc3ae2e1eba2aa81868c89f3daa9c11de6bb8
-EBUILD courier-authlib-0.69.0-r1.ebuild 4521 BLAKE2B 8ec727ae2d723d9a2bac5eea1bb8f3b1eaa094100b7567e36edc067059d43913bedf3798dff89cd28b73c4a21390f7b90909f6601e4c92d291e030bd8b5c54d3 SHA512 25dcd20aeaa85ac76624417af315171a0601a3137b0536473c85069821e793034b94ac960edccacab4f7f38f1b2bd3300e9d9f4990ebbaf08e26df425391f9c3
+EBUILD courier-authlib-0.65.0-r3.ebuild 5160 BLAKE2B 97bd4ca75aa660b49f40e7458d621bffe7ec1cc88129316edf1c623ad68e64035197cc3958a8ee586f2a6595a842205e81f885acff7c7b326ad064b39cb0aeb3 SHA512 4f62af3dcf687066910a2ea0e044020660178e4def189f8d93e42ab279d83f8553fb64fb6f507ac97709d593e3691b47ef08ad40918f3976d698fb63e1127538
+EBUILD courier-authlib-0.66.4.ebuild 4503 BLAKE2B f7da9bbceb5cbc3eb7b2ed0075ae41ccbb7ec68c4b14d85f35a937aaf055e6af2555d8f5bbd7da6e0ac21b4d8e4156bb55c6fcec74658f1de1fceae93f0032d1 SHA512 2377192f2252912a6ff63c0390c533852f885a923141f9c76631aefd5ce1cff8e001b844d199d1ce138c6137d28a3847172b6f569b88efa298a8f09ec1c351c3
+EBUILD courier-authlib-0.67.0.ebuild 4556 BLAKE2B 8db66be2de9b5184766de9580d55dd7d8b02ad1be7a17aeea6cba66b7996e1fe7058f42a816525456d3fa22cc8b4a5791b6fc35b95d4300fea9623dc77d1d976 SHA512 6ffe4259af6f944c5d63cb56cb0f3ebb33aa77deac3c5cff03afb0ce9ec3e46967cf5dda518a0b6160ab76adc3a51fe63ddd7a627f51788cfa3a41fc8af9b7c7
+EBUILD courier-authlib-0.68.0-r1.ebuild 4557 BLAKE2B 6b93605b9a09477ec3b7b2436e2df4d821b4af3a9d4b45a6938ce31b5c0370d355dd3e904ebac32d75ef69c394f40346fed8ab5e9b534d71f6e2cbc218ac181c SHA512 66eb959da8b97598c1770ca97ef0c818afe1eae88f76a50634297ce3708774819d3aed1809556baf41f0e83fdf2e44c5e64aec65f2ec264828dbc99ec9230b20
+EBUILD courier-authlib-0.69.0-r1.ebuild 4512 BLAKE2B 02b1d273bd5f53ce0415ac047e4ebb840923b37e441f39f4696b04e784a704b0c5888db29d45cd0ee644cce310f6112dcce2ed9b12b79e9844c0bb271ba747f8 SHA512 5078372621121fd5b68803326c7f1d19c3cc221d33bc8d0447b5fa8250f45baa92ef97db2f136b9e44f61119625add93b20f8137764fa7b1859c5df653e716ed
 MISC metadata.xml 375 BLAKE2B 6f871e1db850090f00a5d249021c00707ca687cf5ac6eba2d4f84b6fea30120936cfd65d13615b38e5405329319fa425f1c01d838ae871e6f91b58a252b9e2ec SHA512 46db3b082b8928e49a73b070458f474594a55bd5252178bdbd0cccd0b0cddd7e489e8afba20c69227140fc12882b1903d5e15935f23a1adc18ba9f4dee8553cd
diff --git a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
index 2095ea501186..eb34fc958461 100644
--- a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 inherit autotools eutils flag-o-matic multilib user
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -22,7 +22,7 @@ DEPEND="net-mail/mailbase
 		>=dev-libs/openssl-0.9.6
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
+		pam? ( sys-libs/pam )
 		postgres? ( >=dev-db/postgresql-8.4 )
 		sqlite? ( dev-db/sqlite:3 )"
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index d4ce92e9f4c2..2a259296223c 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils flag-o-matic multilib user
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -23,7 +23,7 @@ DEPEND="net-mail/mailbase
 		libressl? ( dev-libs/libressl:= )
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
+		pam? ( sys-libs/pam )
 		postgres? ( dev-db/postgresql:= )
 		sqlite? ( dev-db/sqlite:3 )"
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
index 479e13180b5e..f23fa23f03b5 100644
--- a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -23,7 +23,7 @@ DEPEND="net-mail/mailbase
 		libressl? ( dev-libs/libressl:= )
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
+		pam? ( sys-libs/pam )
 		postgres? ( dev-db/postgresql:= )
 		sqlite? ( dev-db/sqlite:3 )"
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
index 80cd19e2ee74..c83f2a20ba93 100644
--- a/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -23,7 +23,7 @@ DEPEND="net-mail/mailbase
 		libressl? ( dev-libs/libressl:= )
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
+		pam? ( sys-libs/pam )
 		postgres? ( dev-db/postgresql:= )
 		sqlite? ( dev-db/sqlite:3 )"
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
index 2024a651e4db..9508ac6c4803 100644
--- a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit flag-o-matic
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -23,7 +23,7 @@ DEPEND="net-mail/mailbase
 		libressl? ( dev-libs/libressl:= )
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( dev-db/mysql-connector-c )
-		pam? ( virtual/pam )
+		pam? ( sys-libs/pam )
 		postgres? ( dev-db/postgresql:= )
 		sqlite? ( dev-db/sqlite:3 )"
 
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 66fb13e18096..e070f9555e71 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,8 +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
 DIST cvm-0.97.tar.gz 127759 BLAKE2B 857a30ae52e7edc5e8bc66dfbe7e2ada6ba7763260b073eabbca6ee289b68ceece92442dffc5aa1d358faec24f90993d88d3555dd9399837f25e9f689ab6d66b SHA512 b04ca9edb8c84e06628ed1a827d28bf7d787c3853bec1e064fc1eb7e3082ad81998e7c902e029c0f01c346a52a4419e3c9890e2a7a75ab38625e0078dc4e9891
-EBUILD cvm-0.76.ebuild 1451 BLAKE2B a869b351583def10291ee6f19ac8602fab654dcac0dfa9e09cc7003afe795a97a7d64243a1d331eb78a27781c6e57532f39298704b57a0a719bf8714760f2761 SHA512 e0cdea110fa6acff28b95bb9eede58dd63dc4dfd9c6c22aa9ae2c2ede0b8d926d5f4adf458be62054358aad5f9329ea9b64441ca0dada3b60d825ae4fd956eb2
 EBUILD cvm-0.96-r1.ebuild 3208 BLAKE2B 0ad53487cbaa52ca349b1e12abfced27584808a5d0c8e02ee56fc90bd091b79e413d435dd4a719237a5a2e945a6f1edae663fa14f007aee7badd65b3ed90cbb1 SHA512 b761512901a1a10b4d9c1f1952a3e63ef09a1257dacba6afec9588389c4967fc49b056a314a05c1b1fb7c644e0bd4f32b8cfd4767c62f09f4f46b5ccd7571705
-EBUILD cvm-0.97.ebuild 3240 BLAKE2B a28ef097595d8421dd6b24c2c118867bea6c2619f11313dc5c8eb06f1c42cc1db4acdcee60b97e6579ce9cfe5b5654d3e9720cf85f473aeb237fbbea4e34bcad SHA512 40750c3ded0d159de4188452c7a685917164f788bfec6f94cd0ba7a218a66825fdcd40d30836c66ccc3781114a0d3427306a5bc1664ed0b1230145c7c0d57a42
+EBUILD cvm-0.97.ebuild 3238 BLAKE2B 6ae08ef6bf661b013167cecb2a76a735ddc05c4eed6b1be8bc195101ae394550c578b766c67107abe718a2b28b5ec12e65adc274d98bb4540ef6fd657b654651 SHA512 f100e1089aa30cf5da7260544db21ba27a78d5a7eb3e6d07fca2fdab95a193fa81b0c7d176b52f969b5de7c089e5e3d1b9f57b6b3922cb8633c265a2ac53d057
 MISC metadata.xml 237 BLAKE2B 0c8ef45b6f0e15404fc767ceb7b133a844621199b4b5a5f8906c6e9ffb186572a46fd6871021bb4fe3e3b1f76ba75f38bddcaaf8eddeef43568074a54dea0c9e SHA512 34de058bcfc91edc8aa792fa3a20d0bb0318166634113402f22da57d97a4d54f8710c922c38fdd810aeb3bdcb9591494d5b20f63441ff77d242ab83f764126f3
diff --git a/net-libs/cvm/cvm-0.76.ebuild b/net-libs/cvm/cvm-0.76.ebuild
deleted file mode 100644
index 63d425f003e3..000000000000
--- a/net-libs/cvm/cvm-0.76.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Credential Validation Modules by Bruce Guenter"
-HOMEPAGE="http://untroubled.org/cvm/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc sparc x86"
-IUSE="mysql postgres test"
-
-RDEPEND="dev-db/cdb"
-DEPEND="${RDEPEND}
-		>=dev-libs/bglibs-1.041
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql[server] )
-		test? ( app-editors/vim )"
-# some of the testcases use ex/vi/xxd
-
-src_unpack() {
-	unpack ${A}
-	# disable this test, as it breaks under Portage
-	# and there is no easy fix
-	sed -i.orig -e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' "${S}"/tests.sh || die "sed failed"
-}
-
-src_compile() {
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/lib/bglibs" > conf-bglibs
-	echo "${D}/usr/include" > conf-include
-	echo "${D}/usr/lib" > conf-lib
-	echo "${D}/usr/bin" > conf-bin
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld
-	emake || die
-
-	if use mysql; then
-		make mysql || die "making mysql support failed"
-	fi
-
-	if use postgres; then
-		make pgsql || die "making postgres support failed"
-	fi
-}
-
-src_install() {
-	einstall || die
-
-	dodoc ANNOUNCEMENT NEWS NEWS.sql NEWS.vmailmgr README README.vchkpw
-	dodoc README.vmailmgr TODO VERSION
-	dohtml *.html
-}
-
-src_test() {
-	sh tests.sh || die "Testing Failed"
-}
diff --git a/net-libs/cvm/cvm-0.97.ebuild b/net-libs/cvm/cvm-0.97.ebuild
index 85fee1303328..849b3cab3e20 100644
--- a/net-libs/cvm/cvm-0.97.ebuild
+++ b/net-libs/cvm/cvm-0.97.ebuild
@@ -11,7 +11,7 @@ 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 )"
 
diff --git a/net-libs/dslib/Manifest b/net-libs/dslib/Manifest
deleted file mode 100644
index 8bbc8337550f..000000000000
--- a/net-libs/dslib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dslib-3.0.tar.gz 85076 BLAKE2B cd3f42546cbf1c03e9a9864ad6f85170e49e9b666da9984d3700979007cd675c1d5859b6f28a6b691ebc5e6e0db786793ef2f717ac01bc127102182e4d70b3eb SHA512 070e93fc89a50b379400613ff8991c8cbf6b58e2997f11dba917f943f3539e5b248f6a357f75f905bdacead3fc1eb0afbcc0a2af1bdcf9ce0cfc8884132c7ed9
-EBUILD dslib-3.0-r1.ebuild 620 BLAKE2B ef0ac5b5a1fc9b89806323ccfe86c1ba9ec6b7dacaebb03f6f169ddc286ddf69e8633ce610adbe27e5c00dbeac9ba9968cb53ce8581ea907996ea8ced8594a8d SHA512 a54322754c4433b8d56e39867d9a950d2fac2259f5f0a32652d48c056b061af317e03b09bec2d94fe22b4d98d9846e2aab9e90f1c1d2f838c93a9c43d757aec5
-MISC metadata.xml 393 BLAKE2B 755b3823d7bd4d235cb2a33cb5c66a5dcef4bca6e9ee3e5a045c60e7099fbbb41abcd34c90076b136389ffabe8d13fc21bdf6c9cd816770ccc796f322385b64f SHA512 70ead64a4d7352266986e2e45ea600b019c4fde8a195ab6e2b0ba0772bf07b64d733c809e5f749fa4844249ca9cdc40973a4d4f5783e5cd3a5090f75bd31b8fa
diff --git a/net-libs/dslib/dslib-3.0-r1.ebuild b/net-libs/dslib/dslib-3.0-r1.ebuild
deleted file mode 100644
index e90c3c8f22d4..000000000000
--- a/net-libs/dslib/dslib-3.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to access Czech eGov system \"Datove schranky\""
-HOMEPAGE="http://labs.nic.cz/page/969/datovka/"
-SRC_URI="http://www.nic.cz/public_media/datove_schranky/releases//src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/sudsds-1.0.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/net-libs/dslib/metadata.xml b/net-libs/dslib/metadata.xml
deleted file mode 100644
index 0db98bb955fd..000000000000
--- a/net-libs/dslib/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription>
-	A library for accessing ISDS (Informační systém datových schránek
-	/ Data Box Information System) SOAP services as defined in Czech ISDS Act
-	(300/2008 Coll.) and implied documents.
-</longdescription>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index a15b87da36ba..1c7e3bfc4838 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,6 +1,6 @@
 AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff80a53d7b3e0c1af03db84faa2a19a6b7076ba129a00db47a0513e412e66a853b27c4e389622799843d2b0ab8a37e2fbe314d3 SHA512 18894abf35e3e750282d8563e5fac8f8ea2306ced81909a8aca6a55f3a8075c4e13c69706814c257b486a32fa4b5f02ae3696cd04d468e0d2838b7ff74228a94
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
 DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
-EBUILD glib-networking-2.58.0.ebuild 1952 BLAKE2B 3a801454107b9250a12912ecd5c82ff134558f853cd2a63081c449a5cb7fe47dcc475fb34ef10830bff4d4a0c5afde5753c894420a10b93ca1fd96eb999bbede SHA512 b0d2a0c4d7f654c955a6aa6f7979b6d81cc32217dd4a1f2dc6129cbe114a65e52c48ed7c068145f0d2ee2e8d6de072d869bac9c1b562b0d877ed2132e5fa0652
-EBUILD glib-networking-2.60.3.ebuild 1766 BLAKE2B cfe1f285ad7788f23bbb43a11a0543f87b967d19ad522e073eb19129ba033dc77e2c4870e6ad9073ee26f29c35ca61684ecd5c8edba3ae0409e9bc56df8a949a SHA512 cde394a7a27fd3ed1e3409a652985c042fbd4529ed006162fb9218c3c7a0a7cb281629dc2738d1e0e77b7f619d7fafb1f4eb9abecd07635612ed5bdac0fecb09
+EBUILD glib-networking-2.58.0.ebuild 1930 BLAKE2B f2b4b63d10c61708bdcc8fd24983e6a915f89cb17b4de6db81cc15ea81992d38925516e8e9e38aef7e55e62bd73c482f6d75648a9645afcb4c1dd6355a1dfca1 SHA512 ae295c78535fe893bbb25d3706e082504d91808d43a1ef4345c296064fcb290ba2cfb52facfc45158a15db237124d4ed8eb73d81f2ffc3d43b0b0843ccdce8a6
+EBUILD glib-networking-2.60.3.ebuild 1744 BLAKE2B 35e8ea87055ba818503d96e6a0ff136daaebc203988aaec9f4c2225a24ff915f52078e7ac6a7c6aa04a7446bb0a13ddb6d5ad682ba2cbc0f94477ec251768359 SHA512 1abfde4bece369830c56a04fe48e4cf851ba9eaa5eecec2a5028c72b5067b7461058c6fe3ef3f2a6422b1ea76394f6063e2a20561203151b8ad4c09b64e496be
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
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 3c2e24b0db5d..e66b3ddb0b52 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-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/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index 3e42d46ebe0d..c8650eaef36d 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.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-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/gnet/Manifest b/net-libs/gnet/Manifest
index 7db74dce220a..a7bd1b62cf2d 100644
--- a/net-libs/gnet/Manifest
+++ b/net-libs/gnet/Manifest
@@ -6,5 +6,5 @@ AUX gnet-2.0.8-test-existing-domain.patch 1000 BLAKE2B 26d58d6bf8a8fe3b46e7cc892
 AUX gnet-2.0.8-unittest-build.patch 1041 BLAKE2B 0efb7cd8f6d2b2cd8e775ad499614a4de2659153070f940a5326de36ca70b621b6ea41d27307cc62b67a20b3a490416884e3438b506c152f8370c2bb38468292 SHA512 f7cec5602a33a14083117188190881bd4e6cca188a16d854b9d48fe5fab7653386f7e8e116d2c3eedc30595068e844078b73286cc80e2d165f7acec0b8376773
 AUX gnet-2.0.8-unittest-service.patch 1093 BLAKE2B 572ac32893cf3221c9e2743a97bdf91dd60bba521ed54dac9252d260445d0da67b6b2eb68d5b21cd760f1e7e61b71c6f8ec7ffbce8b8ad4f248e27ba55bf505e SHA512 2b815264462491b072a7ffb2f8413999149aa249d33d5500fc2279b523c518a31c4dcb1baf3c5554bdfef0c6f4c112ebf1d26b19f211a0a7ace9f867e07c037b
 DIST gnet-2.0.8.tar.bz2 514019 BLAKE2B 6e09912d4d438fc55290c9df45b2fe29397efbaf2ca0ff88fa6e22a9935aa1520f4a1faac24720ab1925bd6537a8725766351e4256e036ef61cfea91470bc6d5 SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f
-EBUILD gnet-2.0.8-r2.ebuild 1971 BLAKE2B 8ee6e65c15c8ee1d416902e24e37388413b4d9c433080f9a3f80b669f71c22347dfc8a167a4a94ed8622698876dcd602713eda37ad92103a79f32c64f9b75c96 SHA512 5a39460034ce9131a07a7f861cc017344878a505f9779b0cd32f0f03c7c8220b7d629761f4389a7484877659f1a375ad803ec37621ece792ea562708913ad4bf
+EBUILD gnet-2.0.8-r2.ebuild 1961 BLAKE2B 9d8a6f4f3978ce9f5ac160bb05a31b70528e99f0b7fe2ba55259df40673e858c469e00ba736959a5dfd07f24aa4e40c0b8f39217db3a0e0b2721b22210d4d760 SHA512 e240ae27639670674fe5998514f3b635c265ca0370d65653a1652faf758d0db42c0cf198d2f17e9b6d562ba214c9838fae1294260174f10a87518932d0163a51
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gnet/gnet-2.0.8-r2.ebuild b/net-libs/gnet/gnet-2.0.8-r2.ebuild
index 2f980c56423d..28be75c5683e 100644
--- a/net-libs/gnet/gnet-2.0.8-r2.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GNetLibrary"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 # FIXME: automagic use of valgrind
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1da89605f067..7c8befddac4b 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,5 +1,5 @@
 DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81ebc5eb13d9e04a01f7f32ce6189f71f05a18c90c2e57aec688750e917ee948261726acdd7752d9d7d42a9c7ac2 SHA512 ae9b8996eb9b7269d28213f0aca3a4a17890ba8d47e3dc3b8e754ab8e2b4251e9412aaaa161a8bf56167f04cc169b4cada46f55a7bde92b955eb36cd717a99f3
 DIST gnutls-3.6.9.tar.xz 5773928 BLAKE2B 9dd7678fd7ea9f170816358a6ac385193fe4db8052e7a35d553e18e8618ea88aeed2b618b288f98f2f480cafd560d46de04234808560a8ec18028574bf26b706 SHA512 a9fd0f4edae4c081d5c539ba2e5574a4d7294bc00c5c73ea25ce26cb7fd126299c2842a282d45ef5cf0544108f27066e587df28776bc7915143d190d7d5b9d07
-EBUILD gnutls-3.6.7.ebuild 3908 BLAKE2B 4dbb2c896f38322dabb73e14629612fc1b3f2652db58461c0444380e24b5bb1a050b5d62d58e17e583bf17875ff58124d74fb392fe6b3b31cdf81128ba596a92 SHA512 e1aefd74b5a3bc2da84b1dbd7ef3315706ad6dfff6b5a20015c00a92458918645e6791163b03d8f1ed92dc525875c42f6646c40de5121650a0ef235822b70bfa
-EBUILD gnutls-3.6.9.ebuild 3928 BLAKE2B fac7d7e13b3ac5c53d600d9db5c5202d7296ecfa3a9e64e6d22eb8b723699256336374e5d365aed08c3b066957bef80e077cc74cf9fadfd0dd11ef3225c132f7 SHA512 baf3f6f4812963bc6e373d877c3a576c016588f986451084077a16a9fde8228549ae72e0219dcd4a60ae121f0d67a56dc2d0ba5bcacf40569d4d3aaaefb8c1e2
+EBUILD gnutls-3.6.7.ebuild 3886 BLAKE2B e794b5866ad786d8efb9127d8016551d21167143419c61fe7b7ede90e30bb89e6ba8b113953bda692c798271f8b81e7f86a61d9c44af21a830a9bd125ee9e8f1 SHA512 7984b2c7e407b930bdc71bb87576ec792181bf6ad35c5d4c9761900d50aa2adffa7ea64724e12581a566538c5fa513b4adb2ddb80284bd96766f21588986c4da
+EBUILD gnutls-3.6.9.ebuild 3906 BLAKE2B 133310cd3a4804042e8e82990f5e60933c8ef8ee05e2a312bbd9e7217971efe09541a6018165f67b3903612d274ce24c86cb7358062da06bf34cc94d6eea1916 SHA512 e5dc77b13cd0d0f7759bb316f50d62fbf3872ce977d49d24c28aef402818ef4464e82662c0030a01bc435f1204b5d81f5e81e9bd6861a654c35ae3cc190f4a10
 MISC metadata.xml 1277 BLAKE2B 08fd439ce197f1ce2b1fd5bdedf6e409410aeb45a473b2b81ab9316ef32b367d44d0c65f3e768fae9edba1a03f572417e3f7dd23ee73b700dd0798e3dca30292 SHA512 dc4e4e3a72732012cf37d21b881e44933d5e3720ee1f3dc2c5d88ae97e7e2cea79628282bebd7d58048db7edd0bb7be80ffca23d126f333600172f16473341f5
diff --git a/net-libs/gnutls/gnutls-3.6.7.ebuild b/net-libs/gnutls/gnutls-3.6.7.ebuild
index f4e177f5f377..c9fd2245dd67 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 ~riscv 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 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/gnutls/gnutls-3.6.9.ebuild b/net-libs/gnutls/gnutls-3.6.9.ebuild
index a70df5748a11..04d15d723851 100644
--- a/net-libs/gnutls/gnutls-3.6.9.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index cfea2fb360a8..bd717466ee45 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,3 +1,3 @@
 DIST gssdp-1.0.3.tar.xz 316740 BLAKE2B 50293e653ec5596a986770f3ea81a244b8f9772e9d0c13df0e48f00ee34445c2fc7250702d7928e7dba081715e6d4e379d7a899905c35da84915e6b4058a3307 SHA512 ef72335c3f796aff0d3dce1781d5a0b015508f614d4a73699ebce411b0593419b40c09839ffb62e50cf9d77e16ec0e31d0e23f92d35abb4d105dea47c00a0506
-EBUILD gssdp-1.0.3.ebuild 1426 BLAKE2B f23d9b15d3735ca2130452d544515a1a18b7f6760557b49f1c4c4b28df278cb003a70f9c6daf35cfe720432be7dda63fc6088ec2ab2ed02e1344296a5c9c32a6 SHA512 49fd4ca3b14450439e9ce47ef2a29d490f81d0bc5834c969878ec4cc226487954057b15d36fe90225cdb56c0f9d7544cdd3dc48e67729be2c64fd0558a6739ac
+EBUILD gssdp-1.0.3.ebuild 1416 BLAKE2B 9c3786f6f553d7049b717cadf4c1850851ff8569be6c5b8696c4b381d705ad521e58d7940bd5b9a5fb21bf6c7628efb9d29ffbc4a539193323c1084a7600c37b SHA512 fc0c7ec2095755297e0507298459bc47a93994bbc43de88a7c3b026be120e3b1b9804686557aa765ebdaf298a25057106daa8d40a52d32baffed143a2d50a64c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gssdp/gssdp-1.0.3.ebuild b/net-libs/gssdp/gssdp-1.0.3.ebuild
index e293cf95d393..c098ed4321fb 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"
 IUSE="+introspection gtk"
 
 RDEPEND="
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index ada5a2762fee..2fd8c86ca0e2 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b70459afd8bf92630d69cf32d380264814304a68a93d8a5a70d6573b6754658450005a2ea2b96f13ae03f9e87fcba SHA512 498b368eb53ac58172db280c80f9da71ce82b636c39f186046e4f674e44c574ff4b63c3f777acc79d32c17d70e4efcdc207768ed49b3d1842bc4b73618296215
-EBUILD gtk-vnc-0.9.0.ebuild 1707 BLAKE2B 0b6ca6d8f95fdcd7a87f1ca2a74e86000c788c750e46abfd6746d72772aa2a2da05695c296c32d6b380d79d153f7750e6ce791e7db259dd93b852d343572ba57 SHA512 eb55d937c034c3db598a22573f92d9dce989c291a606994a3ab5797312a811b97f9082a4118e0974fd7ab846d4fd6c1fae564bc8d81a96384b3f8c57ec13c00d
+EBUILD gtk-vnc-0.9.0.ebuild 1697 BLAKE2B 3f159afc1e9503d53807e940b3a0b4aac9452cfd2f5b3e9347cc7143baeb4017ecaa690987f02a539a6b559f412de364abb92d1b63a84ee204615d5acf471539 SHA512 e06812a659baf2ac69da7280fe196b953753a30cff19d91ed98bbcf544576acd8b874d908887b97ec3e5da1aac1fe7fadd17c7912480642da4e03668534c1741
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
index fee5a8ee5853..d60e56b36ee4 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="examples +introspection pulseaudio sasl +vala"
 REQUIRED_USE="
 	vala? ( introspection )
diff --git a/net-libs/iax/Manifest b/net-libs/iax/Manifest
index 20f6ba6b5570..4a97c8c64bef 100644
--- a/net-libs/iax/Manifest
+++ b/net-libs/iax/Manifest
@@ -2,7 +2,5 @@ AUX 0.2.2-debug.patch 684 BLAKE2B 6a3ef9e2fab7723bf4397f734753ae8d3abdc091b5df5f
 AUX 0.2.2-memset.patch 482 BLAKE2B 534d38f9553dcfed0da0eae77e517f4faf5a18546f357364fa5e3cbbfc512cc2f708bdb7dac05cfc1ecb4944512dbed0f4e8f99702807713b466b10ffd8f6812 SHA512 70f98b10b5899326d5480ea72e785038320b22ec3c7ff42015a716de425313c42b79184063ef7fbdf29c1164d0ecf316d2621685065a84fe7f305c7aab2d0a87
 AUX 0.2.2-sandbox.patch 753 BLAKE2B 1bf2433fd6258dbd778bc073b33e07bbae9aa70e33ae9663fa41f573564ed2b74092daaf11df5ac61d9ea491b5a718f8126e7b1017d68a61ab696518d9e25e2e SHA512 b6d726272c62ffdd2c6f8bdc484990ef8ab6a0b9bf4909c896d6d7e41f2df027b6eb37f0c077b39fa05f849e6d5c40a341af2239dc312285e6ef3d3084a1c5bf
 DIST iax-0.2.2.tar.gz 139379 BLAKE2B 6fd4ac85774851605162ad9845c1e847aae7c2e0504f06a302d223ec51d1963cbb1e309b98d5a41ef70e4bf3de88be60a65ad7e8c08e23d73096b43efa7a2a0c SHA512 f86fc56c9f31665e849e8528d2852e06abd803e8d02fa6098d68eefecccc263ded97d1870e9ee157ec1610fefc92b8f14f2d858fbce115c5da83a6dec1eea210
-EBUILD iax-0.2.2-r1.ebuild 980 BLAKE2B 1a896fca35bcd94a49b959a4f95ad332843cf31a1a8a1612f39994930f2fbb3e1511cf6f32feeb3d181dac763ea785d15d5fe6b6f9407212d9431af6cc883205 SHA512 375af86ad23e4f4a8ddfc10327ab1f3900cf0df7c0a424d3757f6c43c5d83ea99d9c004c01415574588a762713df6c4f05ef6747e1c997d29122bf8e75c4dc53
-EBUILD iax-0.2.2-r3.ebuild 624 BLAKE2B 25d0274741747217e681a43f688573a11a674aae680122f0c004503bcf99c2f7e0f7e9b3e62f9cc2c6ea16dffc4147e1da3f58200a5a9cdff6a8621793261db4 SHA512 baaac8ee3cbad35ddf3a076e3932cfab5b966faa8e238626f4d6d6802807afad96dbb45dda04a76e20e5509f656e668bed0cad9c2e472bb74216f6eee59ad364
-EBUILD iax-0.2.2.ebuild 551 BLAKE2B dd44db1dd9cd2ead40b112a96c25ac263b0f7ea9cf717a5ee10e21b9989b57d6b8e340a594bc99b84bdd20854464de73d776df862bf264e1d6277dd027ca548a SHA512 1759c583af89dbb2f5d42704b17f312c2455c6039e19e847f47df794a83ac648e0817101e992baa9e9a7a2fda1d42b90f7ec89c01e44a53f3bdfdbed7c052132
+EBUILD iax-0.2.2-r3.ebuild 619 BLAKE2B 40f95cabf62b3c058f115c7f0ab6ca8e1d4f26a3659b53bd1135ce3f13dd265693b9a7dfac4b6f16fba5a37f385914803ae9b0f715c2e0614fe9c2a6ecf16dfd SHA512 57af3aceea4e035e9a5375d0d3ebf3396ef0baf96d294485bcf9cbf51a73a01e655b1fb78cb7454e8535eb4c293d18a3a35f5e5313608fea59081d8d5b728cfa
 MISC metadata.xml 294 BLAKE2B c338dd8584a092a04570848494079ea52fdfe31db40ca185256ef99832c827a856c43b7b0f46abe4ef23c00ecd2e9e38cc258285c1043773494f4007e69b914b SHA512 d2a7e75b1cd19f4218697e94518b8b6a225437924352c200fb3ba180197ace527752e1b12f490c3a265e8f9952976ad1078743985d83b19239447d658230a42a
diff --git a/net-libs/iax/iax-0.2.2-r1.ebuild b/net-libs/iax/iax-0.2.2-r1.ebuild
deleted file mode 100644
index 46813b978f01..000000000000
--- a/net-libs/iax/iax-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="debug snomhack"
-
-src_prepare() {
-	default
-	if ! use debug; then
-		sed -i -e "s:-DDEBUG_SUPPORT -DDEBUG_DEFAULT ::" src/Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# use users CFLAGS and LDFLAGS
-	sed -i -e "s:CFLAGS =:CFLAGS+=:" src/Makefile.in || die "sed failed"
-	sed -i -e "s:\(libiax_la_LDFLAGS = \):\1@LDFLAGS@:" src/Makefile.in \
-		|| die "sed failed"
-
-	# fix sandbox violations
-	sed -i -e "s:\(\$(includedir)/iax\):\$(DESTDIR)\1:" src/Makefile.in \
-		|| die "sed failed"
-	sed -ie -e "/\/sbin\/ldconfig/d" src/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug extreme-debug) \
-		$(use_enable snomhack)
-}
diff --git a/net-libs/iax/iax-0.2.2-r3.ebuild b/net-libs/iax/iax-0.2.2-r3.ebuild
index 42757477e346..c8255c09a37f 100644
--- a/net-libs/iax/iax-0.2.2-r3.ebuild
+++ b/net-libs/iax/iax-0.2.2-r3.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="debug snomhack"
 
 PATCHES=(
diff --git a/net-libs/iax/iax-0.2.2.ebuild b/net-libs/iax/iax-0.2.2.ebuild
deleted file mode 100644
index d29014d2cb7a..000000000000
--- a/net-libs/iax/iax-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
-HOMEPAGE="https://www.digium.com/"
-LICENSE="LGPL-2"
-DEPEND=""
-RDEPEND=""
-SLOT="0"
-SRC_URI="https://www.digium.com/pub/libiax/${P}.tar.gz"
-
-D_PREFIX=/usr
-
-KEYWORDS="ppc x86"
-
-src_compile() {
-	./configure --prefix=${D_PREFIX} --enable-autoupdate
-
-	export UCFLAGS="${CFLAGS}"
-
-	emake || die
-}
-
-src_install () {
-	make prefix="${D}"/${D_PREFIX} install
-	dodoc NEWS AUTHORS README
-}
diff --git a/net-libs/kdav2/Manifest b/net-libs/kdav2/Manifest
index 7469abaf8ea5..7c190d2e8217 100644
--- a/net-libs/kdav2/Manifest
+++ b/net-libs/kdav2/Manifest
@@ -1,6 +1,3 @@
-AUX kdav2-0.2.0-qt-5.11.patch 209 BLAKE2B eb03b7877db105894d19d0a597c112f760b68a4d556762b8101f10cb8203a1fd0d417f124065cf0d9dfc1c3f40f5201c8e86bc083073acb3e65bc1ce21f863e0 SHA512 1e7ad2451b709b9c8fc301f4f7975dd725b02ae3f8640b1e172a8ff3fc21e91c62ea892ff42ae298331b20a01f967cfcf047955f87b38082a02553e6314a01d1
-DIST kdav2-0.2.0.tar.xz 49440 BLAKE2B 965f38b854f8aa95b907fbde136fbffdfdf47690e7816cc6a5e3d8014b97a57bad991a0a1aa488a855065eeba50bd7bb73f25ac05ccc9dedee563044da293519 SHA512 ef2510ae36a8e5be0903eb7e576c0f62c5e17d36cb42a9e6f07bb8d06f2e2a46354cf10256509f7c252e58f281f5e32e1c9dae682c421ac96941b7785df6a6a3
 DIST kdav2-0.3.0.tar.xz 48764 BLAKE2B 0e904f41cbe7b88667ed2dee5e23815fc9cf5fddf77493bb6c947703e001a215b2b47c302cf1570002d273ca06d9dd219a3c488c85609e4f7a3da7aa4f57412f SHA512 19060bdd28720b5477ced627d441411b7f594a025bb574196d011b946074ac472819b1673028e082f76f01d3038d3ee4acb438223a3aa6a657a5b8cddd1026d6
-EBUILD kdav2-0.2.0.ebuild 691 BLAKE2B 475dcd189e498b2ca3e2489835c46310ff1b212831bbeff5b50fc91f7bf72d67ca1448ea617d1b9200f44f6a5b6f9338732ff44eeafd81b76bce21610059b0ea SHA512 92393d08ed4e2354715aecc5f412bc598ad29cf6325972ac9f137fd1e1d4cd185fbb14b51ad2fd25595f22025b6bfd75ca7e5fa3b928beac806148caf0ec3854
 EBUILD kdav2-0.3.0.ebuild 645 BLAKE2B 541b690a8ceaf9ebb36baa1aabe4a874314e008e900c2c686cadda08b725ca0030631d1af26b6f36eeb7492d4b6e44303b5506e97de200914377a9b6a2a59009 SHA512 df2778bbb43ec9c14d61790bbd785396160b3d594548789a16cdd03967ccd5813383c09b2a33e9110a7b06ba2dac1bbd2046c0adb98debfb31406c12f80d3efa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdav2/files/kdav2-0.2.0-qt-5.11.patch b/net-libs/kdav2/files/kdav2-0.2.0-qt-5.11.patch
deleted file mode 100644
index b5db5c1966e2..000000000000
--- a/net-libs/kdav2/files/kdav2-0.2.0-qt-5.11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/645392
-
---- a/src/common/davjob.cpp
-+++ b//src/common/davjob.cpp
-@@ -20,6 +20,8 @@
- 
- #include "daverror.h"
- 
-+#include <QDebug>
-+
- using namespace KDAV2;
- 
- class DavJobPrivate {
diff --git a/net-libs/kdav2/kdav2-0.2.0.ebuild b/net-libs/kdav2/kdav2-0.2.0.ebuild
deleted file mode 100644
index da3cde23866e..000000000000
--- a/net-libs/kdav2/kdav2-0.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KJob based DAV protocol implementation"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_test() {
-	# disable tests requiring net access, bug #680952
-	local myctestargs=(
-		-E "(kdav2-davcollectionfetchjob|kdav2-davcollectioncreatejob)"
-	)
-
-	kde5_src_test
-}
diff --git a/net-libs/kimap2/Manifest b/net-libs/kimap2/Manifest
index 0e4686a13330..72e5129f1b81 100644
--- a/net-libs/kimap2/Manifest
+++ b/net-libs/kimap2/Manifest
@@ -1,5 +1,3 @@
-DIST kimap2-0.2.0.tar.xz 91624 BLAKE2B 37065978c80739415a7b0acc9491b3344865d452c65e50cde5941fa45bf5c2423cf5389d85b46f229e28adb644f8ed12bab8af9c8cbe50ecfffa5b88fd30435a SHA512 33258217767cec2f0a3b7f47d733701fb90239b32ae8ae96bcac4215b059e7ab245d4c151e18f924c13f5a7bbfc890ecac6ccdccc40c91e008e44b67c322a8d4
 DIST kimap2-0.3.0.tar.xz 91948 BLAKE2B 95bc03eb7a5d99525a897327e6e12d46bc5fecbcfb521ad91645db8b531a1cd3f7e3125b6ceee412f6e2a53bed9b75e4993f6267722d23976f50fd711481b631 SHA512 a351fbd8a2c532a963d488c64fc497d05be3521fb2ddf2d942a9c2ebc6a76068f509c283c6335dee03c9ff1a6df294fa69b2033874d33dc6a860b70e1d4e973a
-EBUILD kimap2-0.2.0-r1.ebuild 506 BLAKE2B 3f39699cff1d1eb960a4f07441d0af211bdbdec5a12aeed0223a4561522097f3a8b609c66b17ad52d3985692b5faffa12bf57cba782b63ebe7ac71566e9c500f SHA512 559c52241787d7f14cf289802dc41dcd4104d23cd1ba3fbfe038ddcc3697986167016b666d5e4c73ef0e56ebd9e2d3c40fffb15a7cf538b779478c3176ebd18f
 EBUILD kimap2-0.3.0.ebuild 506 BLAKE2B 3f39699cff1d1eb960a4f07441d0af211bdbdec5a12aeed0223a4561522097f3a8b609c66b17ad52d3985692b5faffa12bf57cba782b63ebe7ac71566e9c500f SHA512 559c52241787d7f14cf289802dc41dcd4104d23cd1ba3fbfe038ddcc3697986167016b666d5e4c73ef0e56ebd9e2d3c40fffb15a7cf538b779478c3176ebd18f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kimap2/kimap2-0.2.0-r1.ebuild b/net-libs/kimap2/kimap2-0.2.0-r1.ebuild
deleted file mode 100644
index 87ebec633722..000000000000
--- a/net-libs/kimap2/kimap2-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Library for interacting with IMAP servers - successor of kimap"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtnetwork 'ssl')
-	dev-libs/cyrus-sasl:2
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 95aaf71ad24e..63f5adb9d242 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,7 +1,9 @@
 AUX ldns-1.7.0-CVE-2017-1000231.patch 396 BLAKE2B 60225693e684ce9b7850fa416da879b91543b08573b36eaa1da40cb26c6726930d0d0c31a68b7aa99852859ae4554cc7b111c8318ffa832c7140a1a9cae80668 SHA512 c9119730ef74aaa89a362fa5354267da7e0336873a66a9e68b1d634946ab7938ac8833a8b1dbd27d51add226008b0b9336e4e4e06f20d714b225e35cb3efcbcd
 AUX ldns-1.7.0-CVE-2017-1000232.patch 469 BLAKE2B 4e17f4d13928081cef5093b51db1b1b1f393d151a5822ad4d40f385620fd7f78168e581a6e2d50164240ffe368d4926687a860f5555432d2a9b5b389a3287ea7 SHA512 2eaddaa4ab7ecf8e54a7fef341406e1f8bdb278a2caca3d8cafdebcfc349c7e3ba1247f194a5fc0fd50074c8836f29b4e5427b2ce7c3b8513191aa1b4b08c681
+AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-1.7.0-r2.ebuild 2255 BLAKE2B 54c3b4ba6ea21bb2f65a7413480defee3568ab6196e2a46c637c16e9fc9223918a5357de7f6e945e321277bc6f1d1ec6acb6c8e858372d45aca19f7052ebbbb8 SHA512 fe10b70395f65ca7095188ef71470bacf3bfe9a6b6ba23e2de80cfa5e50eacb6f72473b47c2a0495d2c6396596c83199ad9b0ed12cc6d6c3d4db6d9587b162d6
-EBUILD ldns-1.7.1.ebuild 2804 BLAKE2B c393cf5441ba73559ed0203b062fc9bae50aabeb3710821fba7c7e6ef61c7ad4eda0baab6df6abfa6a2517ee78f4c651862838a6071b187c0b5bff8e45db7176 SHA512 148e0ad57476c8f21930387d8c8dc9b3672070e73b3e5f9faab711d14fd9f7e09a76afe6f0da6fdf8cf541f4b2f854d6ab7327f1a7e2a2c5d2774e49b6b55f9e
+EBUILD ldns-1.7.0-r2.ebuild 2243 BLAKE2B 94561febec20f04fc09a302128ffbedc2f513cb6213abb23337ac379f52b5457de24b91111640db37210db1d5f62eb816af219428608d1db00c4eeb2380b5df6 SHA512 32d49de2d194fd9e4b7de5689e4680c412dfe4b5cbd00216b3ac4f10a4421914652f35cf006d4ca9829571eed6c91a0714218a774e81ecfe35886fb3d51e8300
+EBUILD ldns-1.7.1-r1.ebuild 2756 BLAKE2B acc8c5366d2ed7cd315650f19b31c0a7a6a79e4c381d1bc791d4283260461df133276f9e50cb64ec1ca9c513175623116403216ac81ed0faae6aff7e7fa9c974 SHA512 25949ac065e8c734d3ae7fea6ab025104c009699a81acc806027a28d1309fb1157a52ce647490704cf3dc02de8d6f0549bd2f5acdba28fa60374bf68a30a788e
+EBUILD ldns-1.7.1.ebuild 2792 BLAKE2B 1834ed95664a2425d4f3706a7fdbed93951dadfa5424ef393c87528b9304b6546bde06dc268989e5d5714b9ba7d2455ff4d768f407563935afffbbc24f9dfc55 SHA512 23bd2aefe462744bd9b1e6db9ef3a1727e10eb3a0023e402eb242a282366f74418708c2a83ed15f4b914c15992592d706e803fc9b9e7c28db4ea1878b1a6cc2e
 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85
diff --git a/net-libs/ldns/files/ldns-1.7.1-Makefile.patch b/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
new file mode 100644
index 000000000000..d654bbda6131
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2019-09-29 15:17:24.728446345 +0200
++++ Makefile.in	2019-09-29 15:18:09.544008785 +0200
+@@ -301,7 +301,7 @@
+ 	$(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
+ 
+ _ldns.la: ldns_wrapper.lo libldns.la 
+-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LDFLAGS) $(PYTHON_LDFLAGS) $(LIBS) 
+ 
+ $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
+ 	BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
diff --git a/net-libs/ldns/ldns-1.7.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild
index bc6972bb668c..be44e8016816 100644
--- a/net-libs/ldns/ldns-1.7.0-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..119fd33b2256
--- /dev/null
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit eutils multilib-minimal python-single-r1
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
+
+# configure will die if ecdsa is enabled and ssl is not
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	ecdsa? (
+		!libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] )
+	)
+	ed25519? (
+		!libressl? ( >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] )
+	)
+	ed448? (
+		!libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] )
+	)
+	!libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	doc? ( app-doc/doxygen )
+"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/ldns-config
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# >=openssl-1.1.0 required for dane-ta
+	if has_version "<dev-libs/openssl-1.1.0" || use libressl; then
+		local dane_ta_usage="--disable-dane-ta-usage"
+	else
+		local dane_ta_usage=""
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable gost) \
+		$(use_enable ecdsa) \
+		$(use_enable ed25519) \
+		$(use_enable ed448) \
+		$(use_enable dane) \
+		$(multilib_native_use_with python pyldns) \
+		$(multilib_native_use_with python pyldnsx) \
+		--with-ssl="${EPREFIX}"/usr \
+		--enable-sha2 \
+		--without-drill \
+		--without-examples \
+		$dane_ta_usage \
+		--disable-rpath
+}
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	# remove non-existing dependency for target packaging/libldns.pc
+	sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		dohtml -r doc/html/.
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README*
+
+	prune_libtool_files --modules
+	use python && python_optimize
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins libdns.vim
+	fi
+
+	einfo
+	elog "Install net-dns/ldns-utils if you want drill and examples"
+	einfo
+}
diff --git a/net-libs/ldns/ldns-1.7.1.ebuild b/net-libs/ldns/ldns-1.7.1.ebuild
index a93777027637..dc73bf8b91f8 100644
--- a/net-libs/ldns/ldns-1.7.1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index e45171e0c8f6..343255d21948 100644
--- a/net-libs/libasyncns/Manifest
+++ b/net-libs/libasyncns/Manifest
@@ -1,5 +1,5 @@
 AUX libasyncns-0.8-configure-res_query.patch 428 BLAKE2B e19cdfc88ebee7f22dac6dad6dc302fa80957464c91eb8907ef75bd3f5fb32d7b985545a1aafccf2cd228688c16ab731ddd9c5315083f8f4d117a9a6d4ee731f SHA512 ed338a91575f9e642c3da9764348fb7d4e5b2d0da4ef9a849a4cb176df96776100e59b419bbc9206395252d8317c20c5cfe1b68e008825fde1192e24dc9f8ce0
 AUX libasyncns-0.8-libdir.patch 299 BLAKE2B ad0b79b5725877642c1b03c8183654be8d54e78e44bf7ab4de3c8bd1ffc5ceb2e6cfd250cc4725c2a0491d062d12124faf55fb20b07887e1f47cee7ab156f0de SHA512 b4a42a4241034756feeacdcd9a7d6e57a8b2d9ae945b149e05c6ea9d8b33791733601ef9d153e75d7979079cdf4c02c4136f881236e2a2b393ce070021c3a2b0
 DIST libasyncns-0.8.tar.gz 341591 BLAKE2B a93e7fdeb6e686cf3ed87db8fe2473f8868defd5bb6a29497c48d970d1ff33c550b5521d84a224314c9e93bd4cf09f502bde0fbe1c4d2680f6fa07f1f1a224c6 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7
-EBUILD libasyncns-0.8-r4.ebuild 1343 BLAKE2B f8bcf6c0e09900809ff76d5b20b183f5627cfc133e6f23d71e489531d8b4ebd08d5a36ab60a248a35e09eaa8e93c415f8ac642e90e4aab51b60aad242f906927 SHA512 a3f6836f3a7ac94982cc8938a713631a2b667168aa77f45d4d3f76f57d49b86f7dd7f5bf0f1e87d4c09cc2a6df5fcd9e06902c914208d348d57ba951ac975e38
+EBUILD libasyncns-0.8-r4.ebuild 1331 BLAKE2B 63c9d78caa9db28ea9ae6d3a8cc8e315a0e65f0f3057e171d3b6f0ce25965f4eb1e30a25dca7161bbd126d7fe9f9de4e5d3eec43a47280c9270559af9f732b51 SHA512 3a4ab1833ff3190ca45551ef4fa279e57a701ce2fe7ee50dffb50cd4d1e60a7e848ec7ae8ca4971b04425646b281f38a559789cefc8e471cea61f7021edc3a0c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index f3eda0c2fecf..6765072f31a6 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
 SLOT="0"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc debug"
 
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 927a8501b409..327f65925a40 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,5 +1,5 @@
 AUX libetpan-1.0-nonnull.patch 404 BLAKE2B 485fa277a9b5a9f1f74e2bb658a68da3d6781d8cf243df019ae945a69fb96e5ddad36d83e00294e1abfb983525dbbc483686882653e55713686099d839fa7fc3 SHA512 3800d6e2dbb50985290b8a141ee2fe6ff92bee8516567f55ea14e634b41e11d1074cd8df6e6de30996e0d86e54cd659300da0d61ad63fc10f713d672aa3b4f6e
 AUX libetpan-1.9.3-missing-stddev_h.patch 989 BLAKE2B 49918148deeacc128bb33e8cf56c9f3a56de92fd7206becd5c6e6054979691e17fd1de008f42c0db64c0f72def07bd5fb10178b0eec9ee64c6d6b0f8749bdd56 SHA512 cc9ea9b4c641cbb3b2446252b8ab8b520814ad8584f7fccd3174e31726a59a8445a5af21b6086034891a883887cb69b1d2c38a07e7f8667c0fea518b40a0e058
 DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6
-EBUILD libetpan-1.9.3.ebuild 2104 BLAKE2B 093e7e5bf5de575f1f73d72886d6c6216225b0fbf1a97b06b149c9ad05731b07e217c762c70fb9215fd441d46cb975b8afa290303479fa76cfb46922c1cbec70 SHA512 2fce824e8b46db90e4b8d3afb88c6909b7cf9e696e8b4fffa985afbc46781a5f2d3cefe65dab6cae0089f122b1d88f6d1358f74ddb5fc22b121c88761139f47a
+EBUILD libetpan-1.9.3.ebuild 2094 BLAKE2B a0fc87cc47d14953ad09b935d74169664a107fb1cf926e107e9c4054aec6f0b65d6ad2f418e86e8e85a2c3cfc6190c0f93c9d9af961a823f5fb41ef20963d5e5 SHA512 033699e03bc14f272cab0f96ca5ca7a1fcfce8eebe830720f069df4f47b7f7cb091065ced9b153841d80432d57c95458c8b9935700ea18e4d761a3c68be48001
 MISC metadata.xml 744 BLAKE2B 8d47251742439a710cc6c6a2130a001a1a66ceb7f358d8ff138b9d9a508a7d2ddf14a3879537f129b755bca1a6548187f15a62f2183c5297e4245fd5cd8ccf3c SHA512 5b732d7d205ade686cb11042918d81b6959549836743a582701f05e161adbf8416beaaf33cbe03b4ec4ffe38d35699803583cd2bddf9e333dd8c93cd7f9a1db3
diff --git a/net-libs/libetpan/libetpan-1.9.3.ebuild b/net-libs/libetpan/libetpan-1.9.3.ebuild
index e2b6c80ffefb..acac8681ac94 100644
--- a/net-libs/libetpan/libetpan-1.9.3.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index c455ca6eddda..0fd7bff006cb 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,5 +1,5 @@
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
-EBUILD libgadu-1.11.4.ebuild 1301 BLAKE2B c5e78bcf29f9cf44871f66bbac467d5af33abae86c2ac456c8bfdb760fd8a6b1d589df7db6eb389b82d226c696222edbf90b69db358f5a0b3e521ae73d78ed0e SHA512 513bc3032113c4edaba532198eff84c04e34d158f68a6477a7cd7521ad7cbe99f04f33811f56a5c8fcca448b19fed97579fb519e12779874b8de031e62ad5324
-EBUILD libgadu-1.12.2.ebuild 1395 BLAKE2B 397a6d2d2a720a78aa1aac065d36dd68a61c99133dcb6d57a4e659e7e5967dfc8399a933d891462c6235df8af6dcc896394df1e5fd904f7f469a2183fa365ad8 SHA512 8c81326bf613a301c239f9a274b51814ab9586bce8ee0b8d9dad3f211f778796ca8f138e2c7a2c0f6ad12115f7c4cfcfcd84e4fef4b2654cda6df005f0580a45
+EBUILD libgadu-1.11.4.ebuild 1291 BLAKE2B 10c941dd42ab5ab2478bd915f4c70faf442abc7f1dcd65444171134ba6618c76673bd56768a775d84631f24354ca6ccf55dc769d2e101cf346326eb8831d1232 SHA512 f9245ec916ad4cc0381fee2ed3f8ff136bb6143095ba6720d888d1d15ccf813e99cdb79e3b41469683a8f3e4b53836556c78921fb61a643c135a8ad92b8a705d
+EBUILD libgadu-1.12.2.ebuild 1385 BLAKE2B 87302a7b10b889436036145a8e910687309fff42d01f4cf3c5eedcf15ab320e1f9cb846022b683a5aec028033c5b99169c90fa3841be4ed9fa3bf88bfd82c78e SHA512 399127f1ca998400d4a65fcad028d4b7165625e086950cbcd6400f84599372c7e6a1ca465909c9e14db56dcf3b9f1760b2dbf87ea22044239faa32a9a126cdb5
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index e269958d970a..1e153cd06f82 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="test"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs threads"
 
diff --git a/net-libs/libgadu/libgadu-1.12.2.ebuild b/net-libs/libgadu/libgadu-1.12.2.ebuild
index 0f59edce2afc..f4c3aec40dea 100644
--- a/net-libs/libgadu/libgadu-1.12.2.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://toxygen.net/libgadu/"
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs test threads"
 
diff --git a/net-libs/libgmail/Manifest b/net-libs/libgmail/Manifest
deleted file mode 100644
index 4a4e38ce88dd..000000000000
--- a/net-libs/libgmail/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libgmail-0.1.11.tar.gz 30433 BLAKE2B 4137845c9d3240aeb70c63b91a578b989fb4887d5793afff094a32b18d4b0ef9878c9b480c6bed873aca5b497b19dd86d57fb850f057bac7c251a95b7426fa1a SHA512 a6e08ff1c2a50930289eb4b79ccffe458ef64bc01e4eb5db83a9e8155b349187808743e8152a3437a6db0a9cdc96b0a3ccd24b2d8edc44ef5ffdc707c98c3114
-EBUILD libgmail-0.1.11-r1.ebuild 601 BLAKE2B 12d5a3d92c1d24a728d925e482dc0ca200588add0dc8af9c5e275b01c4d9c350fa14e53e1a111b79e0da5b14c15ee32c351205e516a98f2cb451666bb9c97d3d SHA512 c86025495ccdd2af473db9d27482368daed4519979ac0d9912e95e73a745e1662d8217ae21c9d0b207d372bb5f8955769c8b8b5838bc440ac92abe597b9eefaf
-MISC metadata.xml 245 BLAKE2B f0dd8496ffa5a2034f502fd3c229bffbe7b5485471d566a2d5b7df1ce020ca65c5c3a2d75c788e2ea1aca2d070096dfa0fe6c35892c4aba54b45c216d1a2f58a SHA512 db79f83c623ddcf4f00b895c54a21c218a6ccb03882ec756301cfa27d0439c7139a80bf3dea36721f0b2a2088d91de96ecd3f36d5f297c376d7e9838fed63d7f
diff --git a/net-libs/libgmail/libgmail-0.1.11-r1.ebuild b/net-libs/libgmail/libgmail-0.1.11-r1.ebuild
deleted file mode 100644
index 227ad134049c..000000000000
--- a/net-libs/libgmail/libgmail-0.1.11-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to access Google's gmail service"
-HOMEPAGE="http://libgmail.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/clientcookie[${PYTHON_USEDEP}]
-	dev-python/mechanize[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/net-libs/libgmail/metadata.xml b/net-libs/libgmail/metadata.xml
deleted file mode 100644
index 7cc5c4eeadd7..000000000000
--- a/net-libs/libgmail/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">libgmail</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index ef1105eb454a..27957f7db591 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 1312 BLAKE2B d492dff20c2ef2e05cd55473d994ef98ea9fcf3ef7b1b73cf2ce6882bcfa087ef80f2048510bab69a5ece074e7ad2c0c3f62f79983ee7d8eaa356e3d4131c759 SHA512 ec484f83c951f22a546e62f0bcea894a8779c6cfd94b56d7c65d112374b367de1930f0fb36962a79e500cd7fb949708dd2f94f4cfcfa46f72c5a0b02f79010c0
+EBUILD libgsasl-1.8.0-r1.ebuild 1302 BLAKE2B 28e59ead33c7f85cc4094720041eabcb2c2a890c1002681a2574783c4aeda12182b5e4e1a22cbe3245964351a7c147451039d5f4ae85348ac609c4334622406b SHA512 0cb98199e126eb67d7762df8a4fd01d6912422b44e0f0a92880f9a2df230e590f9d8bba7f43ca6dff49cf56b6e8570b172150960e38d860167be4c189b5c4217
 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 76c3906bfd65..93845f3adaf1 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 ~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/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 3d516046dd5d..f4795d0e4a9e 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -4,6 +4,6 @@ AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c06730
 AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8f6e4067802648212e7fb28bc59f55c4293bb319b6186251890c164739daf6076aa5bc4f8ba083c9f68c0115be8738d SHA512 e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
-EBUILD liblockfile-1.09.ebuild 1235 BLAKE2B f94958382f638b3008f82463dcdb9f06a1a334037225bf9fd31ca8eade804c5388c04cb03a1870cc2ee5e79266d859bb069cd855b60946dbdc6e3ab31569bbcf SHA512 f00ce50747bb75a5818b95c4e7e87750d4b891c2e22d89e4c71c64bbef8b804836ce766cc30cc4fe4e29100fed1f3b781b5524e09528cc71cec29c35f2b45a73
-EBUILD liblockfile-1.16.ebuild 1365 BLAKE2B eb781781e516595e90681c7b248dd6c9b6cbf1552a963c62a848ab826d8ca96856fe3d4271f9e9b07566264d0b6eed2e7189c4d7d53b8476fa24f8fc8c4ca80d SHA512 215232d3116f0ea65d44ba08e3f44fa284e8831b8e1e9592e09cea910efebb9fc022c84832f7a0f73dba5b7f8a0342a6ec27af04e162e7292190dd076965c40e
+EBUILD liblockfile-1.09.ebuild 1213 BLAKE2B 6baf53369f3dcfbc3c3d12ad6b4b3f146b4d649aa587a4b29db73959fd9a0623a7b0671089f06210d613a18f854ab127799d3621e1af7f7c3a319fddbd6beb4e SHA512 dc6a60b2695e8f22c496ecdbf4d4520245ebdf4d9306ff4d03e71ece099f590940f16b080684983228f80569596a8c401f6f604077d9a613467fd0d7a48fd4e8
+EBUILD liblockfile-1.16.ebuild 1343 BLAKE2B 4f2857b7952472896346ceb2db57c62cf0e7e983425339544103c0fb639b4209157f178215e0b5833cf1b6a86fc99fa3152425843fda2cebbc2928e708574714 SHA512 9c1fa442fdbc9f478a7b9e0a7992d298b00058a13ac9917eaab31f97d93b362f541727d641fa6d7fc6e226e5de95411910e492c06a6fd73748dd32a62343b81e
 MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/liblockfile-1.09.ebuild b/net-libs/liblockfile/liblockfile-1.09.ebuild
index 2e9ea14533dc..c2e69373adb2 100644
--- a/net-libs/liblockfile/liblockfile-1.09.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 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-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 pkg_setup() {
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
index d09b6e189d02..7dd77e302bb9 100644
--- a/net-libs/liblockfile/liblockfile-1.16.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index 839bd0c66202..f5ade29a5e4e 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -10,7 +10,7 @@ DIST libnatpmp-20130911.tar.gz 18744 BLAKE2B c24a0cb158d9d40049292bfcae8d919bbe8
 DIST libnatpmp-20140401.tar.gz 23302 BLAKE2B 85f2b1045ad3b8b122bc9db6a12d332642e11bd62cd5fa264e141bb75d2dae2920678ce8c240009272593f81f385277d7f911298667896babbc43c8393a8963b SHA512 12616f07b0a096046a35079954b8a34d474e672d7836ddac9da993a47178902aa2d781786ac76c55c5f16cfdf6a7e7258f92fec3850714ad9cd50208d854c4c2
 DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42bcda58cada97d37a2cf74f6f6b5e27189753590552187ed7afce66d34d204b9d18ecd38ac0bcbadf8c8129a3b44ad SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09
 EBUILD libnatpmp-20110808-r1.ebuild 722 BLAKE2B bdace565e17460df38361f3b7e7bbe6c83be72d0a7b863b0f989108aa02196c175b2fcc7a454b08d21992924de6a458bd8ed750e407d8bfdb91c357e2e04a9e4 SHA512 00fc715e7b04c7ca32ec24bb6fdfb72592745edd2a4ad77c27248d908b567da26b91c108d655b996e24c10f3ed9d383cf72735ec245921683e3625aea3f9840c
-EBUILD libnatpmp-20130911.ebuild 786 BLAKE2B 151d792ae96f9886958c46c263aca1f28e624fceac65997f159a8d85fd9b62090ac22f5fa2a821ee36050fd8598961c03ce491a3221da6e50095de78a391d137 SHA512 1b698ebab057ef860b759240b133c343ce89cc4696b21250be00fec5050b86c632154d18b3a96925de52fa766a2f702d56b8c53c0252caac364bfe52a5ae914b
-EBUILD libnatpmp-20140401-r1.ebuild 882 BLAKE2B 85af17d2694d163605448e5399004f9417490c539a3fb579d715385664e9371a7ffcf2a47af5ac181dde71fe04af041e6895f89098831c45d7ae8728946c7a43 SHA512 ccee86e0aff0d6ee4cc581872019efd4261ca4a4ee33cb651681c77c1900ae49728cdf9effb7f3603a96f74ba22db86657f035c311ffc318ea6f0d5ad95c9925
-EBUILD libnatpmp-20150609.ebuild 895 BLAKE2B da4a6af8adc582a0fb225d422f05d1a7830c4bfb97f8b3058176993332942158693bd9832fef771a87a07c005b7d1e6e76b021a14c1770056ee9f40b9639ae8b SHA512 a13b2c9e4bcbcc2b0d0a9274cc675b5db30de865d22bb68140ad70e32571a86b6bd518ddab6530b9eabd622065de4fc462ec4b43ce919c4f6ff36211daea0cc0
+EBUILD libnatpmp-20130911.ebuild 776 BLAKE2B a82ac0c79c2825717d3e4003bcbe256dd177d05b6810606371745972a3c0ba1c75b9b7211f465df52ce1beb4d330beeaafb00dc52a330f75bfa1d8044f2181f1 SHA512 1e6d69662525d6336aecfc136a1b8a6960b15b656a8bb37fbbdf75d4a2f9ff482ec2ca09d1755902450f99cb01c4886d57306e3291f591b978fac2264d924a8c
+EBUILD libnatpmp-20140401-r1.ebuild 872 BLAKE2B 5819e67094a71aa5a6d83460a747e75d740e97bfd5a89e07c8cbb5c8ae19cd4ca8c50f01e9beb5dd49ead5aa6c8df31a7fd8134c3f820c05c9bd952dd74950b1 SHA512 3542090fefcb135a0aebfa289205cc6593a758bf34eeac8a4377dce424a5b5fd329ccc63d3699f11a7ba4608758d2371f0f33241d3f08ea85c615b00b1b810b2
+EBUILD libnatpmp-20150609.ebuild 885 BLAKE2B e247aa193608e3745ee8b24fbd8dfa493bb6d6e116a9288188dba45f791d63e8d6af5efacba6abcee60960ed4f9429cf03bd0082947b8233f68bca4cfb2c3657 SHA512 86ef08525d292d25a553e966f405247700a915ff1a454d7e2c75fd3d8bcb82a00af7958847370eff3dcda1a13f6131e3d263b831e95e22d76e8aec22ee416916
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-libs/libnatpmp/libnatpmp-20130911.ebuild b/net-libs/libnatpmp/libnatpmp-20130911.ebuild
index 465682c0de61..87dec82d0ac5 100644
--- a/net-libs/libnatpmp/libnatpmp-20130911.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20130911.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
index 4dea416d72bd..3b9b76199533 100644
--- a/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
index f0b0e91989d6..95c1b853efb5 100644
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 36524e8459e3..b3f8d691081c 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -10,7 +10,10 @@ AUX libnet-1.2-sizeof.patch 239 BLAKE2B 141f8d9c32d351e5f30eedfe0b92b0d9cb7ad0dd
 AUX libnet-1.2-socklen_t.patch 145 BLAKE2B 35a13516984af9f460c0778a25e205c79e7152178549203f070676dc69ae20b9c99ada7a0194ec898beaa45b403cd584a458079b1d2c458b0b1923f9628d7d8c SHA512 31e7dbee2e6d747a69d86f9cfba43d1f591d97f2868b14c9fa16884f5d1650a7602ca10e875afe5779477d9358db6121fd66371fe183a865860376fb809aef97
 DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
 DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b1044fb292693581c8fbc8fb99c565e0a9436b35914bdbda65798b00527049f279da3b3b6048e32f575f51b92c3309 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d
-EBUILD libnet-1.0.2a-r5.ebuild 1557 BLAKE2B 2c9b314d38563d4e0c1f57c22073ca820baf22fde7c4164c110f16772335ca04714934e8510ea7147e9b483766e54d5189ec54d33f5bd38f0c6cc413de3feacb SHA512 9e2f6c15c56066e87d676c38c214cb2d50ea77ddb79b5bdd0f085b79552fa14a7fd285ba72c5266495f90c829afa428786daf258c3c7bd46f676b02ce8d94c31
-EBUILD libnet-1.0.2a-r6.ebuild 1310 BLAKE2B a022c848c68aac837bb39b2cf22d9812bcfcd4337c2015c9a245bc8b9448e37260da9ba18f41c5099287900ad3107a18122b1bb5e2c59d626a088393a649b0eb SHA512 641fbbade6ccf33957314b2ac191b932584390e5878851442b06f8ee8149733fb5b3c47f90ffcb630aa46145ba763e2e50da54c66b7b603651fa605dfc543d62
-EBUILD libnet-1.2_rc3-r1.ebuild 1187 BLAKE2B db43e462acf7218c72d9de417f585928747ff6d3386b5e9bd12e11292814a28520b5256316d3f30c06b47fcf50c59fb56d72e94014d99d33cb7b6d05c690291a SHA512 96f1228ce154b285348e9dd55edca81d7c71cae7ea26d921959bcbdfda75a7b22965d9c06e9855575b55c81f55a4f78317ffa46d6ce358af3e235190ccea78b3
+DIST libnet-1.2-rc4.tar.gz 615726 BLAKE2B 90d2a98dc52c32ff7d97edd4f85c04e56ba5c9300b39fff560f39078dbfd451474118168c291db1fa13fb0d6af123c23a604e03d0f88609a0c131c694cffd755 SHA512 01c815c9e544f00a2b35372466ff8b372b132e3d4ee7b99557f799e0b4380777bebde2ce9bdd804314dffe88ce953f332923d9fa2bf3c186ea19e045b94edbcd
+EBUILD libnet-1.0.2a-r5.ebuild 1547 BLAKE2B ddd70dac9ecada0c45dd08e391d15a388f3a370356af91190a3f4bdc6aa267febb69b32420194ffb1a3ef88c61bb613865b87d440cc03fafa3c5384b7d1b0291 SHA512 52fbf03433c1c43f93d173051fbc1125751fb1ea1fd5190679cad0b396d38c6f3383820f7ffde729d1089e25358164cd50d360025ab98551768188591b8da92b
+EBUILD libnet-1.0.2a-r6.ebuild 1300 BLAKE2B fe48dca00c2a8d75a870249167c92c53ee7361aaa642549f48808e3bec38fe7d8e8f2f4c1f623998d72455cd27de02240e7128a72ba0c6f433b29de7e61c2621 SHA512 4ef639aa0dd8832828208cc56bd7485d9f4ce4068f74045d741ca69cbd80598eabc57dee2f965055a5c8a45e21f2288b30aa3d2e31d2876cf87029be4df16614
+EBUILD libnet-1.2.9999.ebuild 692 BLAKE2B c0d3f44c1efcd3b3cfc7bea53da3d12273fcb747b1c3ac0a0432eefd5e5d6213bbbf4b85d1c2e5ed7d8c489b894892f967a66e829df5e81d43768ed8421327cb SHA512 5bc4dbe2242afe4e83e46964fc7dded71b8d77bd7793dd6191d76d421f926b8848b0de265d684ad33e327f3a698a7153691cc431125f53d3cb81199ab0f00c3a
+EBUILD libnet-1.2_rc3-r1.ebuild 1177 BLAKE2B a55b2b372255c92e2ca74f5408ffe85f36df6ef50ba62cd0e4d24cf0b0f3a52f9271168b0042c12c47446afffccee2b60938b5fea19fe81c4c8926f19136a752 SHA512 c6bea7f97ea6c5a8c1330347ce258716c66248ad4036ddb6353fd73636f20d52757c5d4006865a7d779347ab8512c908d7634d7d17c99eef9dc6e0d2ce9a2af0
+EBUILD libnet-1.2_rc4.ebuild 802 BLAKE2B 7e1e42f622c4046be068259d653bc912bd7d3cc008ebe9073ed0f75acbf99339d48c154796f697a9f8007823f10258935ef1cf7fd1b2594fe60f1d5cb7a3d5b8 SHA512 aee2b9821fb0b9b72a7b5920b8296a976713b1031271afea5351df96461d19ea8ca042904568926f297f4055385acd356fbb5b80cd90d75ad95dbc6ba42918a9
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/libnet-1.0.2a-r5.ebuild b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
index cef3b46b4cf7..d0a9ef24bb05 100644
--- a/net-libs/libnet/libnet-1.0.2a-r5.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE=""
 
 S=${WORKDIR}/Libnet-${PV}
diff --git a/net-libs/libnet/libnet-1.0.2a-r6.ebuild b/net-libs/libnet/libnet-1.0.2a-r6.ebuild
index adba36bff7dc..850469f76099 100644
--- a/net-libs/libnet/libnet-1.0.2a-r6.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
diff --git a/net-libs/libnet/libnet-1.2.9999.ebuild b/net-libs/libnet/libnet-1.2.9999.ebuild
new file mode 100644
index 000000000000..33f91d1bf653
--- /dev/null
+++ b/net-libs/libnet/libnet-1.2.9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+DESCRIPTION="library providing an API for commonly used low-level network functions"
+HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet"
+EGIT_REPO_URI="https://github.com/libnet/libnet"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.1"
+KEYWORDS=""
+IUSE="static-libs"
+
+DOCS=(
+	ChangeLog.md README.md doc/{MIGRATION,RAWSOCKET_NON_SEQUITUR,TODO}
+)
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
index 1f0dd9180d54..40c3c26cfb68 100644
--- a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
+++ b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DOCS=(
diff --git a/net-libs/libnet/libnet-1.2_rc4.ebuild b/net-libs/libnet/libnet-1.2_rc4.ebuild
new file mode 100644
index 000000000000..8a6dcf74cdce
--- /dev/null
+++ b/net-libs/libnet/libnet-1.2_rc4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="library providing an API for commonly used low-level network functions"
+HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.gz"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+DOCS=(
+	ChangeLog.md README.md doc/{MIGRATION,RAWSOCKET_NON_SEQUITUR,TODO}
+)
+S=${WORKDIR}/${P/_/-}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 754eaa2d386d..8b479b44bfc1 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -3,5 +3,5 @@ AUX libnice-0.1.15-libressl.patch 1961 BLAKE2B 7e06399def0beb5c744d97fc6ed3a73eb
 DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 EBUILD libnice-0.1.13.ebuild 1566 BLAKE2B 4b5dcc470188b8fba4435ed7be47dacda438d59821ecc69f5f6875572d91b3bc6a4039febb7d2c241674122b6db0aecd1dfcf2c15a226bb144850d7b403fefb4 SHA512 85220da97849a1202ff57fc6864011bc5d6c7e2ebccdc7ca98a852af08defd5616dd55bea86cd101c60dda24444258d51374124ff2ce52c50f47a6dd7c0b0137
-EBUILD libnice-0.1.15.ebuild 1758 BLAKE2B 8798490dc67933705234fef225b13cdad5f650cdff5487dbe5c148a293c6f4866456675e92d3b0346cb64f3e63cc799341695f0b016215b7ba9451a3cc260682 SHA512 d1474f0149a757578eb4a1bffa0fa3559523c0d9c4294ba8f94fa41a7c6d57298df4d3d798236550feddae326e756419fad79d984b5d863793dfcfd929f7fe25
+EBUILD libnice-0.1.15.ebuild 1757 BLAKE2B 26977a1c9b38433a0f494211359c8ee0cf8305c1b91162922615c0f470115d7c109ed4412087d02c386a5db2d086a05f626c9c1d7e485a326b82117f30211bac SHA512 e948d6f30ded76113052a9b0c4c4f13b2bee44772700219b3a6e784909ca2bb7bfc4e9fa19be944737914b9245d7e1fdc5d5ea306e233088af7b42308e2f8176
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
index 096899283e99..c61248f904eb 100644
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+gnutls +introspection libressl +upnp"
 
 RDEPEND="
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index 896afe94d77a..ed917ca1a8cd 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,3 +1,3 @@
 DIST libntlm-1.4.tar.gz 568414 BLAKE2B 2a622cd2d7b944128e29503845a3c9789efc9d14a93935ea24f9001d10b279969a8869f7ca68e6e36728638a32ce1ef693a5e8c28ab3bcaf702e114d4bf21dd3 SHA512 888ed2e9ee3e01a53bec951534966378a21c8a0baf555b65d97fed4408568c6b67f4199396cf3e61bb5a73b8e47dbe1333449369a92499e16478b0b60ac78274
-EBUILD libntlm-1.4.ebuild 445 BLAKE2B 53b25ce4fd6947072fb4bb4aa724ce2c06fb4966c195bb7d407b6ae55c09d9b2b9570447cb9a82cae61389c709f06764c385a8d5c6bb7929c9a2e46014684163 SHA512 6912b45ad4e81f059e58340b01d366c2381680b00387b9acb1cfc6f926118878a84bd1a55b7045a0d7cbefef16eb7eee0edadc0b7cfa3de22255408f5ee6854d
+EBUILD libntlm-1.4.ebuild 435 BLAKE2B 9175e279415c74a3f04e2df33730eb005e46507e32d899cae7759cac7ccd9c7b3365b297c19882986088fcb288dfd3ee485b9b3206772106bd657839ebb6aa50 SHA512 0a2773592b72e50d503638e7b6744501162bbefa97d9d9f7dc5ae171d6f7108708bc84dde41cd7a0e568cf30ffee9f02645196ce90cdcc029fc8d7dd5c567d7e
 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 b3a65b533dbb..063db00f1dec 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 ~amd64-linux"
 IUSE="static-libs"
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index 7f2d4483596f..0e866c743236 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,3 +1,3 @@
 DIST libotr-4.1.1.tar.gz 655791 BLAKE2B 51be68277b56dab96a68fb744e467dc13d966038849ccc0b98b1d0082bcf3b4a0b7fcaeb3f050b0798851723bcdf11bc7ef6681a94999105656dec2fe919659b SHA512 c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0
-EBUILD libotr-4.1.1.ebuild 584 BLAKE2B c08a6cff7646e2cceac4e33ebf3b1621a8932ff8d9dafbd339fc9bdea40868ec0bf785226a3c67cfc743efe86d30be824cf2f31754539fb64d34c1f1d5fb03ef SHA512 a6c87ab4c0ae8f663ec0f7057a88db777dfa94d45847df7776c28cb6fb2ad6ae8e0ca0d40145e7b6e2e346dc2767960251f00fe051a58439db96aee5c9d9659b
+EBUILD libotr-4.1.1.ebuild 574 BLAKE2B 79b753ff72150879a2ecf3d9392b4440142f6101350942521cc026e5f171f7461276a5799529caccc7b81206ff7c23e99dcfad81a732e4602ec12b8d59a92bc7 SHA512 c1091dd47ddda735c20f2ca82adbdddc6fd14e6bd5a896fc5940085996b4edf986cc6a646acac011878252f6f5015ac4ce7afffc6a01660c8a659744745a71e0
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index 602159f6feb1..ed4e3b66ff8c 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libgcrypt-1.2:0
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index ee6c9ccb66fe..4d0d8bd6eb28 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -10,9 +10,11 @@ AUX libpcap-9999-parallel.patch 640 BLAKE2B cb1b081fba0b53af09ead5e4c0bc3e5b7856
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
 DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
 DIST libpcap-1.9.0.tar.gz 819766 BLAKE2B bf98029eea58328c1c820966b100d8467373c9469c107bfe36bcf17e5250d64c45a331050b8a1027c4f4eb1600925b873e4fe43d866ba5a9dc5dcc7995137de1 SHA512 b94d63204f74fd155c1409c50b84c4a02d5b9db7069a24d42d496056416923183331f587903f9101d8464b74efc7db22f113c48e518bd7fb3082b333bbc337fd
-EBUILD libpcap-1.8.1-r2.ebuild 2003 BLAKE2B 7dcbc9656cbda85903363e4d3e6cb149df76c44d75243fafb8e2e414a7f39026e434f9309905b1879e4b6059ac252ddf19d350459e7206c53f89839a61f92ffa SHA512 bb143dfad1307d0a3246eea173a3fbf9ce66f35e156c61e24b873f402bc1c3d40f3d1142edcf7daccc5c09ff62e720e4eefb3944d8f38ddf3c6fb4081e395f6b
-EBUILD libpcap-1.8.1.ebuild 1916 BLAKE2B 8e51e1f17444dad1614f3f182c0eaacef1ccdaf5a6c83bae406e52484ed260ac0ddcc987b4271e5efbcd6e424ecd36a12137539f18b50365ae134eae4956bc99 SHA512 0ee228ce842d912be7b808ba7c4749d931f370914915e6dcc7702eb77c366a561af169ebe6b22657ebebdd1b7dcf3b40760f99099445cc2428589f1243583a69
-EBUILD libpcap-1.9.0-r1.ebuild 1850 BLAKE2B b58af5a4955c4476724d65f45c4adc44fb950cc327e282d6fb0cf4cb081624f7cbf5f931c557a6b14aaa9b0c992267031f7cb116b80fa0981450ba689d24ae12 SHA512 259c29e531b016747fb9b2ca02782c6e484068bb45b573adf6c4c878f10f056b859db669c63e9cff9ed141aed8e8401ea173452e9b03e424a58dff18e7133e10
-EBUILD libpcap-1.9.0.ebuild 1807 BLAKE2B ef1334b7356fe43b302f8526e70b8c244824ccd60b9e3825484f56f4d46a2f76d23dfac18d7f1c36aebfbba097252e6c27e8f706049cbe0b3c1985a8e938025a SHA512 31f6a00350d35015c7cd6de63715d0e5fcdb86be2aa81067d201c2a9b00196e0d23736969b1a1df7c915fffbbe9e524e57d35f1550ecb644f93659c728fe6116
-EBUILD libpcap-9999.ebuild 1510 BLAKE2B ca653872343d7f710dcf2ebfcf0a85f40fd82392cb030ba6ea0d1b01be98dfb132c748e7baf55c4556300634ee08836886f507b642b5172f6c3ba7ead3e84361 SHA512 472ada950b336389d86c12ef428636702e009a8a0e7fe63ecd0f3eb497a669b97e145b5cd91a4c3e04f1c803470a313502be2f89d400747c91fbc9023c9fcb8f
+DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
+EBUILD libpcap-1.8.1-r2.ebuild 1979 BLAKE2B f5ec73791a44f9c865732a6515d5664d43464d6c6a761836f10d8ee6903f4f207e9c82a482f9a2f1ef5bce5c9b68fe6035e04f36b2a703830987fc2d6b0373b7 SHA512 6ad2eea58b2974065cab9a4ae9d26db6f06b33670ee59200ff393c76c96b90daeccb4f2af2b4a963f50d2e138f2acf97fccc4276ad6274903c58aff1d93372ea
+EBUILD libpcap-1.8.1.ebuild 1892 BLAKE2B 58b1cbaeb29022a110253276b7df4f4182626ec1992b9beaa3370521ffe9837fa286b46605c8f1279b2bd03128249c51739a0944bd75dcf183737d35f62626ff SHA512 50e6b200117df2b5f8299a4120e587c20a88f9e6f9de00751a13051a22cfd93bf2d26171cb98c0c336941ec6d1f721ad480c3a1d37a9082b875420cd4c7c0901
+EBUILD libpcap-1.9.0-r1.ebuild 1829 BLAKE2B 0c0f8d9d48e4beab451889b1a196a25f6d466ef9e28179f492ea954247c7fea84f9318d8c5f3287927587b9902186ed1989b7ceff016badf4f2eb8a9fc54f0f5 SHA512 3a17ab76016ca78c3d662c78a81aa6650e35b4c1d4c775097bc4c8ae1d2a1c4d29d75ba85f5f53026e962ee7d4d7b8b1e2f787a923fd7373027802ba639153e3
+EBUILD libpcap-1.9.0.ebuild 1786 BLAKE2B a03a7cd4be50fd8bd0aab4e2cdea773888d446ecd80648bab12e99bf5e79fe9cc2bbcb2014a5c95a4525df6c06e0ce1d44be14500dbc1e7ffa4d121b46e3f1a3 SHA512 bce2cbec68b83853bf771050ff14afbc3619aa955a2f0b3cb78354b86d053dc9e6dc657e9de28231c3a94e1c26120f36a8b458d55a9ff1eb706536d72fab2fed
+EBUILD libpcap-1.9.1.ebuild 1746 BLAKE2B 078278ef947781c3ac8c72657a6c6efbd30f279beaa741b8d3c19765d2941d341d68ee1c391003051324752d0885b95684b80baf9676e1c24afb4d6a67590b8e SHA512 dd4c2fdf7d990e84907beb5160c0e496814b2f679c0e87645f3718e7e7ce0c93954bb774cf16d08d2455534f5efa0a2b4f289c27922ce5b450fb08c7243c6c66
+EBUILD libpcap-9999.ebuild 1511 BLAKE2B 566f2bacf9f69528fded05f0f6b795a0073079471d1a2b612e3f0550336c6a1c1a95bf4ab2429d5a0daba325f6c25403d908c2589b4be0796dda080b7493312f SHA512 567414c4ecc85898051104b46564bceef8c0a8b61f21c6c1ab6116735f1a59379affe8ff4b35b0c22b832ca3be3db948b9d8736bc8f3b47a8d99241603b58d1c
 MISC metadata.xml 532 BLAKE2B 849e5d71a36953d94f8fc4ccce028dea25038eeacf50cbfc45c390155ad84b87fdb217b1f2ec4284c331f98d72367b9e3e82283b3660805f506b9eda8cdfd236 SHA512 e71f06ad211b784c6a454411f54a0bb7575a934f86f345602d205fdfa56b609e4d2d0b5c907bad047793f3c7b4373e000f67e914c17c1f402cc267e7e7493f06
diff --git a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
index b2ff810d954c..92a37da429be 100644
--- a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1-r2.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
@@ -6,7 +6,7 @@ inherit autotools multilib-minimal ltprune
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/libpcap
 "
 SRC_URI="
@@ -15,7 +15,7 @@ SRC_URI="
 
 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-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild
index 6f9f91240130..9fc1dee01997 100644
--- a/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1.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
@@ -6,7 +6,7 @@ inherit autotools multilib-minimal ltprune
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/libpcap
 "
 SRC_URI="
@@ -15,7 +15,7 @@ SRC_URI="
 
 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-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
index 69742603f3c5..4fcee8fb7f7e 100644
--- a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools multilib-minimal ltprune
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/libpcap
 "
 SRC_URI="
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.9.0.ebuild b/net-libs/libpcap/libpcap-1.9.0.ebuild
index 6acfc95fcd70..2aec97348eff 100644
--- a/net-libs/libpcap/libpcap-1.9.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.0.ebuild
@@ -6,7 +6,7 @@ inherit autotools multilib-minimal ltprune
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/libpcap
 "
 SRC_URI="
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.9.1.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild
new file mode 100644
index 000000000000..774c6e1c729e
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.9.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal ltprune
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="
+	https://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/libpcap
+"
+SRC_URI="
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink static-libs usb"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+S=${WORKDIR}/${PN}-${P/_}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
+	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > VERSION || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable usb) \
+		$(use_enable dbus) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+	prune_libtool_files
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h portability.h
+	fi
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 3e6c9db1d115..f240ac606d96 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -7,7 +7,7 @@ inherit autotools git-r3 multilib-minimal ltprune
 DESCRIPTION="A system-independent library for user-level network packet capture"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	${EGIT_REPO_URI}
 "
 
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 137ee253915d..001bd2875669 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -5,5 +5,5 @@ AUX libproxy-0.4.12-mozjs.pc.patch 781 BLAKE2B 9476a64b55fff7ec206042c42479c76bf
 AUX libproxy-0.4.13-cmake-37.patch 954 BLAKE2B 156f95113351f42f4e48a741f13dcda3cb0cfa7e26409c7cdb1b3347b4e0e30afb4c06de371723180cb4533df5180563606055b2ccd0f1a4a9b314cd3c84951c SHA512 e1aeacb40f06e9137d1f82444961e1216479e7d44d18c9d4c16b09d0e0b0c92c2f77e4c37fe33a020695d5dc23b1e4b2e4617d25e7d878bb816c60f3bc78ed45
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
-EBUILD libproxy-0.4.13-r2.ebuild 3145 BLAKE2B f446b95348715f757f652dee9a68eef98c2ec02bbe28248517dfd333233b104157033bf2d9f47f268cf9a96a5e2a3538933026cf1e38ea6e16851a5f247cbe8a SHA512 9dd5734fa6a71de4b5e7291f144044796080f1d4b9f148e22fc408bc257622cf9250f9fb951f2fc093a553de74624fac27f56af4d9439324203dadb7e200858f
+EBUILD libproxy-0.4.13-r2.ebuild 3135 BLAKE2B aba07c029ff36588c638ea841a1388ec02313df8309b692eaaea9ec47535799abf5d2a6021d155705dec56c5a7334f49147d8768faa77b5148c51f244e6c6268 SHA512 790bac581241ffbf05845ba4b36187a34926844643d832fb3ab69e052e5240eb45909c8fcf37b96039e5033887cd898fef1b4e7dfa058662cac76ea2be621756
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
index 90958fa58329..d18c96c3686c 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 1274a3144892..6885914a2564 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -7,7 +7,9 @@ AUX librsync-2.0.1-libdir.patch 500 BLAKE2B f500f461b0a4308d77b53358701d33bbfa31
 DIST librsync-0.9.7.tar.gz 453802 BLAKE2B 0f8a7a758d847498876401aa04473946970be0257dc0cc4abce85adc7adb5d480d7a41e03d43f667e44ec646ce74a75dfa6b0c63c7f239338244b67eb432e31f SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef
 DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 3b3a109307dc03e567338709f1c3958a2ae7887165208848359677305f6a983edc1bc71c721dd3f414f77e0507426ae5bb59b9fde51595a92379227ac316127a SHA512 70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
 DIST librsync-2.0.2.tar.gz 174480 BLAKE2B e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
+DIST librsync-2.1.0.tar.gz 175630 BLAKE2B effd2a8c79fae202921220db7581be1d9f7d278e6ee5155a23e586d9d4a7a27bbc4a50049ddca3b187a8e08451c6dcde7340d22be9fde0c2c12462392043fd8e SHA512 9b91f4b696c1d1cdacb5c0679c7df7a92641e0a6a599c2e5de2bc0af3052b2045bb16c40b072c40859074d792c78c57afb0817917fa9843b179befa4506ebf04
 EBUILD librsync-0.9.7-r3.ebuild 880 BLAKE2B 92da9999000bae998ed7761373ec8d5dca977280cfc713d600de73ba4a9b6c186503cb9c7149d9167bf24b931e4decd2cf87c3bcb3f155ee0196ab0517f3f7ae SHA512 0096c65f111f796ee1ff6ffc26053bcce03c65eeda12fa7bf36c038768fe027587e0666104f66f107784cf1680810da28b2b620c4710a5df2032cd7e5a4c2806
 EBUILD librsync-2.0.1-r1.ebuild 670 BLAKE2B 4ce6598ddb823e0fffcf09097b226820dee13699b15e0df10481394014f803279674195f5781a17e4a417967f4acc86102ef69ab3c2f87b0169ddf677b9a8b52 SHA512 bb4ae215c3680313652ac5e919eb3c3458f9ab42b968b33b29fa250537bac4de32fe6522e122787a42c5991091cbd1f0459f2bddac48601762324570dc41d253
 EBUILD librsync-2.0.2.ebuild 615 BLAKE2B 884a1929b644cf41e4caa4d11ded0a6b7318c76e95e0f8bb1ac539b2411441b02753eafedb31ad04dd58da1f13cc7a9c22e6c14322d574fc30bb47113f932b9e SHA512 80cf4f2a7edc12be596a3005a89ca34649d94cefe7a4faa7a62da6411d1281ebd936d7304e1a3b54c6839c8cbed59633282e9d30cf048054ff95cee093364603
+EBUILD librsync-2.1.0.ebuild 615 BLAKE2B efd433ccf17b5f5814f9c65cd3c87c339c7647c53b04fa28cd8955df78912d8798ef971a199f68705d0d37b1f32ac9ff674bf24ddc0cab467ad3bc8738303cd2 SHA512 0112716733dc48917bf9ad56060c8b3b4ce55d9f0e7278b1b8e22616428e37d8e08a385fa60f79bdcdfc5139d7732012f89c7046e216beec84fce0414996062f
 MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
diff --git a/net-libs/librsync/librsync-2.1.0.ebuild b/net-libs/librsync/librsync-2.1.0.ebuild
new file mode 100644
index 000000000000..19f0d6f4bb2c
--- /dev/null
+++ b/net-libs/librsync/librsync-2.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Remote delta-compression library"
+HOMEPAGE="https://librsync.github.io/"
+SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+	dev-libs/popt
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_LIBB2=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-libs/libs3/Manifest b/net-libs/libs3/Manifest
deleted file mode 100644
index 8841e270166a..000000000000
--- a/net-libs/libs3/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libs3-2.0-build.patch 3224 BLAKE2B b178351c542cf08774a3d539a22f0751d0340e7334a26a198b5744ebf1c578ce6b1506688f915e34b8ba86d034173441635a9990109d38f557e75ac7e844fcf6 SHA512 730fcaa2bb57693d6e9b4ec7318fff24d674ea71bc85c20c0ee90e4a7af30eab40f56c18bdbf27b3cc978e7cf1467db84fe01ee522f2f12afdb375310c494435
-DIST libs3-2.0.tar.gz 105783 BLAKE2B 0a570bcada0b841eac66df7c6b78e43b755314138d657fe393291e24632097e9e892e07b3b1986cac25ca51a8db740265af570d3baa8c5544f885fdf01b55989 SHA512 eabbc24f4beaf270e976bb0071fb372c213dfc00051fc3b33e5f64f9b2690765bd7b764162ecb0da09b173635b37b6e3e0a111523850c8aeea8d9b9be9b9c7c9
-EBUILD libs3-2.0-r1.ebuild 704 BLAKE2B b5c491a08ef5045a9658af85211ad7407b74392a1cee4c1ab6ca372ffd26d9558760b6fa3759a1cdaa3795b2b8e955a33f130ad01dcee340ed82a7eec51d07fc SHA512 842cfb5ed68c0e07904767e7fb1c4730e3c9ea864990fa8a48258b7ceb88330c1d5175db4ff0f42421204d315ed5f6ca2753ac4bad8c0e8282dcf8e2c3134169
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libs3/files/libs3-2.0-build.patch b/net-libs/libs3/files/libs3-2.0-build.patch
deleted file mode 100644
index 804a0d28332a..000000000000
--- a/net-libs/libs3/files/libs3-2.0-build.patch
+++ /dev/null
@@ -1,83 +0,0 @@
- GNUmakefile | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/GNUmakefile b/GNUmakefile
-index 36398c1..dc24843 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -60,7 +60,7 @@ LIBS3_VER := $(LIBS3_VER_MAJOR).$(LIBS3_VER_MINOR)
- # any value, then verbosity is turned on".  So don't define VERBOSE if you
- # don't want verbosity in the build process.
- # -----------------------------------------------------------------------------
--
-+VERBOSE = true
- ifdef VERBOSE
-         VERBOSE = true
-         VERBOSE_ECHO = @ echo
-@@ -125,7 +125,7 @@ ifndef CFLAGS
-     endif
- endif
- 
--CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
-+CFLAGS += -Wall -Wshadow -Wextra -Iinc \
-           $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
-           -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
-           -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
-@@ -134,7 +134,8 @@ CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
-           -D_ISOC99_SOURCE \
-           -D_POSIX_C_SOURCE=200112L
- 
--LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
-+LDFLAGS += -lpthread
-+LIBS = $(CURL_LIBS) $(LIBXML2_LIBS)
- 
- 
- # --------------------------------------------------------------------------
-@@ -157,11 +158,11 @@ exported: libs3 s3 headers
- .PHONY: install
- install: exported
- 	$(QUIET_ECHO) $(DESTDIR)/bin/s3: Installing executable
--	$(VERBOSE_SHOW) install -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 \
-+	$(VERBOSE_SHOW) install -Dp -m u+rwx,go+rx $(BUILD)/bin/s3 \
-                     $(DESTDIR)/bin/s3
- 	$(QUIET_ECHO) \
-         $(DESTDIR)/lib/libs3.so.$(LIBS3_VER): Installing shared library
--	$(VERBOSE_SHOW) install -Dps -m u+rw,go+r \
-+	$(VERBOSE_SHOW) install -Dp -m u+rw,go+r \
-                $(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) \
-                $(DESTDIR)/lib/libs3.so.$(LIBS3_VER)
- 	$(QUIET_ECHO) \
-@@ -199,18 +200,18 @@ uninstall:
- $(BUILD)/obj/%.o: src/%.c
- 	$(QUIET_ECHO) $@: Compiling object
- 	@ mkdir -p $(dir $(BUILD)/dep/$<)
--	@ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
-+	$(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
-         -o $(BUILD)/dep/$(<:%.c=%.d) -c $<
- 	@ mkdir -p $(dir $@)
--	$(VERBOSE_SHOW) gcc $(CFLAGS) -o $@ -c $<
-+	$(VERBOSE_SHOW) $(CC) $(CFLAGS) -o $@ -c $<
- 
- $(BUILD)/obj/%.do: src/%.c
- 	$(QUIET_ECHO) $@: Compiling dynamic object
- 	@ mkdir -p $(dir $(BUILD)/dep/$<)
--	@ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
-+	$(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
-         -o $(BUILD)/dep/$(<:%.c=%.dd) -c $<
- 	@ mkdir -p $(dir $@)
--	$(VERBOSE_SHOW) gcc $(CFLAGS) -fpic -fPIC -o $@ -c $< 
-+	$(VERBOSE_SHOW) $(CC) $(CFLAGS) -fpic -fPIC -o $@ -c $< 
- 
- 
- # --------------------------------------------------------------------------
-@@ -230,8 +231,8 @@ LIBS3_SOURCES := acl.c bucket.c error_parser.c general.c \
- $(LIBS3_SHARED): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.do)
- 	$(QUIET_ECHO) $@: Building shared library
- 	@ mkdir -p $(dir $@)
--	$(VERBOSE_SHOW) gcc -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
--        -o $@ $^ $(LDFLAGS)
-+	$(VERBOSE_SHOW) $(CC) $(LDFLAGS) -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
-+        -o $@ $^ $(LIBS)
- 
- $(LIBS3_STATIC): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.o)
- 	$(QUIET_ECHO) $@: Building static library
diff --git a/net-libs/libs3/libs3-2.0-r1.ebuild b/net-libs/libs3/libs3-2.0-r1.ebuild
deleted file mode 100644
index ad4b5dfd9160..000000000000
--- a/net-libs/libs3/libs3-2.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A C Library API for Amazon S3"
-HOMEPAGE="http://libs3.ischo.com.s3.amazonaws.com/index.html"
-SRC_URI="http://libs3.ischo.com.s3.amazonaws.com/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	sed \
-		-e "s:/lib/:/$(get_libdir)/:g" \
-		-i *makefile* || die
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}/usr" install
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*a
-}
diff --git a/net-libs/libs3/metadata.xml b/net-libs/libs3/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-libs/libs3/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/libsmi/Manifest b/net-libs/libsmi/Manifest
index 4b69a5755de4..5c33eb3c8ec1 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,6 +1,6 @@
 AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c886328c5f0e167a68f38d68a170809a63b63439ca99b0e23e6f3b548cb99a518651e93236072de300001c453a5de6f23059709 SHA512 e4e1f8f0e598656785123241cc8aabc948058229cd955ecf651dcb49332e9e35fc4c9831a6336e949e557e18e2af58bd8aa8f31b25628f32b35ced3972fa184f
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.4.8-r1.ebuild 987 BLAKE2B 7c1cd2934dc6f4d574bcadd128b6e31f935c35861722615daf0a973f213ee7b2efff44159e67384df69768b6f8228e22e26d72824e7829ebb3e0d06c61840205 SHA512 73c32e819cedf76066ca4a466d19442510d47c6de3b9dadb2d265cef124434bf5c62745a78ec8c3dc23db9e7bce170d286fe804a98a6fe847d4d4b4b399dc0a5
-EBUILD libsmi-0.5.0.ebuild 875 BLAKE2B 05caa28e24e4320b55a8fd9e1c80707fe37a2bda2c7fea947707700bf59d95bdb4c7c691c864e749ac33d89839d41661f3c9b6b32282c99a4259e01473df3c3a SHA512 7ca8b64fe8087a66d54812927083eaff53225956c119f9a4d6b7428a593e818c1eadca329eec638f95bc08112fd4dde6908949ac887e0738175fb4f940d99265
+EBUILD libsmi-0.4.8-r1.ebuild 977 BLAKE2B a6acd15aea3179b15f5d907e401c91d334e509e1ba17335c56f0aac4f8241d924addc7df0f693c6e5f3d3e0581568a805f32893a3235c1975fed54fde3e4ba19 SHA512 2bfba7c7e98bb34912860320b253bddc7c3b769ed613b7cfcf15db607a5d60be5ff1dd248d55767589610fedbf6955247e6622867fb20bb54dbfa60507090d93
+EBUILD libsmi-0.5.0.ebuild 865 BLAKE2B ab58c135612d67f80f86d0713625a1c7da09d31a0056c9ad9839140b9a5de40f9c79fb108025a1feaa0e574b6d62f6b3665c2cf84abebb67c46b4245fa828de0 SHA512 4fea5779eadbef4c6797846b8cee5346748dc1370b32d3607769725bfcebf04567696495d2c0e81e066c73205a4a675b726efca34c65abc357f9d3eb7c797b4b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index 0951b2afd466..d16177829871 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0.ebuild
index 43b190287d61..086a1135f946 100644
--- a/net-libs/libsmi/libsmi-0.5.0.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 4843ed8afd38..fcf9de5e7e31 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -7,9 +7,11 @@ DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e
 DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
 DIST libsoup-2.66.2.tar.xz 1446024 BLAKE2B 2953b91e3bf28b80189a87ecff3a9d103d57bb090f62121dc441e9bfa65750b67f2ab4f50e7a7a0cf5691b79139ae84de5aeaff69e7505b5c2fdd3f375536724 SHA512 1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092
 DIST libsoup-2.66.3.tar.xz 1448924 BLAKE2B 82edc5afe06d41dcd18989fb5cb439047f52c52bd13406fddaa3cafc5540d4c54924c244bb9d58839eb0cf7187da8da82158ddb01f16a7913f543f95df4f285d SHA512 166559480ab84c9bd5407abbed51f4ed76b5c061e647441bf2657ed2c918402985a0a3b9caaf14639f11a40e0b9130bf270a94b32fb72ade3782fac8692bc2ef
-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 2749 BLAKE2B 355649f9823662e3de59e959e3123cebb01fb3bf80fd3f4d68d2197cef02f444fd0761d79153af3217a9d5409f81fc00d74649c931d483aedf349cb0966112eb SHA512 bea4a4a5774888038defe6b3c0041d3b14ffdf46e4942b5afb0183c56d95d8b77478cbaebd0f03fa2aae4cbb17bed028e68a839de5bb7fba7f676543c3105629
+DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
+EBUILD libsoup-2.58.2.ebuild 2989 BLAKE2B 57ce5571b78237b0cf301cadae2fd341b60b761f9fd4d7355af3a0b06c1f5012d61477be371a217c3612f8c59ed0cee40efde362e9ed9b05c26fde1c8381efc1 SHA512 6a03441253bbf0d2b1769d108fcf5a2ba7d79214222e79f95b74417ab378c661f74976e5394f6a2a5b6068e9c263cad81eb04c081b9446828824faf5f3ef7c50
+EBUILD libsoup-2.62.3.ebuild 2900 BLAKE2B 0c898abfca51dce0a78b6fdd882bf4cd7a60aae0518613c3c30f81ecdd1a4b40a43cd2625fa3171ca2447180786d8685b6032271ac45bace2e373663fb906d89 SHA512 cd447855a0cc044853c07f9ef45f4886113349b5192b50cc0efdba7428c1dfcbfbbe6f5f2a31bc7b0ec83beac5f87003176adebf8068df0d13456afe88d20c73
+EBUILD libsoup-2.64.2.ebuild 2748 BLAKE2B ed2f5330b2cb693564086bc2f2a4a4aa9eded3f21f0598a49962317cbba6aceb2c8d2b6963ce1c78c101904f1628714535023f27d0aa4c9acc86be45c30e9f41 SHA512 73fd3defdcdaf27179efd312e6928c416675778f56836b7160f3e3c9498fff3ce2dcc722fa490f28705b00b47dd8b7122e2b0cc239a3c32a3b18af8075cada06
 EBUILD libsoup-2.66.2.ebuild 2751 BLAKE2B 19a21abb9fd70ca5c5f21d9756fc711114aba0f8028364603574e8550a2a2a100890d9df5d459e57cb769bca805b92ac8f77b606e2444f17e9f5e4870b7fb283 SHA512 f49379ff1e40ec9b62861141c6157576d8d0dc4f9e40c16199bcedb8267d6e3012e6b73e3a4b2850e79116642b81251199f5253440f33ae27cb8c1215b088032
-EBUILD libsoup-2.66.3.ebuild 2757 BLAKE2B 5dce41b873d5463e4035ea430e180cc335c22118517b032939f507fe1132f2905e861f0062175edcabba26541cee8e1b5adf83074da08f7e703863aabeadf433 SHA512 717d9b5f770f5441b779c2cf57b4821f40fba74ccece1baf34e1b92b0c99f9c67f66201f6ed1199b267b0bb7662e24a9fbbc843f4de19b0ed6febab1300a0294
+EBUILD libsoup-2.66.3.ebuild 2757 BLAKE2B 5d90e8787beaba8af83baad61d0cad6234e2a3400554bf30f91c110fe1a84b1dc8cbf4cffa5f261e2e5de2d370ba968d44b1fa40bfe2858139e50119719d35b7 SHA512 084658201916ff1a7b7c74ba9b820e33c58b5e4455935e8918ed2d02c76d7847c7c1508f8bb504e51bf212d9cb72d1528dafab34af8a59481913ecc09838cd43
+EBUILD libsoup-2.66.4.ebuild 2757 BLAKE2B 5d90e8787beaba8af83baad61d0cad6234e2a3400554bf30f91c110fe1a84b1dc8cbf4cffa5f261e2e5de2d370ba968d44b1fa40bfe2858139e50119719d35b7 SHA512 084658201916ff1a7b7c74ba9b820e33c58b5e4455935e8918ed2d02c76d7847c7c1508f8bb504e51bf212d9cb72d1528dafab34af8a59481913ecc09838cd43
 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 fa7ceaf700cd..9ba2ab06bf47 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index 6e215a497f5d..c9496ad3a969 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.3.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
index ac7143187f6a..1c3c04ae2467 100644
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -16,7 +16,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.66.3.ebuild b/net-libs/libsoup/libsoup-2.66.3.ebuild
index 1853dc717df2..af731bff6fc5 100644
--- a/net-libs/libsoup/libsoup-2.66.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.66.3.ebuild
@@ -76,7 +76,7 @@ multilib_src_configure() {
 		-Dgnome=false
 		-Dintrospection=$(multilib_native_usex introspection true false)
 		-Dvapi=$(multilib_native_usex vala true false)
-		-Dgtk-doc=$(multilib_native_usex gtk-doc true false)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
 		$(meson_use test tests)
 	)
 	meson_src_configure
diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild
new file mode 100644
index 000000000000..af731bff6fc5
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.66.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson multilib-minimal vala xdg
+
+DESCRIPTION="HTTP client/server library for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.4"
+
+IUSE="gssapi gtk-doc +introspection samba ssl test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	samba? ( net-fs/samba )
+"
+RDEPEND="${DEPEND}
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+PATCHES=(
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	"${FILESDIR}"/disable-apache-tests.patch
+	# Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2
+	"${FILESDIR}"/2.66.2-vala-0.46-compat.patch
+	"${FILESDIR}"/2.66.2-meson-ntlm_auth-fix.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	# But necessary while apache tests are disabled
+	#addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use gssapi)
+		-Dkrb5_config="${CHOST}-krb5-config"
+		$(meson_use samba ntlm)
+		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
+		-Dtls_check=false # disables check, we still rdep on glib-networking
+		-Dgnome=false
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 87fe0c88b493..0969c07c6a12 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -6,7 +6,7 @@ AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cd
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
-EBUILD libsrtp-1.6.0-r1.ebuild 2381 BLAKE2B 91099f3cf9f24457a123b83acca3270e571c6e0c580ba690b443cadb554c6491d186344db78d9968c1218190dbf06fbf982755fd3d7022695780a4cfde1cadef SHA512 93edf7e4e7a59e59b203b40fef6fdeec133316215aa96ec5b95a01804f0b7b1c3ff57cfbf08ab32a44cc21015bd62df3d039ba0c0b4630aecbb1cedb0426877d
-EBUILD libsrtp-1.6.0.ebuild 2215 BLAKE2B 0c7fc9e569f320487aa26c95c9d5b70335fa770bcc7471a1727e0872f8af655b3af9034831fa5d8800afb0492bf2b6bcc61f1aa9b3b1d6b39f065dee7b2787c0 SHA512 14f95b201db1eba997d54059ac6c54d0af5d5047bab001510bfa1fe6ed7ed3b3b29428a1221fb6c0e44fd0fc96b8a481416a912e4c0c79fab3f6b56afab29712
-EBUILD libsrtp-2.2.0.ebuild 1846 BLAKE2B bf7f66ca0ff3656ad4c10b1a576bce022945d779275b5b9bfe39786fddb7ca04c5166be31fd3d12dd09d70a9ad4460595c36b71d5407144f84e1168e8a915db7 SHA512 60b4ada0dd0d15571a14ed6cace2b2e305b65596620d8478b599fc829a9fd0b8b34a7d3db9a9ef45a03132ceceeafae1b4f96d54033e931a594f067a7c6419a5
+EBUILD libsrtp-1.6.0-r1.ebuild 2371 BLAKE2B e812c2761b686000bc19564cc1df93c09fb6daed8d4058978fc38c3d231dd709abb8dc8adb3ef220c5575970d04ba5c6297420117e2667407c2b26c2babd47c9 SHA512 9b56e2216b15d9213e32244dc3ee7eb030861f375a6cffccdc21cd290c05ee9f1db02b87f812d44dde95e63f6ea709f84fe821e7db98f19460bf90cee96ba34a
+EBUILD libsrtp-1.6.0.ebuild 2205 BLAKE2B 6fd3f621f883525a802e6c93d62b6a7628a5a4eb634e4b877f92f3f0104cc39926ba76e74bd614759cf049f62ae3fa61712b9cc5a1c51e4534a58e68de8dae04 SHA512 d955fcf71ba64b30ffe21a01c1f704de10b792aa9d78d452607e185d00b5c0c399a6aa4b603ab12ecebecfe5995587fdd021d0e9b5b1081772764ade51e43fac
+EBUILD libsrtp-2.2.0.ebuild 1836 BLAKE2B 08bb247ecb2d8a7f3cdfb2b627da5f17402b7f7708ad2ed01b647decc4951f26f195de595ba496999ab5d57f41a876b957b0a7e3696bc3ad5674a5236c2e3a4a SHA512 a40d510f96915c632438aa271b0139a446384ec91c2a684de2638af6837b4651134c21e5bf15af691e547b97ae70cd435dc24a174a9a499855ebc82eea24cd15
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
index 7d7450589b93..2e2ba01a7d5b 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="
diff --git a/net-libs/libsrtp/libsrtp-1.6.0.ebuild b/net-libs/libsrtp/libsrtp-1.6.0.ebuild
index 965678f8550c..edb479668741 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index 16600b47f15b..51e278112f11 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 924240ebc60c..b64f9f9df84b 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,6 +1,6 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 AUX libssh-0.9.0-libressl.patch 923 BLAKE2B 997f909b6576e52a9104cf9dd821a42e7a00fb0c934b35d9f6775080db84e3d6a52ccb973c07d94b37f0182caeb8e0ca47330d042ec286692a59014b731fc006 SHA512 d7fdfb19bbf552de9d17bdd09ee28e8f4dcfb1bc94415249fafca52ea0dba9075fd36fef063a1e3be2ec165baae35c0c224c4a30799c7b30a9f749e0639ce91b
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
-EBUILD libssh-0.9.0.ebuild 3189 BLAKE2B dd071656c6722e1d7dc2c27dadff638e2b146f01028ddf0107ab966450efbf36f1c038169bbbeff4ddb77d1a425479ba83a09079835e89a306e33804366b87e1 SHA512 abe7a2090cf71a9c46dd3004be79a6ea5c75111f23c0b48f3b131b96bdc8eb9c5a2cc625a452ececd66c03eb815ccef75bd7d252b1c17039942b4547e19b7e8d
-EBUILD libssh-9999.ebuild 3156 BLAKE2B 0784a4173cd3c3128ecd46e2d621366d91a46d1a447c315bb7e0d6ba540e9086902fc73568a56ef3c53b6b73c5530fd307d3ea408135824feaaebbb09ad95948 SHA512 1d97d0d6b3d111abc4f739a70e53fb210fc565d54a63a463e67263981fbf2700d4938ea11a4f753f540ef8e7d507b324beb28c1428467347603bcc5705077f50
+EBUILD libssh-0.9.0.ebuild 3177 BLAKE2B 1d91789cacbab261b57ab0c1c07f67a4688b8711d0ce9522ec2692135daa3d5426663e9dddaef065af4ce419512e4d12461eb1861080a7049b31f182e9c2e6fd SHA512 70e1e4a45a841b2f99c4b12cf3f6ad7c5c5ef5cd2780ca8b526029b0d6ae6baa6bbc29036ec356cdb582c7cc9276948f28f42e5379f3c5da911ea6b504f5c61d
+EBUILD libssh-9999.ebuild 3144 BLAKE2B c0183a15ff0cde6e171d3a94650de9153df7304706636f58b4722632007b0e8aabead5ff028cdd64dc402afca53d0b2c69c05c9bab9790b84739f5cbf813524d SHA512 53f5935246b021b559684bff22dc6aacfff9186d816f654b9f579797b90c8bb35b6f86cdb81b5cd612306c5411b9fcc1ebe0aae7aae28c5515fc76b95d722e8e
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
index 164aae6d0c1a..133fe08bc323 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,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)/${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-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index c6953a5d267b..7731aab23884 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -13,7 +13,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)/${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-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index bf4d6a24e03a..c7bb83206f41 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -7,10 +7,10 @@ AUX libssh2-1.9.0-missing.patch 4796 BLAKE2B 185428de9298fc210c30a1b826b958ebde7
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358 SHA512 390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93
 DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 7bce5cd38b88654f0ca0f8b562e4bddc56346e3359e5873000cad7619607b2ec01c3945112dd8815d5de6daf650a750a4727cebe7d8996cc62f07ded06f3235f SHA512 41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17
-EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
-EBUILD libssh2-1.8.0-r2.ebuild 1647 BLAKE2B 47a2d718a0a2bf40f31fa3a3251ddf64e44fdb2823b61a3c10b54cf34c41af01adc3831b99f25a8b012cf7ce54a0120d4216dd3c7ec9921b48df15d29d542561 SHA512 43bbf761c4075cbe523b1b5ab247ef7e69c800f529ac41981ff61cf53a0c37b3b2b989cd9a08e7e709b9ddc0cb9d2a86f31e7930b96c95a0e5857aadf2a3eda9
-EBUILD libssh2-1.8.2.ebuild 1637 BLAKE2B c1ee43a0355c0f6fd4d761355c9a10f2ec70ff5b6dcdd175ef5162a852921e747ddae104d429536978fee57042764155bc8785ca3c15d9d3462302ff978be4dd SHA512 772baee7fe1f82db778da86c7cd7490e3d2a5843eb130aef310b5ebbffaa317d55aeea1cfc17ed71ab3e467209edbe2f5ede66482337028a1ddf2b780fe3011e
-EBUILD libssh2-1.9.0-r1.ebuild 1471 BLAKE2B 1f970aa5dfcedeab0701d5c7aa71a05546bfec61d410a0c067400dbf76208c1cfe2bfeacb62f12b7d91628144c32f2a38573ca2637d4afb2839196bd61ee9883 SHA512 0e4780d042d1be4b3e95f124e776e588770c0674534c3d439f6958994b1dbde62e1bbc3d0d7641194d877e3cab8202f168b8d5d2e5f500950c327058ae1336d8
-EBUILD libssh2-1.9.0.ebuild 1419 BLAKE2B 847c681a0d0aba0cc6c7b7fde05ab4066111d912e28a082cfa41cd88bde2b536ca789b96cc1e49b10f5887227207a30b9ba78f4d4384b053472c3f55dd0658ce SHA512 5921e885219a5215512188e2c11401700d10df9f2cdb72dc16d1eb0f199665fdedb8903e044233214c6330ca18b94633d60ba4ee392b3dd2223e61e3df7bcd71
+EBUILD libssh2-1.8.0-r1.ebuild 1340 BLAKE2B 937cb94e56521948308276e7c6f3e93819baab72bf1ee3506c1c8df19bfcbda82e1ebe571b4c1576f0d5e538400a093676825fa85cd970833c854ec051ed5666 SHA512 930201e5ed05b7079736102591824530fd5ab9ffd262fe0366e35319e44b31ea99c4e26f29dc2fc9c09d8108e1541bc1d552553b2d3ec79644eaf67483a78e92
+EBUILD libssh2-1.8.0-r2.ebuild 1625 BLAKE2B 47cf6fc489aab04feea02a3e6274ceaedbcc965b3f7f4544156724e36e442716ba2cc391b28dfdaf9bb6b6fc00f9410e560973e174d9cd54f784f9fc27f10283 SHA512 691c86606d0b033bd39f8b16ae18f7bb160a8fc9245cc7f9b63a936dae46be16882f037e97b0571c991e421547e69b5988b0fc32d5bafa406ec552ca6a643c5f
+EBUILD libssh2-1.8.2.ebuild 1615 BLAKE2B 26da3b7929a0b8ecc2911e1063b1ab060da052e01173026fe7c48aef74778c1b69eb28ac9da6398a679b407944ca281d586e3da47e168d7d6ae578b96d264974 SHA512 e53540d9cfbc7d6109cd77e5e188d31aa8e855f5b3ff321bcf6dafb52d7398e9143368b6f270454d83961d55c1992f9f56a628b129be2399dfcb20353630799d
+EBUILD libssh2-1.9.0-r1.ebuild 1449 BLAKE2B 88a40f3252d4f95efa3642f3d2729f49d93b0e63ca56ed6bc5f61dc277c1460491658bbe50259e28c6fef0fc1dd3281943a6c86bdc6dc096f37fff355df8ba8b SHA512 1e2bd2ce469fa46a148af4f0db6b1924692c0c0ca47b7e125f431055d5ae968fddcd73254eda1bc04f22af43a3fce83fda8c82cd5f7b6ab6e7da6c8dbdc4c739
+EBUILD libssh2-1.9.0.ebuild 1397 BLAKE2B b3f23ca2f291f72f439d0dcbc2693719c9183775f4f80ffda6e74733ce2f552e1201586f8d50cc056eb33e194f26c148df264d409dd17edbf662984867eb5720 SHA512 c41a5133c1703771bb12c4f7f65d7ae27332b502fe436536b939a5b23c63f9564e36cf9348a2abf119d959c40ff7b184f3ab40193a9a5a4f593401cb69624a09
 EBUILD libssh2-9999.ebuild 1237 BLAKE2B 0a4ace453cacc7e735fc5df42d1bbadfb3a231954a94e992b8c7141037cd07b73a3f262f3ad9dcad9e98d51fe024a41220e0d34593f96e563c26f632e0f172f7 SHA512 f8f597a5adee5b882d3e6d22ce1dd739d5f1a57da4466bfedeebe1d7bfecddac296f687cf4982ece60f5e3e0b52eb4ae8fda30a2e6e4d091f479fbb0872116e2
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
index 3a4f0b2a6fe6..2cbb730d3d75 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl static-libs test zlib"
 
 RDEPEND="
diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
index 7eb5156df2c0..4a971721dd14 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild b/net-libs/libssh2/libssh2-1.8.2.ebuild
index dff5f96118b7..4c8055cf0276 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
diff --git a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
index 92f1a88bf9c3..a5602949511d 100644
--- a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 528f7488e0e1..73a2130ed835 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 0cce0dce2a36..ea642b91573d 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,12 +1,5 @@
 AUX libtirpc-1.0.2-bcopy-to-memmove.patch 2226 BLAKE2B c0a5244f21d9a5531303b317946fe53b695aafc54095f617a3918f28a94033cd0a30b5f3bfd6fe671b64d4919d255298b55fbb4fa6179c255ff561517361d4e5 SHA512 221c85c47ec56edbdb4ce95e0f67680050b8d9f666c6795ceef7f7720acdf05a535e4afbcdc4e2e5eaeb6edc04bd43f65486df772ad2a0c87987d1c204661f00
-AUX libtirpc-1.0.2-bzero-to-memset.patch 1587 BLAKE2B ae0358514dedcfa3d7e156dbccf4e8bea9749c37b59e1b187bbc34600bf7980e05213da38287077be08e11a2916cb3c787d83860400e2831ed95f99fdd7ef1e3 SHA512 aaea43a11e02094f9e43640866dffe7ef509362ba169500d6032b088f048eb855a3a7a75f2e7a2c999d6a252cb4b66d970cd8cc76dd0747376cb382b53e43385
-AUX libtirpc-1.0.2-exports.patch 424 BLAKE2B c5292cd01b7b8ffd6be3fcd5842f66ce20b7b4b2bfed02c10bb5f5b83db6cacc43949aadfc60fd2023229c6246f3cb3f991413ee1704539625f759ae39b77dbd SHA512 66a4925ed0236aea2e181e9a07677dc9f41c287311c9cb02129d17b9a61b6102997258082d38e45d193a0ceb4b8e2bc0b8dfe1610a298bc508c1f5c70c1b466d
-AUX libtirpc-1.0.2-glibc-2.26.patch 276 BLAKE2B 8e557e3c40c4c12339d90c238b26ee396f0ed92622907bf829bb2758119d45a401e29610b5b30c1e9177922546bc1fab535d005df43061cbcca09b8be9a0416f SHA512 67256d618db1330eeb616ade4b79376a600ed2457c03b420fc88b9ba89ea2451c9aac3f48c4967bc5695f10e6d8c895370cc10144ecc53ed0d3810d4cf65265a
-DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef092222c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec
-DIST libtirpc-1.0.3.tar.bz2 509831 BLAKE2B 3f908471b3e10f88329793db2c832754b9bb838d115235d7c25256da883960de8d8c94a6941fc9c2a3cc4dca9a77c32b5cb85bb347cc182e5a6255636b79b06e SHA512 1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc
 DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.0.2-r1.ebuild 1686 BLAKE2B 60159dc6f9d214e5f06e0fd61c1e80848206989cea4404f9ebfff6c6624d7319ae29b565e3617fec1d3cbbddf6676bb20529b70d9a44ae1e40ed52a23c3c7d17 SHA512 8aafc7b08c8a999af8a253a4e1d740127d631879341b110f9be6a285e1edf110cf5e0d5b0886490c037234aa3f3361d8776a22d8b1ac69e20a57d464fc981e32
-EBUILD libtirpc-1.0.3.ebuild 1558 BLAKE2B 1592068df09288661e913232a56766b80d358c8c080796b10703534394c3bd35c4f62fa1c2f15dcf64c21687b9b537fdeabfd7bb6dcc3978a4931ca8e67d5c3b SHA512 86735e45ac0534095518c440d43e52991c544b64736250ba13be94c007ebeb07baec5bdf8bc80a95c398fc1ba75de75dc28604901b7a3372fd79251a24da7a02
 EBUILD libtirpc-1.1.4.ebuild 1554 BLAKE2B cd9c64b7e550affa9814e8a5e4b9b8c9d5627640debe472cddc16ea36300841b843eb2fd0dca7e3d5eb339c74b2a063a408246ebdd0c7fed086ff6ce31dd60f6 SHA512 c767bac49fb1fb2a22862ee273f94348e176ce229293ade3d81c4c65fb818be7d49980f2bfb54cb443e1f165fa2ee6c0ae908308a89eeb24e2bfde513cd5c033
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch
deleted file mode 100644
index 64b516ed8262..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naurp libtirpc-1.0.2.orig/src/auth_time.c libtirpc-1.0.2/src/auth_time.c
---- libtirpc-1.0.2.orig/src/auth_time.c	2017-07-05 11:02:23.000000000 -0400
-+++ libtirpc-1.0.2/src/auth_time.c	2017-07-30 17:46:39.481420880 -0400
-@@ -317,7 +317,7 @@ __rpc_get_time_offset(td, srv, thost, ua
- 	sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4);
- 	useua = &ipuaddr[0];
- 
--	bzero((char *)&sin, sizeof(sin));
-+	memset((char *)&sin, 0, sizeof(sin));
- 	if (uaddr_to_sockaddr(useua, &sin)) {
- 		msg("unable to translate uaddr to sockaddr.");
- 		if (needfree)
-diff -Naurp libtirpc-1.0.2.orig/src/des_impl.c libtirpc-1.0.2/src/des_impl.c
---- libtirpc-1.0.2.orig/src/des_impl.c	2017-07-05 11:02:23.000000000 -0400
-+++ libtirpc-1.0.2/src/des_impl.c	2017-07-30 17:46:49.581420807 -0400
-@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, str
-     }
-   tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
-   tbuf[0] = tbuf[1] = 0;
--  __bzero (schedule, sizeof (schedule));
-+  memset (schedule, 0, sizeof (schedule));
- 
-   return (1);
- }
-diff -Naurp libtirpc-1.0.2.orig/src/svc_auth_des.c libtirpc-1.0.2/src/svc_auth_des.c
---- libtirpc-1.0.2.orig/src/svc_auth_des.c	2017-07-05 11:02:23.000000000 -0400
-+++ libtirpc-1.0.2/src/svc_auth_des.c	2017-07-30 17:46:58.771420741 -0400
-@@ -356,7 +356,7 @@ cache_init()
- 
- 	authdes_cache = (struct cache_entry *)
- 		mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ);	
--	bzero((char *)authdes_cache, 
-+	memset((char *)authdes_cache, 0,
- 		sizeof(struct cache_entry) * AUTHDES_CACHESZ);
- 
- 	authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ);
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch
deleted file mode 100644
index 174f4e3471f8..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-See
-https://bugs.alpinelinux.org/issues/7041
-https://git.alpinelinux.org/cgit/aports/commit/?id=9edb53cea056101c4963a04b747bf102de23f919
-(just hit this myself when building libnsl)
-... dilfridge
-
---- a/src/libtirpc.map
-+++ b/src/libtirpc.map
-@@ -298,7 +298,7 @@
-     key_gendes;
-     key_get_conv;
-     key_setsecret;
--    key_secret_is_set;
-+    key_secretkey_is_set;
-     key_setnet;
-     netname2host;
-     netname2user;
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch
deleted file mode 100644
index 6d583e6149d0..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c
-index d23fbd1..79d6707 100644
---- a/src/xdr_sizeof.c
-+++ b/src/xdr_sizeof.c
-@@ -39,6 +39,7 @@
- #include <rpc/xdr.h>
- #include <sys/types.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include "un-namespace.h"
- 
- /* ARGSUSED */
diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
deleted file mode 100644
index 36dc12d642f8..000000000000
--- a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools multilib-minimal toolchain-funcs eutils usr-ldscript
-
-DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
-HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	app-arch/xz-utils
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
-	"${FILESDIR}/${PN}-1.0.2-bzero-to-memset.patch"
-	"${FILESDIR}/${PN}-1.0.2-glibc-2.26.patch"
-	"${FILESDIR}/${PN}-1.0.2-exports.patch"
-)
-
-src_prepare() {
-	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
-	epatch "${PATCHES[@]}"
-	epatch_user
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default
-
-	# libtirpc replaces rpc support in glibc, so we need it in /
-	gen_usr_ldscript -a tirpc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc
-	doins doc/netconfig
-
-	insinto /usr/include/tirpc
-	doins -r "${WORKDIR}"/tirpc/*
-
-	# makes sure that the linking order for nfs-utils is proper, as
-	# libtool would inject a libgssglue dependency in the list.
-	use static-libs || prune_libtool_files
-}
diff --git a/net-libs/libtirpc/libtirpc-1.0.3.ebuild b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
deleted file mode 100644
index 5a60e1bb7b01..000000000000
--- a/net-libs/libtirpc/libtirpc-1.0.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal toolchain-funcs usr-ldscript
-
-DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
-HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
-)
-
-src_prepare() {
-	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable ipv6)
-		$(use_enable kerberos gssapi)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	# libtirpc replaces rpc support in glibc, so we need it in /
-	gen_usr_ldscript -a tirpc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc
-	doins doc/netconfig
-
-	insinto /usr/include/tirpc
-	doins -r "${WORKDIR}"/tirpc/*
-
-	# makes sure that the linking order for nfs-utils is proper, as
-	# libtool would inject a libgssglue dependency in the list.
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index bef8ae2e318e..1684652ca0f5 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -4,9 +4,17 @@ DIST libtorrent-rasterbar-1.1.12.tar.gz 3897237 BLAKE2B 0988b16d79df9499e2f7ab9d
 DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19d0b416f909daf15078b1461ab6724ee086d3194f6c378c305174676a3399fc3e6cb23133faaa334ac5dfc9457fb597c65dad7d36 SHA512 021fc54353fdf5063d55ccdc2057dada292bb0008fb92e93e8d94dd89f529630f290fcdc4f4d095e3192522c57fe0f0da260b5ef8e8e15a8c6ac05728f5f7160
 DIST libtorrent-rasterbar-1.2.0.tar.gz 3546062 BLAKE2B a02ef8f273d8e6ec3b6f6a42d518f7cbba669f109f907e243bb90cd674009894b9edce2f355b52d77275f3fcd9537e9c26280f7b78dfbb1792f52d6c7f50f7da SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
 DIST libtorrent-rasterbar-1.2.1.tar.gz 3562762 BLAKE2B 1978356ba00c07c4b89657ebe190b2aa4a938d22e5ab63844fb664312d60f761a07c42b9353f2f500fdf9a08afcb294a39bfb447d255d93b1a45ecc2be629ffe SHA512 a60e38c4c951756786ede69af1a5d56bf6293bcb7d235f0b7feda72f731bc163ea6a7401c4b5f5400b8ce236decff0ae3a1d5fe39c7f8f775e65031677f02074
-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.1.13.ebuild 2336 BLAKE2B 714f378a769c13fa49292fcba79eaa7e8eaac883cbfebfd3ace3b4ccc3627d1c1ae0848def4707fe1e6a34a135f48d86adca8b292d8e4b59fe967768910bd4dd SHA512 70afde4e490833b990a1ed46c85f96118e78b51a8adeda6dd9fbbac96dac50ae24053d06174043f9b7cc80bfa0eef6abb5706745e8dfd4a19b69f837e092e69b
-EBUILD libtorrent-rasterbar-1.2.0.ebuild 2563 BLAKE2B 324eb4c1491dcff9fd62dc82f0e51490b066f52ca673a8e710b77418b8d9dc41a4fb787f63e951eeff62818acdf5bac54e3a04e6167f8e3e61700c0a67a567b2 SHA512 e8f0ce97f77781f9e2ca202bef02837bc612a3407a03b60358fd1c5578c847924103a5c92cbc12eadbca71f9700803a6d495fde32d9d5723d553cd485da2738c
-EBUILD libtorrent-rasterbar-1.2.1.ebuild 2535 BLAKE2B 0d0e1cd86dcb48e14d5af422bab0eb2226837d748ed969cb2866c0b0749b77f7319659d9593f61e40e2c2ebee4f1e6cc297ae8d259bcdeb5814b9881df26bbf1 SHA512 ac733b683883195cef409037471ca65d9a3ccc1c5ea06be28ad9e754a5bc90b52138947a32f4265cbe8c845e1d64d55b477f5b4332143f396b3c8137743be5b5
+DIST libtorrent-rasterbar-1.2.2.tar.gz 3584187 BLAKE2B 93c77544d4641122f0bd2b5c5f0577629fb7bdfc9e81bd54f7a849f5a477255adc699676516865c93610d24a830a26a0de45f10e50ce64ad6f0214c116f7754c SHA512 34dcf5421dfccbba78bdd30890b9c18b92fdee1a2e1693ada9b55b79a167730093862017581b9251a654b5517011dbe4c46b520b03b78aa86a909457f7edcf2c
+EBUILD libtorrent-rasterbar-1.1.10-r1.ebuild 2377 BLAKE2B 90cd8263d24e69b019561a242fb21cec59f0d672dfa518d3236840a60d9fd82319247404408523e1de22f7827c003da6e628e09891f79a5d959dd01d5bfcff0b SHA512 6f30e385dea6bc5e745e776ea1f236f8eb56b532042e339e7d5f5bf56646885cf283c5b5471f4bc3709809040e8e0e4d782ebbba00fb46f5205bd5ca5abdc14f
+EBUILD libtorrent-rasterbar-1.1.10.ebuild 2373 BLAKE2B 367fd0213ea9115502dadad912f01db28d10bd159b3164f785f30890a78c3e968825aaebf486b14d81f3d1b70ced02f04a46bc4b603964e6f8e1ef709a1a2761 SHA512 2ded4210a562fb44266a3955c34bbee42ddc39767117b616880ba0b4813e707a9746d03bcac40f9ce89ccd3a1f75b4323970de1db675847a6cb2edd165fa755e
+EBUILD libtorrent-rasterbar-1.1.12-r1.ebuild 2377 BLAKE2B 3747e319a73efc39d910e39d8a78219a9c51d4c40392ea1524d331ec667bda19312752d51df1ae4657b68749a2781e4815a8600dbff48567739261df35ff3ab6 SHA512 ac436fceb0fe41a16352b35b291e6d9ef6eb8fc7202513e6e1c8eceb4663e71834a496d8a7b5b5a88499836aeed2f0da8b2828639348e7398436e47fc5b32039
+EBUILD libtorrent-rasterbar-1.1.12.ebuild 2373 BLAKE2B d4df43a0f63a1c05bd5fcfa4da85b039df849b6183f2e7095704919a5f4cff79f18ed66e696a013a0e10a2c03f2cad7df3d47a3ea3445ff63054aa684ba785bc SHA512 821e69f334316b289e624277cfcdc5597677196f51a31329dacde33df1c67cd53fe274d173476021d6f14ac66fbeac229c98f2b6d88898aec9567ab80a4f1859
+EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2330 BLAKE2B d83f50724a215033b62041c4bd1da160515fb5be3a58486c39a837ffb7d63ea1d7bfaf7fd83299bd4d6ac0d1d1109d902236c32ae19b727cf5dd2a5d1f077ea8 SHA512 906b89a5789d1595888757239ac5f85544bb1889c60d4d8a2aff753a49a02c2c0f59a4dbc580ecb78727c91e800cfd5b3f4d405f321fc1f98ca1d99223b2e0f0
+EBUILD libtorrent-rasterbar-1.1.13.ebuild 2326 BLAKE2B 554029bc18168761192d91ce430d6093b12776898ae96ad5ca2c38cd827c7d099b39a2e3a523e31e79728baa31a5f401cc3eee0b5eb22f96efb4828886f7f94c SHA512 8a2d196b5beffbb26c792135670280b06d84e18dc264307983270b0d9af06218ab67ca4155a9374dfe12b7a0f079145d856541fe65ac2ba8f6b77c6b4c06e5de
+EBUILD libtorrent-rasterbar-1.2.0-r1.ebuild 2555 BLAKE2B 16b160c0455d7b5058e5e66e2bdd16530f60f349eedcee15a18b65a7ba024cf57fa28b8c934182ea44b395326c0e2ca87fe40c92969236df6cc7df9f538c8750 SHA512 f967c0f6ae21e0637d136e2bdc8105b2ddbe06a9f4f051a4dd43853cac6aadfb4a5e99caf7ddeac3d84f718858192655b831130e776447c0e038633a6ce402c0
+EBUILD libtorrent-rasterbar-1.2.0.ebuild 2553 BLAKE2B f99de207a9338164c429095bfc2b36f23af9200ccf24666acecf3c821e697f76056614bf4529274337b89c9a47d44409464920aff574835d02e4c50d04f444ee SHA512 c524238def1d24f6023da5a507eec9f96c4b9ddc062b04677a0a714d237469a55db84445b20b48e5d2b6975c8b88784b351fa5d715c526b9878b5d623227e9e2
+EBUILD libtorrent-rasterbar-1.2.1-r1.ebuild 2527 BLAKE2B bd28fd8e842def8add44bff06debd412f4dc55854f99ab2708353d779d95e3621be95f6042bbf956e615c0aecb74abc21ed71fdee6d63fd1321bc46ab3d45f6e SHA512 7032d9a3e3f084139e0ebd76254176d36ce20b39013ccc329072811947eebb11181f78285d97104c8d2e7899b2472aedcbe24770a3f2ac63cdce3e4f2e7f2c6c
+EBUILD libtorrent-rasterbar-1.2.1.ebuild 2525 BLAKE2B b899a7df927d6aa5c663fd79be8fcb9fe3c00717f7551588b1f048d01409f19a89a7f71dc4e897a6e48e3867d54518c6c55df148ef31cd4dd88d0589a69a7425 SHA512 0d916b9c285691ef8ae92cdc7a3231e3491e8500f8e750a2abedd8b090622727a9d007f09a0da13b6584454e1ae1e61f8070fc99401f7cbfed40a33ba4f82251
+EBUILD libtorrent-rasterbar-1.2.2-r1.ebuild 2532 BLAKE2B f74ad83e31aeee0460b6fc1480bd5fefae1bbf04d5458379c8b55a37e538b429090543a64ac7048756c037c073046b34aaf4396e4bc2d2bd351f041c0b8c5c57 SHA512 cdf6080d94ecf42859da9dd46bdc21d7309ad234bcfffb54c5839b9d6b08f4fbaa3dd440372e717afb7ea33af67a1cac39c70772885d1218353e3e2512989c83
+EBUILD libtorrent-rasterbar-1.2.2.ebuild 2525 BLAKE2B b899a7df927d6aa5c663fd79be8fcb9fe3c00717f7551588b1f048d01409f19a89a7f71dc4e897a6e48e3867d54518c6c55df148ef31cd4dd88d0589a69a7425 SHA512 0d916b9c285691ef8ae92cdc7a3231e3491e8500f8e750a2abedd8b090622727a9d007f09a0da13b6584454e1ae1e61f8070fc99401f7cbfed40a33ba4f82251
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
new file mode 100644
index 000000000000..bad9c6cc4359
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug logging)
+		$(use_enable debug disk-stats)
+		$(use_enable dht dht $(usex debug logging $(usex ('yes' 'no'))))
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
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 1b537d16462a..de5e91692fd5 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
new file mode 100644
index 000000000000..083a26319c05
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${MY_PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug logging)
+		$(use_enable debug disk-stats)
+		$(use_enable dht dht $(usex debug logging $(usex ('yes' 'no'))))
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
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 273b0b56ad16..d047b6469980 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
new file mode 100644
index 000000000000..7608777a6333
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug disk-stats)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild
index 6350d6260313..8cc6099b3955 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..3b05cd5c1a8d
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+MY_P=${PN/-rasterbar}_${MY_PV}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
+
+PATCHES=( "${FILESDIR}"/fix-boost-1.70.patch )
+
+src_prepare() {
+	mkdir "${S}"/build-aux/ || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable dht dht $(usex debug logging $(usex ('yes' 'no'))))
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
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 a182fa18ab32..d00acbe4f8ed 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..fb3f58e2f217
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+MY_P=${PN/-rasterbar}-${MY_PV}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
+
+src_prepare() {
+	mkdir "${S}"/build-aux/ || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
index 2de04027aa58..9f40198c2dd6 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..3bb5a10e01ab
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+MY_P=${PN/-rasterbar}-${MY_PV}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
+
+src_prepare() {
+	mkdir "${S}"/build-aux/ || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild
new file mode 100644
index 000000000000..9f40198c2dd6
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+MY_P=${PN/-rasterbar}-${MY_PV}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
+
+src_prepare() {
+	mkdir "${S}"/build-aux/ || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="${EPYTHON#python}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 7b6fe67bb6e6..0acaa854e6cb 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -5,7 +5,7 @@ AUX libtorrent-openssl-1.1-part2.patch 1902 BLAKE2B 1d0e405a0a72be250c7a79e41086
 AUX libtorrent-openssl-1.1-part3.patch 1882 BLAKE2B ad7b62d238ad57966c91e38f32b2d45673d9caa1bb4347788cde366a5235c1a02b0b290c3b4e010c0c19baf36c0e2ad7b2651c9bed67a51714b877924f0e6c22 SHA512 aa83d4e636b3327cf78e9eb4bab14e3254d90829549020240e4498d78308cdc6e058035457341d51a1d5d6cd9b89364ebad33f6d46364f9b72171abb49c954f0
 DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a40070da7e2fd3279b1aa6acd169ca2783e7a2040efc472285f918c434e74380ec40fcddb823871ecf441c85670b9f273 SHA512 7bf3e87dbd19eb4e6806dff8a01c3ec61ea960bbd809d4bcbee96a46e169f97d0baf0fc85ab4a1efbbab07850e9b1060bae46c453ea6c42f5c23f8d921295efb
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
-EBUILD libtorrent-0.13.7-r1.ebuild 2006 BLAKE2B a2657d824aacf89f15a0848f966347cebf65f6dbdbe6b20d98f693c801da8a657c7a68029b8457bed20bcb8e827fbb5b5067d10121d90d3c09267444b28bb81b SHA512 a9e0823cb6f1ad2f8e5598d4d6ee1b60f92559d0cad701a80e3a01f64714caf0a7eb7be5ff45c83d5299d6059eafdf0ea133d87f5583e08b504ef04155ff1ca3
-EBUILD libtorrent-0.13.7.ebuild 1870 BLAKE2B 9922a71fbb2cb2073084651e8009c20133e13a5d7d5b685574d5a8c0b9e1b0838234ab43b0ef6764d49e0de7aae2ad97b94357b04a5911571e250cb1548ffc8e SHA512 c961d7d73d391cbeb381cd906f073362c95aa6384f3838efbf4c9d91b65f402070cb4de4506405b2ff40d84e5b09cfc73f0f608abdf8a5fb4e32351c35f92023
-EBUILD libtorrent-0.13.8.ebuild 1712 BLAKE2B d921f26c701f598585a5e0ad0d01dcb6536fd32b96aecdff6c3aa677901f143024c267e2657abe2ba856cc5c0d005a49513aaaf521951ff3a276c714451dc3a5 SHA512 80e5f6a64e033c6cd20ca1384c09fa8aa91fe9d5c856d487ab53ad93d80aae1ba5a5e5a64fea004baf2493cb49a235852e257f49b5d16848e39752c9a9b7f33c
+EBUILD libtorrent-0.13.7-r1.ebuild 1996 BLAKE2B 8d78e884f5eee668e3ea3e09e1c5f0d148590efdcadf08e1a97087372e2ad3fbbde1974799cb346728b66553fe707f5c88e339234084b966c4f975c909674fc7 SHA512 3b22c30fd6ba7468fcad4722a3076c9aeef35281e411bc5c030ff1425ecb57b30908825ca7dadcead77cb28bcfcac151fe440477cd76971affce50157743602a
+EBUILD libtorrent-0.13.7.ebuild 1860 BLAKE2B e2e7fa8ba213581e43d3fb629ab164d143dc8cf9c3fff787a9e24aeb3abed7525ff79143e535645dfba3a3a74fbdc17684a8b3a5e91d34e416d628d2ef3b9d2f SHA512 26ac0f7143d91127101993130daa6bd33de37f2efbead8c13cdd1d383c18574611c5ffcd56dbeda5d3c12d1dbfcefd5ebcf6abd4d3367a2fc0512ee74f765192
+EBUILD libtorrent-0.13.8.ebuild 1702 BLAKE2B fe8980c9178244b89ccad211c7f4ba5c6564c623aae608fcfd338546538a84963c11a03e26f9c43e8edd9be4039eec1e84a3fca19805bc0c8b3da8d646413c1a SHA512 c77bf1214ee20d7558c630c689ac96fea24a8759a4bc3ca86e638767490a257920e2a630dbaabb0838b1e16ec42f8c3978b92d071cb065efb187b51848b417b3
 MISC metadata.xml 443 BLAKE2B 2a25f3804cf9c29cd16835e22dd67e7a94fe2dbce0c7c4a85e0a9042a79f798349a55f1282d6c92b19afbb10120d9e9b5a30e03f082d90b622593ee7d8fa5e67 SHA512 32c9f1b9d21fb99768d60d842a49a80a844f8a6ea94c012a97fa94369916a2fd6df0965dbb394e0de2360c79c01355f8a4872b2d0032b3eef5c6a4490c53ef82
diff --git a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
index 4e548ed6ecdd..e3689c3874ff 100644
--- a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
 
 RDEPEND="
diff --git a/net-libs/libtorrent/libtorrent-0.13.7.ebuild b/net-libs/libtorrent/libtorrent-0.13.7.ebuild
index f03f53a88985..15f6eec5b6e6 100644
--- a/net-libs/libtorrent/libtorrent-0.13.7.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.7.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
 
 RDEPEND="
diff --git a/net-libs/libtorrent/libtorrent-0.13.8.ebuild b/net-libs/libtorrent/libtorrent-0.13.8.ebuild
index e461b0222d6f..b1bfdde599aa 100644
--- a/net-libs/libtorrent/libtorrent-0.13.8.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.8.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
 
 RDEPEND="
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index de84df9073c4..d4f983d2cdf6 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -5,8 +5,8 @@ DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f
 DIST libupnp-1.8.2.tar.gz 1379953 BLAKE2B 472851bfd25530ead4c113657f0e30cf7a3a1a4c88b86864676a2b7096817c1780718710a9535068904901c21d70d92fb267f295e88531e3eeef7d9a0cee58f3 SHA512 026f2568a1ffa56a3a0ebc823b126dceabb7e821acb6db52fbca02c4c02febd5508cb644cd2ac51f65397c3248a22340b3673069951e97dcdd22d4cc321d4511
 DIST libupnp-1.8.3.tar.gz 1382278 BLAKE2B 65774d46633d81fcc810f01339e0eac5d7c7313f69c1a467e6c0bbb26eeee03fdb4d8330f46e86346737cc17c1c953ef26045526bc9fe438f7e917928a3a3d0e SHA512 592a719614492ee1dad3630e5de2dca1dbe369faa3c87ba20fb939334c9d24f9dc869a457f5903cd28c5f7662145d1db4eeb512ee93b47adad4fc9b7d9171507
 DIST libupnp-1.8.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb
-EBUILD libupnp-1.6.21.ebuild 1058 BLAKE2B a770be35f6f001f17e10a9e6ed102bef62410321446098057d17f4ec75bcf56bc1267c9fedd59615d3397af22fca6e32eac558b12bb1d412980bb23fa9153048 SHA512 287a4acd2954fe276c07cc4a02b223356ca1b4a2adc902714cffd4b62daea6f8cebd2aaa836c77f50d4352aa92719a65bd3c0cc7e4a1ed386af873d46bd3b556
-EBUILD libupnp-1.6.25.ebuild 1060 BLAKE2B c729c01a2101d6d765da7ce04117746fd2da2b8b0bcd938e008d9c0aa6a51bfb0bb7e89889f74c76d74fbb4d9ed6eb0d3bfe1f998aad553b6e4a2bd15e590eb4 SHA512 7f6ed27ae13faaa69916cb2b37937cc7d5155317cb8c2099b22062ed971a31b246f6b35f7fc4a9e7fc4cca97c61043bf8e0b9a82ce4b16f1fdd0780ee5fe3ee1
+EBUILD libupnp-1.6.21.ebuild 1036 BLAKE2B d3b4077358a8d14b25df794258251bf81ac29d4283714f7d5abb2a974a2265246168986e034d07923675996063db4ff86806fb623895e5c099cfed7a83af114a SHA512 bc71c740ae8b29159960aff843fa3281e1dc4baf93761be4026edaa83ced0195a965b4c58c43f84e16618045935fd1a8ee1f780a4c672535be9b6e36ebf5d108
+EBUILD libupnp-1.6.25.ebuild 1038 BLAKE2B 5ff0fa549ca82029feeb59b0c67edb10fa46a73c62476a751d1e89a070de94fb563a6bc38ebe604be429e54d66162069695f04df20e225dc22d6b0f8801ea549 SHA512 2d335e95edd391006d6f9cd9324702dbf3380c4e22b56895d919d812b6195f094fed0bb464e8b38ad6e55701c06385f1bc8af803ceef77b2453036c047961ff5
 EBUILD libupnp-1.8.2.ebuild 1716 BLAKE2B a7a63be7eef83a56f8e6e1313d3d8368541d8282cb367834ebdf5854d46a38d723c23b8eabcbe568591af2adcd199a4170c08b6f0404f7e5c1349a1edf95a99c SHA512 2ea16eccfb1e22f4d4f306dd9b5301b2fbf5b913a4e9ac142b7a7412c83e3621f0ad22a74107886e8cef7d58e5353796c478dafad7ac666050f1ca9cf08e55bc
 EBUILD libupnp-1.8.3-r1.ebuild 1773 BLAKE2B 27ae00ecd8c1d01663b071f658dfb42b8eb6bca42087d6774c6139c56095014bd6713fe460eb391bce9e61ce2136c608b368c012e3292f3dd3d28d3525db69bb SHA512 36dc05b2d47a2f8b587cc424dad8d443d3a351ef2ee7d993b16f849f0126008b18b6babebbebe0dacd413f17146932bc4a92bf88b2ba9a7dc84a75ee0c28a83d
 EBUILD libupnp-1.8.4.ebuild 1651 BLAKE2B 5813f83885570663afe15bba333a50aefb2a89d0f3882a94f84e4eac3465cd11a4139a0066bd7dbd8ea11a455c3b696bf8a0fd2dc77cc3308ef5f496f0086026 SHA512 f4e889a07369dd63566f8904893327a9702455915808629394669c317cc55f28695d92b54ab4e8accd928d432f1238de1d1a6b1fff3391ce28d390da579bdc94
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
index ddf0f1a6bb2c..cf6b5e8cc2d7 100644
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="debug doc ipv6 static-libs"
 
 DOCS="NEWS README ChangeLog"
diff --git a/net-libs/libupnp/libupnp-1.6.25.ebuild b/net-libs/libupnp/libupnp-1.6.25.ebuild
index 165473d3a932..142a610e5c2b 100644
--- a/net-libs/libupnp/libupnp-1.6.25.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="debug doc ipv6 static-libs"
 
 DOCS="NEWS ChangeLog"
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index a0bb1046a381..6fef1b804330 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -2,5 +2,5 @@ AUX libvncserver-0.9.12-cmake-libdir.patch 669 BLAKE2B 1906637be7180a884aa3daf8e
 AUX libvncserver-0.9.12-libgcrypt.patch 1526 BLAKE2B 83e042ff875844cced2cb1416477c9fa255f84e6cc40b9d1d5e7dfa3e2467effb3481155b5eeeb29835cf29c0a6aa0ed381862fc184e4070b149b3a1bfc84c9e SHA512 2b2aba010104b2206eab7bec1bc6a258edb28d43da2a376d03e063d9d5e7236d690388da8ccd501b22d3181b966d2b6ee1e6752153c1ff78ab498a59355fb385
 AUX libvncserver-0.9.12-sparc-unaligned.patch 1463 BLAKE2B 66ab54a68026de0c9ce5eb04333b24ae104bc24b2fcacf5c1aad2a7d019f94feef46b4588166d8063bd3e5c616b40092309306600328eb8e7597efba5e35952e SHA512 c2d26ca2a570de3fdbabef723cfe3cb6208aabe9d7222feb6f0128fba55370e0dff0b520ac84abdc6d1dc6c0762092d36dea21eccff68432cb1c6e5b1e3b79df
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
-EBUILD libvncserver-0.9.12-r2.ebuild 2107 BLAKE2B f2ac4aff85ee9c307aa500f54c1fa75a6acdacbe80e4bd47c3411bbdf8df406623dbc49d409e3c8343558dd973a695d302dbcae2d8bed29426157ae701da6f0f SHA512 e1fe1402c5215ac869c04eeee1b3fcee638b62274306a3afabb8ffc07f177db499601b699d7b3ec27a595c23baaa045b849484a93c7ace74a78bd06cddf1d1e6
+EBUILD libvncserver-0.9.12-r2.ebuild 2097 BLAKE2B 1223ec5554bef0062c5fb20297bf8d07f0c43241cb35e6f51e1b71eb841c3bf392403f1acacd10330b37be829373c6587ad95dccbf6d2ffa192451f3dcf61085 SHA512 bec5d64d0f6400d2f9c434e832f4360e56fdfacfbb6efa2fba58eadbd0df71f5731083415cb6689fa1bab994698ad84a6483a6491b7c6171ef88b463f884235e
 MISC metadata.xml 994 BLAKE2B 3c12097d08f89fadac86ad92efccccbb533c1ac018cf426aae4a45bbea33ae227dfaec320a7710eabff7da96d22229997dee72b2c84b1aedc575e21e0a5decff SHA512 0ca13849ab948490b862838bf3c2b87cb97ce1739369d23426e518197a786cf24fc79967c01072b710d37c298c792c45e61a55e558d692087800e834f93003e2
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
index 13a8e923f07e..e25b35dcf374 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
diff --git a/net-libs/libyahoo2/Manifest b/net-libs/libyahoo2/Manifest
deleted file mode 100644
index 27794e55b311..000000000000
--- a/net-libs/libyahoo2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libyahoo2-1.0.1-asneeded.patch 383 BLAKE2B f7ac99739c5d04345bf1ece82767170929aed65a471f0ed9f5212529402683813cc8b879a32690c082db2fa791f3767e402abb6ce8b98dca3567e04f02684035 SHA512 47e241ea5890c28ac3d7c5326eba5ef0fc3f6965fe6726769854835b7b98140e33b603678605bcd9487c8ce57156ac54d16ded8eaeea63f23d2c06eee55872b4
-DIST libyahoo2-1.0.1.tar.gz 507023 BLAKE2B 5972d8ac250e9ec76bf080fda2bd4f1bdf8898a8496a38e6e31a534ec94a164d54d6a640c098ff804325645f05627e520566883223981abeb97a03f22bd21b47 SHA512 fc522f80c21945e748cfc1051ab615993d2a6c5cf7467d86e04fb8fbeaf8ce3fd925c190a6b57ec4fb9f7ed3df7b2e4c61d141965f8fb8ccf5461e0b36665b86
-EBUILD libyahoo2-1.0.1.ebuild 931 BLAKE2B bf19b82d74710bca452e2c0d91af89d1e03cc926e48b66cc3c3dd6ac318d3e6a60adb2807651079bcfc22e9fee5b23b02e64ca663289d2027cb5ceb75e112dce SHA512 f20a0d972207a7082a2b58e7224c400fc584b9b604f994ef91158f5ae0f8daccc000f37fce5b6527262924b14320ca8d29ac02183ef5a1ff414b443632d3c62e
-MISC metadata.xml 246 BLAKE2B 2095d570255d285eaf7669d02b3e7045eedd43bb9b563bf05aff327106fa6b30fe37b99a6160a68bc040357733b9e5d8553b61263f396ff8a1fb19658962a65a SHA512 967f79698c434269734a15532f1c4834a5a2a02786d2f25ad7d1f5d323d292a910eec84ff1256c68aab5ca662e3105aa9dcea8cf18c43b0d62121f6352b36343
diff --git a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
deleted file mode 100644
index 4e0f1142cd52..000000000000
--- a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -21,11 +21,9 @@
- noinst_PROGRAMS = yahoo autoresponder
- 
- yahoo_SOURCES = sample_client.c
--yahoo_LDADD = libyahoo2.la
--yahoo_LDFLAGS = -lssl
-+yahoo_LDADD = libyahoo2.la -lssl
- 
- autoresponder_SOURCES = autoresponder.c
--autoresponder_LDADD = libyahoo2.la
--autoresponder_LDFLAGS = -lssl
-+autoresponder_LDADD = libyahoo2.la -lssl
- 
- endif
diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
deleted file mode 100644
index 66739a597faf..000000000000
--- a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="interface to the new Yahoo! Messenger protocol"
-HOMEPAGE="http://libyahoo2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libyahoo2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="libressl ssl static-libs"
-
-RDEPEND="dev-libs/glib:2
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-asneeded.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:-ansi -pedantic::' configure.ac || die #240912
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable ssl sample-client)
-}
-
-src_install() {
-	default
-
-	if use ssl; then
-		dobin src/.libs/{autoresponder,yahoo}
-	fi
-
-	dodoc doc/*.txt
-
-	find "${D}" -name '*.la' -delete || die "Pruning failed"
-}
diff --git a/net-libs/libyahoo2/metadata.xml b/net-libs/libyahoo2/metadata.xml
deleted file mode 100644
index a38f5ff58985..000000000000
--- a/net-libs/libyahoo2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">libyahoo2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index f733680256ff..8fe0127f5d56 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,17 +1,9 @@
 DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d8eca110633960c8197becf1fb64b77e36f2bd63e241ff0a3eb86aae1b6b538de2043e1bb6626b9b18fa9951db91 SHA512 a1dcb46d3e27c93b511a0dc846b5ed6dc35992cdcf04fce6ad83f5a92440d11d60a07e0fec64f9d6c5e2f27365bdd7a557a35af4ff250b342adbde6193240a95
 DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
-DIST mbedtls-2.13.1.tar.gz 2345612 BLAKE2B 0b78a04407076016fb7f74b635cd2fc86119a9cd8571c6356715e3a680f5b16787c2b002830d103ebd4b995dda956ec874a35bf1a824489dc56f509a9485b1d3 SHA512 1a70446b533534c075de38ce0839f7947077ffdddffa57172594b8f8a3c4a3fbdfa9b06d13c198008abad33633e509f06abe5362f603f63850d9ec44734b3c0b
-DIST mbedtls-2.14.1.tar.gz 2374523 BLAKE2B bab8e2a6b988627ae634aa26d6bf778ee1b923c9e2b17b2fd62c889120ab0dd5a9362ce6c0b8817c97dc1bbcda892b3a9ea7113c73240345e6e7bc4470a047aa SHA512 e8c953f4335a0cbdf4e713b646fcc1ee5302953b4279c6f21c15a6a8216d805d113354c1448c8df3617dbdfcd4e8a82157cd5630c37662d0db6b02865d4bd8e0
-DIST mbedtls-2.15.1.tar.gz 2662140 BLAKE2B 9b1f3f6e522445c187ebfe38a35bb934d72d638d1b0fa59852c7e0b1c1094302efd4328038a2e0c8427b2d08d791179d0b33ffd20e7809cd4ac9dac1b480866b SHA512 361bac49bc179c020855a59140a3e9e31ec9e89ebde9d630e9f3491cdfdf466c8dc2313276d6b257a7728784f5478bdcfd14d26e81f90d432bad2e9a94151fc2
-DIST mbedtls-2.16.0.tar.gz 2412091 BLAKE2B 7fae9fa1ffa8ae7e7958af6fbac98299135e5b7c524ad3944f0ae7b5aa7f2574253950583a77bd1b9fa175b513032110565406b5d4a85c56c65c5c2e50e87928 SHA512 15e8df96c16b0b6f7b100ca76d85dae77f8e6a6644fc41262dc28e11440b9238e837193991ba5942864ed9f58542f96967c2d1e18a5ae270571f6d364bcc33b1
-DIST mbedtls-2.16.1.tar.gz 2426992 BLAKE2B 11915bc2feb27b16ad20c3079905081093dad100bba02b06ccf30ce708d3528445bc153ed81e6e11e7c8d15060a47bf6419252f934bd6950fe3a7867e0da6aa2 SHA512 d9333abd463350bfeceec4edd605e93326578ca646053b0c6f6c51567237273fa88f602b065706fdd699a2a06e667cc54ca3919bb71b2c4656fbc620b967bc01
+DIST mbedtls-2.16.3.tar.gz 2459563 BLAKE2B 5de21b27274dae61e282114da196078be7931e823750f712145c372160204e02f36f995d2cca8589f7b8ffcb646b0b258b0d49db6a0ffa01117b8c0af9f3fa0e SHA512 3d798f7de9c33325585d5d7c8608cc16acdcf42c246d283b2fb8a29f5e419f2899342965ff297432ef2ab20c91eaee28d6ca53349f5a68b0a4fd29d6905fc64c
 DIST mbedtls-2.17.0.tar.gz 2738368 BLAKE2B efcf2a6c84a85afdca0205bd9e8bcf039074c5e6f40e0814f835cf26c2d13dce87bd140aa0b803eea6a683e31b79680a3ea8ba72417e7ec26f206e0b027b014a SHA512 6ab52d116cb9f755871f2fd196ec1b352dbbe59f2ecedeb5551237e4e672da77205ef0c2f80ec746ba1fd94cab1995ab1729c8adb0f29d10f3c74a67f5327493
-EBUILD mbedtls-2.10.0.ebuild 2414 BLAKE2B 9ee73c02f4c6103bd1e074d066997d07341be8947ecea3b1cdd8a484e9b5fed0bf2d9f759e1cfce4d0426ee8d8a14def028674145a651f01ae641155790a8998 SHA512 e2aec8dce8998177c32cf6df147f67d930a489fae325819e30faea14cc199a0e73af7dfa4a2c71e7a0db9acd99aef71c9a356d0ce8754aa6f08f2c9496107404
-EBUILD mbedtls-2.12.0.ebuild 2442 BLAKE2B c45bfa98c90f49219f6189a7f345aa64f4c5e6b4e6ea9037f323377b773d49ab3f8ad72858dbffd8a3112d85fe4938df8dfc01927bc9af36e7100d2921d84ead SHA512 a01f5cfecd3c93d95a65673659103d18415d9a72e464149bce3e20e8ccb4c3df97579571e5a8c3f6cdc550a3a6afae92af5e366db3efa8aca76813a9fdcfd20f
-EBUILD mbedtls-2.13.1.ebuild 2455 BLAKE2B cd57e8c219e29481e51c967ab0aa2c0e4f815293905114696dfa4a24ffa3a0d7c851cb8625a66d38e24a8d64b5661d26517b4521f5f451b18ff7456f8b9d0741 SHA512 0b292eecbd94c51a619310cf4ed7ebe9857c67e98815d590bc2dee84c6b8057128486f3da442f9d6bcc62a1c3bb58e584942f9177144a8444ae1fb74b80bec51
-EBUILD mbedtls-2.14.1.ebuild 2452 BLAKE2B d8d88038dde514329f7d0d45ca8abc55e4d1ae9eb19b8142b6a2915ea8c3cb9af0d6c12633fb46249391f949756cd35d0d39627b1bff7c10da805f3a9677decf SHA512 4b02c7e3e685f23c34139d56a81ef2afec9fb1369790ceb186211e8607d99d7dc88e1a9e915bdc91f98af9ba2b81380adc7f0e01eb16c12ec8c0b10ef375713c
-EBUILD mbedtls-2.15.1.ebuild 2452 BLAKE2B d8d88038dde514329f7d0d45ca8abc55e4d1ae9eb19b8142b6a2915ea8c3cb9af0d6c12633fb46249391f949756cd35d0d39627b1bff7c10da805f3a9677decf SHA512 4b02c7e3e685f23c34139d56a81ef2afec9fb1369790ceb186211e8607d99d7dc88e1a9e915bdc91f98af9ba2b81380adc7f0e01eb16c12ec8c0b10ef375713c
-EBUILD mbedtls-2.16.0.ebuild 2452 BLAKE2B ac897017e98ec772ffe853f35fa728ee4184c0134c86986cf90c447a55381a24e203e99c8ab776bc1352c2f99427996d1c664185d6e447ea200a45a466dff873 SHA512 9a21024351ef7a7cd3b149d49cb45198bba22fd402d8370eb6efd219dd41f6e547ccff090d0b7b1afac195de37479811884b2fcb4c6e4a054e35e429c45c226c
-EBUILD mbedtls-2.16.1.ebuild 2452 BLAKE2B 0b4f5a129d3236791d57b3cf4a59ab3b6bd95512c95f099cdb1500a7d3e5e00c8d3c202c3eb9fe99edaa76d68f0034ab5e2d53f2e535743e7d25a5a5d274b080 SHA512 b89206b7fb7497df8c12ac1922023e0232a5cd36ffb6464c3ddb8913b49c2cf4ee2e5764639e4af4a957149fc176b7c678bc26f6ba548527eda655fe7818a3ad
-EBUILD mbedtls-2.17.0.ebuild 2452 BLAKE2B 0b4f5a129d3236791d57b3cf4a59ab3b6bd95512c95f099cdb1500a7d3e5e00c8d3c202c3eb9fe99edaa76d68f0034ab5e2d53f2e535743e7d25a5a5d274b080 SHA512 b89206b7fb7497df8c12ac1922023e0232a5cd36ffb6464c3ddb8913b49c2cf4ee2e5764639e4af4a957149fc176b7c678bc26f6ba548527eda655fe7818a3ad
+EBUILD mbedtls-2.10.0.ebuild 2392 BLAKE2B 8127b8612a16cb8421d865c8812f3cda2d78f8f55dde6879b4b9be09504dea0fee0a8f2c7b1a8973b42c6f54c0f55f172a05320d022915782e9f2131d1b5ad55 SHA512 7eec69c20f376d19c8e2186384ddb04fa2fd214febb15efbba2340b4a2aa6449d14e865a86139e87bc25f00c54c83ba9f9f01ba7cc018ef0ebb5c267995ed83d
+EBUILD mbedtls-2.12.0.ebuild 2420 BLAKE2B 127126877ea026036c4993ea157fc517e1f6abd33c15fd8a215e188980ba8a99c4fc71d9ba1d6abcbaf181b8912817a3efb9f8ad79a809eb02e9c68fb94f840a SHA512 8050aca33b36dbf8e1ef446787a71861d4e762c9f4dc58f5bb46c991e0c292c72154066afdf4bd78ff25ed4a2b537a8d37d1c5c86a201e90d892540653aef28b
+EBUILD mbedtls-2.16.3.ebuild 2430 BLAKE2B 74f231ba31eb1f9d932b8f07aa8fa6d930e7d1027f6a69410ff067e4e6455d4b5e5e4997137aa590abc4fd08747c2b1b4274b213d06c38e00590510c37a26961 SHA512 39001011710809bbe0a851c4307318d69442787b838bda820d03aeaee2597af61d16924b7eab71f535ec9976072b9f1563c56eb991a0e109d4e4bacd7a644360
+EBUILD mbedtls-2.17.0.ebuild 2430 BLAKE2B 74f231ba31eb1f9d932b8f07aa8fa6d930e7d1027f6a69410ff067e4e6455d4b5e5e4997137aa590abc4fd08747c2b1b4274b213d06c38e00590510c37a26961 SHA512 39001011710809bbe0a851c4307318d69442787b838bda820d03aeaee2597af61d16924b7eab71f535ec9976072b9f1563c56eb991a0e109d4e4bacd7a644360
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
index caf219ae8824..9b8c96be8480 100644
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index 9b2bfed227cf..c660faa6c354 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/11" # slot for libmbedtls.so
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/mbedtls/mbedtls-2.13.1.ebuild b/net-libs/mbedtls/mbedtls-2.13.1.ebuild
deleted file mode 100644
index 32c435985e20..000000000000
--- a/net-libs/mbedtls/mbedtls-2.13.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.14.1.ebuild b/net-libs/mbedtls/mbedtls-2.14.1.ebuild
deleted file mode 100644
index 12069e130eb2..000000000000
--- a/net-libs/mbedtls/mbedtls-2.14.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.15.1.ebuild b/net-libs/mbedtls/mbedtls-2.15.1.ebuild
deleted file mode 100644
index 12069e130eb2..000000000000
--- a/net-libs/mbedtls/mbedtls-2.15.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.0.ebuild b/net-libs/mbedtls/mbedtls-2.16.0.ebuild
deleted file mode 100644
index f222e806698e..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.1.ebuild b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
index a5b2310cf897..347aeef76fc8 100644
--- a/net-libs/mbedtls/mbedtls-2.16.1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/mbedtls/mbedtls-2.17.0.ebuild b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
index a5b2310cf897..347aeef76fc8 100644
--- a/net-libs/mbedtls/mbedtls-2.17.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index dfa787d8a3be..898428822070 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,5 @@
 DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
 DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
-EBUILD miniupnpc-2.1.20190625.ebuild 1333 BLAKE2B 1cbe9aead1d890e3f72e899dc29c1edb4cb0b0da2fe1ac492871093dca397ee0d7bae4446740083b283fb09014017d3cbdb446aac6c68d8b23db03dc89788b86 SHA512 5547277b02ff777c3d79ed2bfda70da4a3cf9346af4098a475901d9ba85e30c4cd3b9dd2af1be0f0020bdbb139b41537adc63c7da8145ad4b879eb222b09d8ee
-EBUILD miniupnpc-2.1.20190824.ebuild 1342 BLAKE2B f12bd5c9837665f4d53fcffb68dd94886e5a526d84e48414b7c06f1a227c7508a73cc582060edc2dc9be67a54d5404182c03cb89c30ca556de0e9ab9c97726ea SHA512 e28384448ff3a40f5e71625073fab0fc2b0a1c4c5a10e545377df60ca89b9d1c497677b34c1571c6f7696411498bc38a1206c66b94f3f139a37380324a72c43d
+EBUILD miniupnpc-2.1.20190625.ebuild 1323 BLAKE2B f8bc0853f7a47ae30c45cfa3377bfc38792a4fb171fd5aa1f8be2ef83eda84f8f244cf50a5f525ffac8daedfd036339f6daf1a5c44bd6941f0523dd09f6baaea SHA512 cf130e53ad502521880104721b5b092cab3a5841ad838a3eb1efab62bc1a1daf0c3e3e3099cea31f918ee57921b6cd21774f4867824fdf54d18d550f141964da
+EBUILD miniupnpc-2.1.20190824.ebuild 1332 BLAKE2B 1672ad870e46535d43a6cfe2161d0db686cf48af5c27e22ec154c92378ea7daea3d083e131c328297aed339c107cf807fb4b227062e4cfbed1c30e0480f8c974 SHA512 e96a5f62149af3bbc38c696bb8acf48d301bcd6ec4337ac129bfd901064a84f4a26a1ace4e027f7f5c81f7fa0494de9ca118ffc8e56f74c61ed49eb4548a99e9
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
index ec25ddae0e6b..ed9a29ff0b04 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
index daca72280309..cc591323e332 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nacl/Manifest b/net-libs/nacl/Manifest
deleted file mode 100644
index 9c4fb7e0f1a1..000000000000
--- a/net-libs/nacl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nacl-20110221.tar.bz2 163415 BLAKE2B 2b9b3b009f32a23fdea4885a3c0dc34febdc675b856c42d8fcb68bf1da67f6e5c073f7e17d2f4001416dd1e3e7d889ca6561e09f7ea081cbd8fbe77aae6ec6e7 SHA512 4c031ceffe6a28dc74b46ac003d485531f78de467c802df73c8b22ca53644dabb7d2e3080b7bdd6583f0d07ad76b6d95bc0ffdce319ca2f80ee041e6fe618656
-EBUILD nacl-0_p20110221.ebuild 1904 BLAKE2B f183b0cb6e3c179252e952234f505788d5dc55e98a2a8bee94291ba065478243862ee55738a94aa65b55bbd8020ca6f592812c3ff2ee698db1698bd6f70235ad SHA512 ff11b6737ee7e071fc7a625ec5ec69a2d5156fcf87b947d471e0fd60051e8e1dfc51c21434a8a8cdc6f39d449ac8bdfaa63dca0fff961a79e3dcc6e82cc600af
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/nacl/metadata.xml b/net-libs/nacl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-libs/nacl/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/nacl/nacl-0_p20110221.ebuild b/net-libs/nacl/nacl-0_p20110221.ebuild
deleted file mode 100644
index 55bcb6fc9de6..000000000000
--- a/net-libs/nacl/nacl-0_p20110221.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="high-speed software library for network communication, encryption, decryption, signatures"
-HOMEPAGE="http://nacl.cr.yp.to/"
-SRC_URI="http://hyperelliptic.org/nacl/${P/0_p}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/0_p}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nacl/cpucycles.h
-	/usr/include/nacl/crypto_core_hsalsa20.h
-	/usr/include/nacl/crypto_hashblocks_sha256.h
-	/usr/include/nacl/crypto_hashblocks_sha512.h
-	/usr/include/nacl/crypto_onetimeauth_poly1305.h
-	/usr/include/nacl/crypto_scalarmult_curve25519.h
-	/usr/include/nacl/crypto_stream_aes128ctr.h
-	/usr/include/nacl/crypto_stream_salsa20.h
-	/usr/include/nacl/crypto_stream_salsa2012.h
-	/usr/include/nacl/crypto_stream_salsa208.h )
-
-src_prepare() {
-	#drop useless path elements, verbose output, predictable include dir
-	sed -e '/^export/d' \
-		-e '/^PATH/d' \
-		-e '/^LD_LIBRARY_PATH/d' \
-		-e '/^DYLD_LIBRARY_PATH/d' \
-		-e '/^exec >/d' \
-		-e '/^shorthostname/s:=.*:=gentoo:' \
-		-i do || die
-	sed -e 's:=== `date` === ::' \
-		-i $(find . -name do) || die
-	rm -r tests
-
-	multilib_copy_sources
-
-	filter-flags "-O*"
-	append-cflags -O3 -fomit-frame-pointer -funroll-loops
-	append-cxxflags -O3 -fomit-frame-pointer -funroll-loops
-}
-
-multilib_src_configure() {
-	echo "$(tc-getCC) ${CFLAGS}" > okcompilers/c
-	echo "$(tc-getCXX) ${CXXFLAGS}" > okcompilers/cpp
-	echo "$(tc-getAR)" > okcompilers/archivers
-
-	sed -e "1aexport PATH=\"${BUILD_DIR}/build/gentoo/bin:${PATH}\"" \
-		-i do || die
-}
-
-multilib_src_compile() {
-	./do || die
-}
-
-multilib_src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	doins build/gentoo/lib/*/*
-
-	insinto /usr/include/${PN}
-	doins build/gentoo/include/*/*
-}
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 3882cec690d9..22be2f5efa0c 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,3 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-EBUILD neon-0.30.2.ebuild 3428 BLAKE2B 0b6d26febcd80cc8289c51abbf7ceae84bd88622808fc0fca3da19131e6ce3ceef4e071b80815b8b6ab8a837c0b60133bd9239173ec3122da47864e35794b258 SHA512 e5b6370cae0b9cb4195cc52ade60e753309d7a3c558e1af5fcfdffcae221c80ff4076da6466e24fc2f1702ff491f7aa0c526809c76bffa8bb3dd898e10952c15
+EBUILD neon-0.30.2.ebuild 3445 BLAKE2B 90f7d22b993069c635213cfe7f75cc82f3934e15e4b68cd3cabbf90f23c5142917c96447fc870b9472f9112a1f4842d48e9d4829563d898190f0dd84acbed0a0 SHA512 2fdddea57b50983eba7fb01a87734d1618a43f031c52c06381ad232080442284c1c2cea83632d811bf15b2d172691fdcaae96e55d748d3f6e9ef55d8b792e3af
 MISC metadata.xml 1341 BLAKE2B c2bec964f34a0d9be01935bd3d78d3e4afcc0101f9d31eefa44106c13d3e8c1f91b227b5f15449d71785a889dfe801768c8b2aee361b919aede85e0d41602a17 SHA512 9b40394e7a103b87d61c0ac004dbb7294bc977ccb69d2669f186ceb1980fca2e2def5ac097ae2364c4e2c762e5170d06a5b281bbd870ebe00559cb5cb17d87f8
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 506f311c68b3..f227074a1761 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -11,25 +11,26 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
 RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 	!expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	gnutls? (
-		app-misc/ca-certificates
-		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
-		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
-	)
-	!gnutls? ( ssl? (
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
-	) )
 	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
 	libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
 	nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+		)
+		!gnutls? (
+			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+	)
 	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
@@ -45,10 +46,12 @@ src_prepare() {
 	# Fix compatibility with OpenSSL >=1.1.
 	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
 
-	# Support LibreSSL.
-	# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.1.
-	sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"
-	sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"
+	if has_version "<dev-libs/libressl-3.0.0"; then
+		# Support LibreSSL.
+		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
+		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"
+		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"
+	fi
 
 	eapply_user
 
@@ -73,10 +76,12 @@ multilib_src_configure() {
 		myconf+=(--with-libxml2)
 	fi
 
-	if use gnutls; then
-		myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
-	elif use ssl; then
-		myconf+=(--with-ssl=openssl)
+	if use ssl; then
+		if use gnutls; then
+			myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+		else
+			myconf+=(--with-ssl=openssl)
+		fi
 	fi
 
 	econf \
@@ -103,7 +108,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete
+	find "${D}" -name "*.la" -type f -delete || die
 
 	dodoc AUTHORS BUGS NEWS README THANKS TODO
 }
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index b3d5dac1166d..c6d14924e7ec 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,4 +1,4 @@
 DIST nghttp2-1.39.2.tar.xz 1635428 BLAKE2B 4569774c33f17d51ac889c385697fcead82106db421399ceb22ad2aafabe64a576445d9272adcf37e2fec47cdd6ac1dc6423efd49012ca7be0aa2087609a0397 SHA512 d8c971543e3e87736dfafebca55e9ecd0644e304c9731edaccba34170205824476595861a439077289b438ad489dd6008dedf2c6b2c111920300329be1b1bf34
-EBUILD nghttp2-1.39.2.ebuild 1955 BLAKE2B 60502c5f8505c6b83441dd6f92b1a6b232a5025b96922341ffe3be0b7543ffe95484be0c38b757849432d02d39d749165a24a9b9c4d7148451d5b8da6772d552 SHA512 3075acc15ecb395a3fea2963652bf0bcdbe8678d1061afe728a7f149722d3bc4ffd1042b2e5987b7f69a78d2070be977e1c8407480d5bd29cfc1743530ef9037
-EBUILD nghttp2-9999.ebuild 1966 BLAKE2B 13541411bb8f29654a24fbfd9bfdcc299ce78dff30bfc05de6d66c433cc12f258d9dcad25d222cc9e9f991322d4ff626a220478f5a7c6c61d6009b920f203938 SHA512 d851b5061afdf03f4724c696489915a820437ae62e927e66c3c4089392f8e01fc62e434718391d255d51f42fe61d420cec3de957b81d3c63103b58ffda3ca4e3
+EBUILD nghttp2-1.39.2.ebuild 1943 BLAKE2B e964dceba78c453903c6a7889de2f5ce8bfb77d91c8a89ce77fb671eaf9a07fc4e722cf01a1a5407a9739246ddf8994a5bedd816e54ee26e0998c422c121c8c9 SHA512 62d312fe5c28eb7b6d22dadd0edc738144a75d8bbf469fdc755788a7d3aec5c9686245ae8e75a5edab8f19e2183d8ecd18fe8efccfe6505f1b2d20d83f1a2b52
+EBUILD nghttp2-9999.ebuild 1954 BLAKE2B ff2ab3bf0c6c585ff522b73d11a2a3e780f2dcba47c84290b336b6a43d861b0f48919bbb5233d80550012182f5b805fc5f044460ff8fd58774e392358919f8a7 SHA512 a6e5b180d4029944eb8942e5f57ddd4f71359428159b220367db7b629c551457f2e9a84e993fa41b261f7217a03750c5e2e7e4ace7cbcfc6ba499e9dfff8f9c7
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.39.2.ebuild b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
index 2142ab3bd2e9..83f298094049 100644
--- a/net-libs/nghttp2/nghttp2-1.39.2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools 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
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 92ac11a357a6..6750a2a20d71 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools 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
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest
index 561b62df5748..96396613dcd9 100644
--- a/net-libs/nghttp3/Manifest
+++ b/net-libs/nghttp3/Manifest
@@ -1,4 +1,4 @@
 DIST nghttp3-0_pre20190912.tar.gz 155172 BLAKE2B fabd472e429222502288b7a4030b4aa51f8a1b609590d63b51ab3f918b8cdb462b766a40911986b3f72f2f1b0debee1f0ebdf8802991bf4fc5d4a6d14297bdcc SHA512 89c7b40843bde9d2c2ab24211794b6ae0e1fa15413e92dcf2238b876552f29bb2f0db724d9a205c2a1c98f25a14ef570c9e53df52fb519230b6f78dcc04d2117
-EBUILD nghttp3-0_pre20190912.ebuild 941 BLAKE2B e7b55f8811ea921c2d73c30bd07b62f5e6c46382126dbf471c54c90638cc0d8b258a7fc4242867ec9fb939db87b9f907ea9cc21f732eeda014be57fac371c5b0 SHA512 58cbc0b76bdcd1389df4adfa021192099a4617db999e4766c93f35bf33e67e011c4e0e43c6bd76dda05b70ef14dba12d5a7b313f9d65d159816852e7b70fc561
-EBUILD nghttp3-9999.ebuild 843 BLAKE2B 69ef46900567df5d4fddcaec70fc18a895bbbc109e3c6d05e3603284e606f4106f2738f44bd8212f3d59235d9909703815db05c538f7fd6ec3b1bb6a3b1c146f SHA512 6cca1448b0b7571660281c2c2c2aec2b65f311b0bd480933874f41968c3f250c827d60c2059c16e1a4468967c83e0122286b86a7244a88aa2d0fc62f05928803
+EBUILD nghttp3-0_pre20190912.ebuild 947 BLAKE2B afeea5dfc3c33793175981a74c0d1485b2ab33a5a45b387054705b238d4ccbc73d282ff6163b80295ba3ab550808b8a54aec014e81655ffbe2aacdb3dd5fc614 SHA512 18999a7d0dda93632ba6d015938e60c662448e5a33324b51a44a4e577b332a9be56060cd5b148039394fb9d8d0c843c23974695119d40594ae17411835e89684
+EBUILD nghttp3-9999.ebuild 849 BLAKE2B c471dbbbc2eb5409395d310c258bcd6056cad20f1b03caeb7f64249e28c8324abf323e0d2ba3208f802a6bb258517bd6529e1c261209a49d182a8104ad307fae SHA512 8632a568e194e9101cc77a648546af1b72831d5241860a4f4868ef4f19c4d1c8dd5dfe6f86aef20a144987db6f5e3b53f7fb7de007db6f491c4d0c5f584c25e8
 MISC metadata.xml 326 BLAKE2B 04521fe96f519c53e0a95a6a720be2e9828cb12ca5b51c6895d23e01e99d88d6b9970a5b01cdc9fc158444c01fd77e192a9071445f389df300e0fe9ec5c0d7f4 SHA512 02b24b1a01a3682c089affbba8f49eb19e1751362aa51306b9fd73e1050d465cf98511be57374321eb9b4fbb99db6c867995b9dcc1cc511b96d7286c039270bf
diff --git a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
index 48b5fc1f2854..82c8375e72b0 100644
--- a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
+++ b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
@@ -12,7 +12,7 @@ else
 	GIT_COMMIT="51379a041174ad953dc6ad437712f3b279f81919"
 	SRC_URI="https://github.com/ngtcp2/nghttp3/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~hppa"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild
index 9bc601bc0316..7df7eb88b3ac 100644
--- a/net-libs/nghttp3/nghttp3-9999.ebuild
+++ b/net-libs/nghttp3/nghttp3-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~hppa"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index a7fd66159ce9..1e5396610e24 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,4 +1,4 @@
 DIST ngtcp2-0_pre20190912.tar.gz 302984 BLAKE2B 906b248b0c19395288ed2c5ad55c8d42a9df9d76458104785c1013b9ebfaf1b92a4b87ced8755377fcb627018cf8854be0e4687e4c8a23ae994e5a21f466f739 SHA512 91b93575143960af421e8bd37d686602905fa3093750cfbbe3af1b20d743318281d22162676dc451562768ca08b6d0767b1dc28f3f8f6733235ebd76015a05bb
-EBUILD ngtcp2-0_pre20190912.ebuild 1083 BLAKE2B d7cd45b2d8a5446c5032612283a7fa0f67f76a33de26195658c684f712410dc1949c33dbe7bb52cf8d3216ac04d3bfda39a41fd0f39abce7f6825dbc1c54b26f SHA512 ea83a66291438ac202b846e9a72a87936499572942a5c1b8d40714392f804cca6e8afeeb6d15b596819ba9361b0c7e429cc9337f8eb1344033f69a7c9811889b
-EBUILD ngtcp2-9999.ebuild 985 BLAKE2B 74914e4d14480332db8e314ef60a67195401509d8b9d024a6879e92edc3e51e8f66f0c25f2a786deab17a6f06e93e3f19015d5e47eb74dfb635597fc356dedff SHA512 3d47985104aa11eec3160bd0395a2e9898888c3fc6315e27a8afff1f712acb0b598adf983a5fbf58ea3d92d89318faf8dca04476d81e87f14d0186c3e5938cef
+EBUILD ngtcp2-0_pre20190912.ebuild 1089 BLAKE2B 87104a4d0946a667ff4e4997350affa18318f4d9233db6f7b50ea646aa91554818461dcf213265ed3940b0b754d118b324e9cad587f55be9c2734d71fca2dd38 SHA512 2a96a3cd7a968fac86362ec39a26e153be63fe7abd818ba331abb4125d46a23193a1f62ab1becc80cf50bb92458bbb4df9a8f5e9e98f4e119d77bb61c01282a9
+EBUILD ngtcp2-9999.ebuild 991 BLAKE2B f3fdcc8b88a65d6dc1a80acc39b574a37a63f11c11f7c672e5061121b55312939a7212ccd5235f0be3aa994488ec22b71c79cb8c506c2542933227632a8752af SHA512 3e362e28fa00341c749d688a382ec7e4ce2a9c5323d6009fd36c2abd9f84801cfa5dc4f0054e8863a71cccc00f8f6b44db8e8087d7f0cc463a3635ab47862445
 MISC metadata.xml 326 BLAKE2B 04521fe96f519c53e0a95a6a720be2e9828cb12ca5b51c6895d23e01e99d88d6b9970a5b01cdc9fc158444c01fd77e192a9071445f389df300e0fe9ec5c0d7f4 SHA512 02b24b1a01a3682c089affbba8f49eb19e1751362aa51306b9fd73e1050d465cf98511be57374321eb9b4fbb99db6c867995b9dcc1cc511b96d7286c039270bf
diff --git a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
index c4f268c67043..044390610304 100644
--- a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
@@ -12,7 +12,7 @@ else
 	GIT_COMMIT="5122d9e5e1e91c718ebc3933252ee42522c6e942"
 	SRC_URI="https://github.com/ngtcp2/ngtcp2/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~hppa"
 fi
 
 DESCRIPTION="Implementation of the IETF QUIC Protocol"
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index 684ca3e2c88d..43db6bf28c55 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~hppa"
 fi
 
 DESCRIPTION="Implementation of the IETF QUIC Protocol"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 13d850430e57..e258a123f1c4 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,26 +1,14 @@
-AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.16.3.tar.xz 21505540 BLAKE2B 2ae6c3ce96a42cb72a388ca7727affb1e2eae06b997098bd8cad2b339b888f1f188c868d39631c51e10ef7b3a5a9173a3b016afe9fa7a4fb74c24a584781c329 SHA512 5d5457adaae87e41699cdf5bd62d32e9590248f7dadd583614cca9078a1749a4ee477433ebbe4278ec872fdfc377d99097c1e06073e0fd47c8c6597256ccdeb7
-DIST node-v12.10.0.tar.xz 22726116 BLAKE2B deb6ecaec54233050eaeb335d58020b8a82009bbab51c41c00784cab3003e57dbc96f3c25715deefbb5b3aee704b3db920cbb650af33cbcb1a62c1bb654f48f8 SHA512 7eb57b40effa9627b93c74ddc01ce1c044e878c669969c506ed40f72a7946c7c6951931c4fe4fbef456386ad459f7f4f1d0f04177e38343375aa463974ca1dba
-DIST node-v12.11.0.tar.xz 22817256 BLAKE2B 4e568a50002c436bd76fc851b231ddc52ef25703f13b633eb3e6634b20d78d3462802274a9df777d93ee05b49dc4771012ef1a466012d0de90ca34327d42f4ae SHA512 4d94f1c9a4fd0cc2ea21aea8ea41c595d18fa44e53d0ed35693c3d547a31bee3bcb7842dd5011cbd9c610919c1ac03d98c38ca85bdddd5555608268f2b47b1f4
-DIST node-v12.9.1.tar.xz 22714668 BLAKE2B c2ab1d67d1f9cf9dee4a1fcb0f1f8f23e2536f526290baf9d5dd05867695f763d8cd8e501b044cb42b383a897f5e016c7a57aecc2d5a4ca58ab3d50020db1f07 SHA512 efe5fbf0545a3e9c37c7598abd89841073cfafefc04a9b5f9f95c8c51357bf3d5384701fd5524ff8fcaef833bca87c72cbf1f8755ee406e9437ad8ad875af18e
-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.1.tar.xz 15858444 BLAKE2B ad050f71452f0ddf989e66a4eb02e88e4e5001faa2bcb0eae6b57784da87ba1d8251201e3a3d15245bb4d846f31f39854ddfae47aa1212c0526ec717438ba778 SHA512 6938c4864a96f5698ebc4e9a1228644820789d5402f42348eb1ff9ccd64f31bb91309a1f3301636b1117424c88b0b41b42baae51a1070d5c532604e5d7d7b868
+DIST node-v12.11.1.tar.xz 22852156 BLAKE2B 38205c3ad52ccac2656c72b31c5714268e4771375b13d7c113e4a5fe7e9530d2826c43aeaa3ed3e30210f504d37221f90f3fb2a15f4c5fbca8878d0f2639b9fa SHA512 9567ee592ea8a05f899755d5e1c934413532676c78a663a1a861a6fa882c7eecae411c05c4b034191b7266776341609c098fbccfcd93c93eba7b84d138eeffb9
+DIST node-v12.12.0.tar.xz 22836688 BLAKE2B 81ff202fb807c557a30eeb08a76a8e95e2faec300d360caac5ce177cdfcda3963bcea904f3e79f9ced9fe2219e7e1d4a760a9c4e69dfe5b670c737e2a598cf6a SHA512 91872784a7a7e7e1e0beeb1166eb1ddd7a5432271e9f62265815d4c5b5d831f269916954bb36724e65108c57d6a7ebac3a2a5be2e49f51f7904a7d549c92176b
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
-DIST node-v8.16.1.tar.xz 18519480 BLAKE2B a721ea5118e6e97ce36245367d33fb2eab8a9b4fba72f59f1a65dfc79de394a235a579fa789e8676d2897a928444db11e7792e7fe49c59bf17ac4cc1cac63941 SHA512 7d2d7c063934227e5204b2912de45ed1667d5c35573322192393bdac623491559ccd9fa8fbf05828bd2bb8e3aeb03d82804775cccb1139b48298758defe92be3
-DIST nodejs-12.11.0-test-torque-tq.patch.xz 5156 BLAKE2B 3cfc6d40f996c2983862be5ee47651d0b792c107fbe396f72a47360b47f4d4da9a86f28ebb92803f0ad4026bbcd42fa1efeb3800dc4edea060ea4f5d384c8e33 SHA512 65a0fcc1c9ea03016698d72b5f0dc8bea5514e595b737005a2fdf43b91c61b94a4880a0078824ee46638a8cf7474ed27b6b6a8bc61a3a166e12a19a3952c3edf
-EBUILD nodejs-0.12.18.ebuild 3391 BLAKE2B 92061062b32ab1c83b58c62968522cd0c7c587f5397ef5cfb7c93d2831264a20be13e7eff242d7f84d67e3be72faaff6db1ea934d0116f074b42048323d7a464 SHA512 97e96b5666ece7ab1c0b66703d584a53331e33df77b9280c2cd062483f3c712f9d913eb5cd444ae8d928f244ecadd90435ec09ddbda72d8464aa99a200ac7eb0
-EBUILD nodejs-10.16.3.ebuild 6417 BLAKE2B 1d7cd3d8b82f94490e6739b789f033072dd5e6455afec4e8f22de91a8ee6e9bcee76c03ee79cc57260bd2fa1de2a2fe3bd73ac0507d86fca906f960c815a6f2f SHA512 314c6f7171f6b79fe925fe725296ce89b2783302253124d4093c5a0472504bffad9fa62d0d06431831f91f2093a8218cb2c49c324bbec36214252d8ea944e0e3
-EBUILD nodejs-12.10.0.ebuild 6338 BLAKE2B 0704b552013b85d97e8a1219aca81afea248e079b810707b035e9d7e9110bd4c2d629ee23b2479354a553a633a5d1133e94b0334e576d93ab536629f4525c6c3 SHA512 1adac0bfb35867e8158173a7fe131f16aae0976e5299ec043b8fe20284923fc9658d0de69be623b033f3b75ce5ab2c2dd9f68d25584a68d8736bfef2a4ba7d02
-EBUILD nodejs-12.11.0.ebuild 6439 BLAKE2B defeed6f63366cbd35b4fc5ff93b22ed9394b59b4bf97efb704feb356c115bc244d44b937dcc2a5dfb932cf89e992c59cdef024801e4a86d1df2a885a2c6232d SHA512 a92157e5d55234d0512292b2d7a1032e17dceed547ea23e93f2a3526c88060e15f3c37fc838937d95e90d633ac7c5f54feef711610c99dc5f4c901e0755cf35b
-EBUILD nodejs-12.9.1.ebuild 6338 BLAKE2B 0704b552013b85d97e8a1219aca81afea248e079b810707b035e9d7e9110bd4c2d629ee23b2479354a553a633a5d1133e94b0334e576d93ab536629f4525c6c3 SHA512 1adac0bfb35867e8158173a7fe131f16aae0976e5299ec043b8fe20284923fc9658d0de69be623b033f3b75ce5ab2c2dd9f68d25584a68d8736bfef2a4ba7d02
-EBUILD nodejs-4.9.1.ebuild 4381 BLAKE2B 62e1110114fdb91b685fd5b5941539a4296b1568a16238d272f24aa4e6dcf6d2755bc8960fbde2f7611b5fde4dd7567148258b15067f0d9bcfb129539b9c168b SHA512 c68a34e3bd6b8bc8e51a3f34cb729c4857fa0bdb871d0e6c50a5128262161a2bfea692f2a4985e2dc6a007170851ec1176489c2be870e55bae14fe4c1c94492f
-EBUILD nodejs-6.14.4.ebuild 6126 BLAKE2B b5965f1be60e43483275a13bf8acdeb5b90e3903bb0cd3d425bec1347fec76c1d5824f39d4a178a3f4d376f6fb0deed4441be4042514610801cab4f6229c5f96 SHA512 d1f5432bc43c2aaaee1fefa22c8861231844bde4fa14d2b55459dad60ee07d7334dcf0a1bb816827db088352d93d86a599ac4d6807ba0609ac86602bfa613537
-EBUILD nodejs-6.17.1.ebuild 6175 BLAKE2B 7ec3b76f072f4e88df52f58a194544d5092204dce3c62206169b5bf11bad94754ca52a6b1906546668085eb759c893ec64a5c185e0e082992d71648546192f6c SHA512 46b70f2a29c3faa5549122ded4547f8ac5f04a562c1c8fa329b888ec97901c3ed5863cb6b7a08e97288db55eba03999bc7705aaa434fa2b20923058bd2e21e8a
-EBUILD nodejs-8.12.0.ebuild 6334 BLAKE2B 1e4a8be5bf816111d8c7a9547e86b37c40d98fa4d9ba04465360f2efcff8cea4876dc317cb52ef8047812445bc882d11eb22f31e01360c652cb595b84d329643 SHA512 bebd9d246076f4e60d16bd6886704e7c09f7541485890ca8bd77b20cd784c8d2813acfc4e128e13df5ec2deab3721252d5c4d7a7731b46f0fd8ccde69f476dbf
-EBUILD nodejs-8.16.1.ebuild 6437 BLAKE2B 3cb4771a46036a846ec55e16dfa6c8ab416e1a1ff2cbd194c910d44e94a5327c12c14773cb96ee54363f20f72640f61ed8174e02b87d8f57a21ecf32fa5fd0c6 SHA512 926ba0690299a2658fd9cdfbfd6bfe8cdb1feabb995d42900bde6f726a37cafaba6cfed84b8ab34bac9870d59061d8b82b0d9a9a33669425da42efdecffb6b38
-EBUILD nodejs-99999999.ebuild 6346 BLAKE2B 88fb37466879829ee4e70eb02342a79afec4544fe33581da165bc8a82eea0e72cd7aa59e01d2353b68d8ce0b31d45794f5ae2a9cc108bf3ab61efb9d75be1be8 SHA512 eb5348f45c75861f203147856cc2c85beba56598a0f900ad56613d26c0c79df2e325e1ed7f5210a4c9ec7716cfc134f1c404f0e14b552d94339ad71fbe257cdb
+DIST node-v8.16.2.tar.xz 18531368 BLAKE2B aec2f6257ab9237097e590b70b2e8615b664576b3af2f176260f26460f4f50bb1e00c2aff477a32cdb9ebf83f8b4eadc3ccdc2df431e359904fe4375513fb6c1 SHA512 8b0d4a089a5c80869971ceeffbef3ca03f4de4f53452a9fd16cbd189e5d76c7fdef475c144848c8d657256b41e342c020e11f6acd1880dde92ed0d0e8cf9e600
+EBUILD nodejs-10.16.3.ebuild 6451 BLAKE2B 99559c2e5e964f133e31b21263138c563cdde52ed3982c4ececb19e68df6348a7fb448234256465d8e22f38efbd9f1b6057b38cf6d0050c7c0093a6987dd7bb4 SHA512 699e010ef0e326f323f8f7599afa1ee4d810500844873de328f162aa03093af2b9a227008aaf5f9e3971919f0309525b45bbf07bc4c8c3a100e8db41444f4e98
+EBUILD nodejs-12.11.1.ebuild 6375 BLAKE2B 3badd6680db12de36d79324ae6f2f1c87a5fbf2741286017e9f68ec575a353d7b36149999707d79caea6c872a15aa3612cd25c475f0959eaabefb8925405fdac SHA512 3cae4dc49a8cc248224a1d7ce2f83420769e3a8f89ae59be58fa0f074033876c8d989f242dc1ce7a1bc4cd2b2ae36ea6fb811a1024734c5d8276a9ba96db6a66
+EBUILD nodejs-12.12.0.ebuild 6375 BLAKE2B 3badd6680db12de36d79324ae6f2f1c87a5fbf2741286017e9f68ec575a353d7b36149999707d79caea6c872a15aa3612cd25c475f0959eaabefb8925405fdac SHA512 3cae4dc49a8cc248224a1d7ce2f83420769e3a8f89ae59be58fa0f074033876c8d989f242dc1ce7a1bc4cd2b2ae36ea6fb811a1024734c5d8276a9ba96db6a66
+EBUILD nodejs-8.12.0.ebuild 6368 BLAKE2B c45a61ee92c1949717c09ce2c9c08778d634563f3a5699f768f35ee90eccfd3d1076f1c4591efbb3527aabb996791a91f13f288b2b9467fd13482b5ceacb10c5 SHA512 19e79d4b318ecce2f05a736b6201144b3b9ba6186bb5176856c25eeecdd948ebc26246360a9cb2c05368303659668fe77d82ea5ba70e5f65474f3cb1faf06513
+EBUILD nodejs-8.16.2.ebuild 6465 BLAKE2B 1b8fd1a7d393e88fea7f12e5622d701bdd4326d059ebc7f5845143f011e1ec3ac48e9a99323ba9673b01e84479bbb059df542a6904e4806e9addc4c8e653935a SHA512 4833463afeda2dba9dd8b44517ba8408785cf486a7f1c6550c01f00c2bc177b241b078bc7d084e111871f8d4aa93bd237978271d77d417f2e4347c1bfe32789d
+EBUILD nodejs-99999999.ebuild 6337 BLAKE2B 2db05ed8f94016c72fb9ee5f0d9bd1ebeb05627a4c596a703d17b33c9fca0a92494728453a1e829250e8bc1e9ae8807eeb396dad9f04c8954a86c5f56d5587df SHA512 8639490d22b8b7e0147960673a179c9d5bc712015afbf8a21f716115d9c6b9d54b6ff8055e7ebbba50fb80d3458f2d5050ff8587a8029c7329720e3b80ec58c0
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/files/gentoo-global-npm-config.patch b/net-libs/nodejs/files/gentoo-global-npm-config.patch
deleted file mode 100644
index e7346b826852..000000000000
--- a/net-libs/nodejs/files/gentoo-global-npm-config.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 46ac7cd4229eac5e0182ab62b7ed844c24a8c52e
-Author: Johan Bergström <bugs@bergstroem.nu>
-Date:   Wed Feb 10 22:45:59 2016 +1100
-
-    npm: set global config folder to /etc/npm
-    
-    npm previously assumed that the global config path would be
-    based on $prefix/etc. Since gentoo installs nodejs into /usr,
-    this means we're also creating /usr/etc which is less desirable.
-    
-    This patch will likely never go upstream.
-
-diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js
-index d1306eb..bd2ef89 100644
---- a/deps/npm/lib/config/core.js
-+++ b/deps/npm/lib/config/core.js
-@@ -150,16 +150,14 @@ function load_ (builtin, rc, cli, cb) {
-     // Eg, `npm config get globalconfig --prefix ~/local` should
-     // return `~/local/etc/npmrc`
-     // annoying humans and their expectations!
--    if (conf.get('prefix')) {
--      var etc = path.resolve(conf.get('prefix'), 'etc')
--      mkdirp(etc, function () {
--        defaults.globalconfig = path.resolve(etc, 'npmrc')
--        defaults.globalignorefile = path.resolve(etc, 'npmignore')
--        afterUserContinuation()
--      })
--    } else {
-+
-+    // gentoo deviates wrt global config; store in /etc/npm
-+    var globalconfig = path.resolve('/etc', 'npm')
-+    mkdirp(globalconfig, function () {
-+      defaults.globalconfig = path.resolve(globalconfig, 'npmrc')
-+      defaults.globalignorefile = path.resolve(globalconfig, 'npmignore')
-       afterUserContinuation()
--    }
-+    })
-   }
- 
-   function afterUserContinuation () {
diff --git a/net-libs/nodejs/nodejs-0.12.18.ebuild b/net-libs/nodejs/nodejs-0.12.18.ebuild
deleted file mode 100644
index 40890e986795..000000000000
--- a/net-libs/nodejs/nodejs-0.12.18.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# has known failures. sigh.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
-IUSE="debug icu +npm +snapshot +ssl"
-
-RDEPEND="icu? ( dev-libs/icu )
-	${PYTHON_DEPS}
-	ssl? ( dev-libs/openssl:0=[-bindist] )
-	>=net-libs/http-parser-2.6.1
-	>=dev-libs/libuv-1.4.2"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/node-v${PV}"
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1 # Verbose build
-	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/|| 'python'/|| '${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}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.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=()
-	local myarch=""
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-snapshot )
-	use ssl || myconf+=( --without-ssl )
-
-	case ${ABI} in
-		x86) myarch="ia32";;
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		*) die "Unrecognized ARCH ${ARCH}";;
-	esac
-
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--shared-openssl \
-		--shared-libuv \
-		--shared-http-parser \
-		--shared-zlib \
-		--without-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="${ED}" PREFIX=/usr
-	use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
-	rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
-	find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete
-
-	# set up a symlink structure that npm 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
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	declare -xl TESTTYPE="${BUILDTYPE}"
-	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message simple || die
-}
-
-pkg_postinst() {
-	einfo "When using node-gyp to install native modules, you can avoid"
-	einfo "having to download the full tarball by doing the following:"
-	einfo ""
-	einfo "node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-10.16.3.ebuild b/net-libs/nodejs/nodejs-10.16.3.ebuild
index c2c2f3af8c6d..4dfee5eb4434 100644
--- a/net-libs/nodejs/nodejs-10.16.3.ebuild
+++ b/net-libs/nodejs/nodejs-10.16.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -92,6 +92,8 @@ src_prepare() {
 }
 
 src_configure() {
+	xdg_environment_reset
+
 	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
diff --git a/net-libs/nodejs/nodejs-12.10.0.ebuild b/net-libs/nodejs/nodejs-12.10.0.ebuild
deleted file mode 100644
index c6d70169aeff..000000000000
--- a/net-libs/nodejs/nodejs-12.10.0.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-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="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.31.0:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.39.2
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	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
-
-	# 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)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# 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.11.0.ebuild b/net-libs/nodejs/nodejs-12.11.1.ebuild
index 1d2e04f3c2ac..fdf342ca0430 100644
--- a/net-libs/nodejs/nodejs-12.11.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.11.1.ebuild
@@ -4,12 +4,11 @@
 EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
 SRC_URI="
-	https://dev.gentoo.org/~jer/${P}-test-torque-tq.patch.xz
 	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
 "
 
@@ -25,7 +24,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.31.0:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
@@ -40,7 +39,6 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-	"${WORKDIR}"/${P}-test-torque-tq.patch
 )
 S="${WORKDIR}/node-v${PV}"
 
@@ -94,6 +92,8 @@ src_prepare() {
 }
 
 src_configure() {
+	xdg_environment_reset
+
 	local myconf=(
 		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
 		--shared-zlib
diff --git a/net-libs/nodejs/nodejs-12.9.1.ebuild b/net-libs/nodejs/nodejs-12.12.0.ebuild
index c6d70169aeff..fdf342ca0430 100644
--- a/net-libs/nodejs/nodejs-12.9.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.12.0.ebuild
@@ -4,11 +4,13 @@
 EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+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"
@@ -22,7 +24,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.31.0:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
@@ -90,6 +92,8 @@ src_prepare() {
 }
 
 src_configure() {
+	xdg_environment_reset
+
 	local myconf=(
 		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
 		--shared-zlib
diff --git a/net-libs/nodejs/nodejs-4.9.1.ebuild b/net-libs/nodejs/nodejs-4.9.1.ebuild
deleted file mode 100644
index 4c5b0406ddad..000000000000
--- a/net-libs/nodejs/nodejs-4.9.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit flag-o-matic pax-utils python-any-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 ~x86 ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test"
-
-RDEPEND="icu? ( >=dev-libs/icu-55:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.5.2:=
-	>=dev-libs/libuv-1.8.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	test? ( net-misc/curl )"
-
-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 # Verbose build
-	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/|| 'python'/|| '${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}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || 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 myarch=""
-	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) die "Unrecognized ARCH ${ARCH}";;
-	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} \
-		--without-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="${ED}" PREFIX=/usr
-	if use npm; then
-		dodoc -r "${LIBDIR}"/node_modules/npm/html
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
-		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
-	fi
-
-	# set up a symlink structure that npm 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
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "When using node-gyp to install native modules, you can avoid"
-	einfo "having to download the full tarball by doing the following:"
-	einfo ""
-	einfo "node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-6.14.4.ebuild b/net-libs/nodejs/nodejs-6.14.4.ebuild
deleted file mode 100644
index 909ebd44dfec..000000000000
--- a/net-libs/nodejs/nodejs-6.14.4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-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 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.16.1:=
-	>=net-libs/http-parser-2.7.0:=
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-58.2:= )
-	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	test? ( net-misc/curl )
-"
-S="${WORKDIR}/node-v${PV}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-
-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/|| 'python'/|| '${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}'/" lib/module.js || 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
-
-	# 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 myarch=""
-	local myconf=( --shared-libuv --shared-http-parser --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	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} \
-		--without-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!
-		dohtml -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
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-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-6.17.1.ebuild b/net-libs/nodejs/nodejs-6.17.1.ebuild
deleted file mode 100644
index 814a80538d18..000000000000
--- a/net-libs/nodejs/nodejs-6.17.1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-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"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.16.1:=
-	>=net-libs/http-parser-2.9.0:=
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-58.2:= )
-	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/gentoo-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/|| 'python'/|| '${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 || 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
-
-	# 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 myarch=""
-	local myconf=( --shared-libuv --shared-http-parser --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	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} \
-		--without-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!
-		dohtml -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
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-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-8.12.0.ebuild b/net-libs/nodejs/nodejs-8.12.0.ebuild
index ed7e641f54af..2e98f86fe29f 100644
--- a/net-libs/nodejs/nodejs-8.12.0.ebuild
+++ b/net-libs/nodejs/nodejs-8.12.0.ebuild
@@ -7,7 +7,7 @@ RESTRICT="test"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -92,6 +92,8 @@ src_prepare() {
 }
 
 src_configure() {
+	xdg_environment_reset
+
 	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
diff --git a/net-libs/nodejs/nodejs-8.16.1.ebuild b/net-libs/nodejs/nodejs-8.16.2.ebuild
index fa36bb45c983..621189a0947e 100644
--- a/net-libs/nodejs/nodejs-8.16.1.ebuild
+++ b/net-libs/nodejs/nodejs-8.16.2.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-RESTRICT="test"
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -40,6 +39,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch
 )
+RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
@@ -97,6 +97,8 @@ src_prepare() {
 }
 
 src_configure() {
+	xdg_environment_reset
+
 	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
@@ -140,7 +142,7 @@ src_test() {
 src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
 	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
+	pax-mark -m "${ED}"/usr/bin/node
 
 	# set up a symlink structure that node-gyp expects..
 	dodir /usr/include/node/deps/{v8,uv}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index b660199af758..098bb9968f85 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -22,7 +22,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.30.1:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.39.1
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
@@ -36,7 +36,6 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 
 pkg_pretend() {
@@ -90,6 +89,8 @@ src_prepare() {
 }
 
 src_configure() {
+	xdg_environment_reset
+
 	local myconf=(
 		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
 		--shared-zlib
diff --git a/net-libs/onion/Manifest b/net-libs/onion/Manifest
index 9a4dce2df256..e521fafce6f7 100644
--- a/net-libs/onion/Manifest
+++ b/net-libs/onion/Manifest
@@ -1,5 +1,5 @@
 AUX protos.patch 1239 BLAKE2B e20e0efee1cbbb04caee2d1754164e54545d17ff79a36100b5abc5de2f6174dc49daf776fff137dadb9a298977083a2dccb09286c7f1acaf5c8e8a784fba8712 SHA512 0dd7f95dab267b1df6279fc60869696d506b62756a863c86ade9725dc17e48bc4b71b984d53bce94e88448ab295673fbe27e7687e2807d32841d0ad5ddf6b018
 DIST onion-0.8.tar.gz 344347 BLAKE2B c43bbbf31d29ccc99d2969c7c8dc9aec8d5e514cc785091e3e0e6d1fc1d5db5f8561d5c2c745b4150a493b607c6c271d669e7ca541f72bf4d8872beeba00b220 SHA512 c40a36346de7dee6e98d0b5c38b5e133606046e29bacb06a0055a361013077ec0f6adb04dfcbf2f4ce0b72317c9ed918573299aed8760f069dcfd7c211a302d7
-EBUILD onion-0.8.ebuild 1885 BLAKE2B 66913c12b4403879bcc699edc360bf06a13ef23a478d55fec71038cdcb636fb17a213444358c587f8a598b7296187d9a064534084e8afc9506204e3422bc0239 SHA512 662dedd18af86bacbb769d1fc8588ff5277b61ae8ac9e3a6c84618a63f257bcbe6c9a9a58b58c180e6a3cd2172179b404dc5613ccbddfc6586c1ffa315a88153
-EBUILD onion-9999.ebuild 1845 BLAKE2B ec0d19087784ca956d5500fa914197721193ce29052e950df2ac51b04cbe2e6e8f8ece3e34030d19a8f9261fe1ad7d3feb64ab86912b3d6e6142c430bf6fb09b SHA512 8cf4f821b41d7ea8fcfb17b50a3b96c45e29670b738392942f35e7abb9b01b8158b3d8e02094e6c66aa49116c79700197a4728deb80c0f8f0ec53a120f8753b8
+EBUILD onion-0.8.ebuild 1883 BLAKE2B edb95c79af8ea6cb1d34cccc7fd1f1e485168de5c685cd6e2e83b194e498b6acc434a78ace373f21e0619f9550bd5fb8722ac0ef95a18900419970ad4023a524 SHA512 f7671bc755a007dcacb479accdf4ebbcd6a5988e0daf0a3e397123acb8ff0524fd811f33ed885950b526d6d7a3a36aa7317705e626b2a174f259b1b208c31251
+EBUILD onion-9999.ebuild 1843 BLAKE2B 8473ef5538e391f19d72d60e7d99c3efdb99a751a7f4f64fec2532649867c02dd847350608cc89806c43d5d74dc3e8e88ae916b4bb0246c8765a4e95418c7f28 SHA512 ac1f63e9e7b186ae1c4c49887bf76b3e250f7c3b6ab39ccadaa70789257b7b195d788d154fd7e0a1dff1f4d6da3e685f45a99d073c6498dec5d0d0780bc0d210
 MISC metadata.xml 719 BLAKE2B 91253f71648b48cd344267e189fed4f77c1fbe2e8f218ea7751502ed419f1ee7d97fd881234a99368aaf888b6b550325c054f5d65e9cb007735e25ffebb24366 SHA512 1afb4311878a3eef4d13d7fa6c670f2b1b23e0e89d9c50694668cb36c0d05f529da37af25469b3e4ffc34d25780be7f710e82e87c1962056aef9e4e924d1e868
diff --git a/net-libs/onion/onion-0.8.ebuild b/net-libs/onion/onion-0.8.ebuild
index c1b092d06142..5491a6115339 100644
--- a/net-libs/onion/onion-0.8.ebuild
+++ b/net-libs/onion/onion-0.8.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=5
@@ -32,7 +32,7 @@ IUSE="
 
 RDEPEND="
 	gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	png? ( media-libs/libpng:0= x11-libs/cairo )
 	jpeg? ( virtual/jpeg:0 )
 	xml? ( dev-libs/libxml2:2 sys-libs/zlib )
diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild
index e815359b1035..de8dbb95ca03 100644
--- a/net-libs/onion/onion-9999.ebuild
+++ b/net-libs/onion/onion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,7 @@ IUSE="
 
 RDEPEND="
 	gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	png? ( media-libs/libpng:0= x11-libs/cairo )
 	jpeg? ( virtual/jpeg:0 )
 	xml? ( dev-libs/libxml2:2 sys-libs/zlib )
diff --git a/net-libs/openpgm/Manifest b/net-libs/openpgm/Manifest
index 20b973dd5b1a..8b3b27e556e1 100644
--- a/net-libs/openpgm/Manifest
+++ b/net-libs/openpgm/Manifest
@@ -1,5 +1,5 @@
 DIST openpgm-5.1.118.tar.gz 557816 BLAKE2B b066aabb71701f6b1d33313e95212ec37aec4ddab8b56a0a44f5ed862bca8a5ac5846150ba766340a66ee82d5a579a84348ae0e232238664202f1c37a405ab52 SHA512 50acd102f03fb250cd027c8f4843749641c7b1a4c1dfc41b136627feb59209bc7a2bbd08b7edeac603fb820118c6683ae9377a692949608bad455fef91c97274
 DIST openpgm-5.2.122.tar.gz 583469 BLAKE2B e3520f88282eed7da7890d678a25252a43157982955fab2740766cda9ce6c475ac5f5e3897c6dc1312a19d17e9e6ba94638f4d6fb93e42599359927e29f0962c SHA512 f8b29fb69acb548536179262665c0cdcc8bb1510d3e970d6abebaf33e301f87fbfa7e2c46e387973d8b65470350af66b3130482269b9fbb15fe7bf98b52f6404
-EBUILD openpgm-5.1.118-r1.ebuild 714 BLAKE2B 3ea1e96b5f5bbbfb098dcf4b4164dfddb219dda22b01e9132005b1ec80c5121c7fea83df62638460275b501960e7dac46bc49adbc432174ed775941e34a515d0 SHA512 15544faa781efd16cc5b76b4727183b7ca0ae09b1bce7e4aff87f18604e725c6b9d008e889220b1889339996b8f5dc164167e841571c12f694755c7599e498cb
-EBUILD openpgm-5.2.122.ebuild 726 BLAKE2B 4005c68e327797356a5fc7ac61e9a8eb3ecb033233069711d7092705a714faade5de3ea21ee78f5e8f147079a0f64337011ea7dd06241d79657d478808fb70c4 SHA512 935e40a92425ee6125f12b558bd62c67a28beb703b57d657fac8b0bed1303c4515736afa9d4c7303bf4ec7bacb7c3b9bf9f3fb2bb923760d64e716f8beddf181
+EBUILD openpgm-5.1.118-r1.ebuild 704 BLAKE2B 4d62ee8dadc0d44a769876b692e66fc89f97fcce97f7bde109a16705842e735235a6a25abbcc55e9a54e4f3d4cf8132ce5b716a4e6e84cf88f222ff2489785da SHA512 644b33e015b6266556a4c68589948692de20dd7a0a683b156792cf165c706d7ac0c95e11e28f3a6a989119a23d34cd70e48abc4ef8d896e92460ca4136168084
+EBUILD openpgm-5.2.122.ebuild 716 BLAKE2B 07a25febac86f286638720f239d481fda3bb8f094ff033da964f54f494860abbb37f1bbd9fe4a75a62c28950a830bc55f3633d372c32161924ac7a4db9826f21 SHA512 08ac64a62df804b86c670f2c4e3dfae69301a688fc9fe12812afb7cda25d8200c0ce7e8fb2c94ca06e1f5225288d05dfcbb6191e0712e95964e758a88f362265
 MISC metadata.xml 252 BLAKE2B 6c3a806621bff6345c81c8745469d37c6dea7b0f4e3053a8e768420e72a6e19dc5be32c070d25df570f5cc25083218920d6cb7398a0a67061eda42b9fa45cce8 SHA512 a630f122a596a2325eb582cbaf062dcbd4e27bf2bf5677b8ef0695cd61434c1d96a2c33ef353b6e9659c5fee62a98edfe652474a2150b6ca159e71b146199773
diff --git a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
index 4fed6c8c659b..b4fb79c7dc76 100644
--- a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
+++ b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/steve-o/${PN}/archive/release-${MY_PV}.tar.gz -> ${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86"
 IUSE="static-libs"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/net-libs/openpgm/openpgm-5.2.122.ebuild b/net-libs/openpgm/openpgm-5.2.122.ebuild
index b77b082298ef..43058f88b4f5 100644
--- a/net-libs/openpgm/openpgm-5.2.122.ebuild
+++ b/net-libs/openpgm/openpgm-5.2.122.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/steve-o/${PN}/archive/release-${MY_PV}.tar.gz -> ${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/net-libs/openslp/Manifest b/net-libs/openslp/Manifest
index 1e016b997b2f..82bf735bea6d 100644
--- a/net-libs/openslp/Manifest
+++ b/net-libs/openslp/Manifest
@@ -10,7 +10,7 @@ AUX slpd-init 2206 BLAKE2B 4a78fdc11f5df523d0adddb57aac17550cde275585fa692779d9c
 AUX slpd.service 203 BLAKE2B 9cb80f3eecf7fe569ec37ae7730668fd232b7803fb1e66a4d38d94f28c9ff5248225b86772e2271b77c99931c6e61cfa587745f41bdf36e18658829fea9e86b5 SHA512 189bc5ffe034ab4effdf4187f28110f028452fc9f6e27ff6c44681410b205eba4fb0412b5dd112d27596cef5e2143be6c722a2d5592d803d29dd25e4722ab6ce
 DIST openslp-1.2.1.tar.gz 886195 BLAKE2B f4ccdf37028d41b6e405768f1b3982b1eaa89e85a7e0f3b24c2a29195d39465807f967845958baaa567a7dd2d2bc8cff55eb1d910f43a6e54276673719596c9e SHA512 34742d88e772d7dba5c6fab1ccb7bf27d6174c5ca429aec406472994bcd806bfaf16dd86fce2ae4c51659587e99cced2436cf36772f6e086f7b87275fb1b19b6
 DIST openslp-2.0.0.tar.gz 5424646 BLAKE2B f63560742cb3f679d052fb48b0afdd7cc7995806d77ef93f01da3cd80a884a840d0b678927685d4f4138358dfcf10e93269217643e399d7721571251c31fcbe5 SHA512 e7627417d45d5d0cc83d6e13d62fe192702ce7b763f1b4fb51aa5da8285405b16a34c3ac4f0a1ecffdf59557b29ec7d24925941e56ddee277c8897162f597ade
-EBUILD openslp-1.2.1-r3.ebuild 1023 BLAKE2B 9129caf5bbae1f3c6021d089f87f2b91f763acd0deae8927103aa4878f3590043345c2ab171de10cbde4fd1552c5a13efe4f75ea60e5846b84ce048d80f95781 SHA512 f9e0e8dd843444a33c38f711fada3f576db0bf25b6bad4165ae1b019fb1e70f9f7d96445975afabc5d31ed233a7fc35524969bd6c93e6a9ea2df87af00624675
-EBUILD openslp-2.0.0-r4.ebuild 1072 BLAKE2B fe26811ff5d4ee7334d1f53741955f757d3a9f26977038b63599a1d3898b6da67d3129aee1d6ac281164a3c16dc4b15688d5850dc15c8374f9e469c5e7f00097 SHA512 c22179f59218873aa99fed9100e456d5e33229c4b51436dc457b0589ad179ff65317400b2a92dafcf4ebb90295f5b9e41c1a92981978a13ccfe236574b64c9e3
-EBUILD openslp-2.0.0-r5.ebuild 1135 BLAKE2B 79d6308505b2a9828ebbea11012c6843a98875745cc0d429faa8419deefe71d4742ba02c2273498dc08aaad2422203161bf75333a6d6ac022d531fc2e432da64 SHA512 18ab5814641379ed904dcf558cf42fcd003aabfeb7d360653816850b6ea98a93a5d2637217be309255079ce661613097e8f8643b2d6980e8570004c6994f4fa9
+EBUILD openslp-1.2.1-r3.ebuild 1001 BLAKE2B aa0dd2d21e1edbb95d732571a8886700dd247d045060b899ddb055a5e2b517d7e8368d1c5bdaf3fdd35644210eb50468d82ba7647eab169ad41c84db83669d24 SHA512 539dc488e2c4f71a798ead2603bfcd1899ec5322ff5701ae726519e9acad8ceec5ad079d44961fc0f524ff62daafb4cf5c72657ad8127e73eae7835b35bd0898
+EBUILD openslp-2.0.0-r4.ebuild 1050 BLAKE2B c3409f971baaf611f3de85a8e62c07122593a2c90954d5069b90a90793ac6bae82c1a142409292d9eeaef81679c108b506fff441d0d4b41a77b291dbae770995 SHA512 28f441d530c28a82cfe273fceb9b8b336814469bb421e024613744866242b0599bfd154d2003f32c27ae66d983a7fc786165085a89c06dd1f2fde3f4f2650aee
+EBUILD openslp-2.0.0-r5.ebuild 1113 BLAKE2B a932170bd9e0cb664863ef50f168fe31dcbfd401db7eb68dd26970e17d26746725e94925cd524b6fac27c991f9be725c40435be03ff27c63a544c22d173c57fb SHA512 13427668a080e170b1004eace6c5195fde325552889c62f9d83d6d1dda230490559e7bdae25d9008ee0670b5fe29a7b2f0ef7eac54625fc889bbd05c3f5f98ee
 MISC metadata.xml 336 BLAKE2B 8af4358f9a3d06983df228c81b3add5373b04fe7a322d0e5045d3b1224b4311ccfb27b7ab3f19bb6ecc4a12e8e061b7ba4435e70a7371b9018990748aa036e44 SHA512 2aab4978f409d1ceb235b846e06bae2c750c68c69f54f6d5a3f96b30be24c6262cd085b741cc193d8d60a4486581817347ab5b3bcc84d43da48dcc2c215df84f
diff --git a/net-libs/openslp/openslp-1.2.1-r3.ebuild b/net-libs/openslp/openslp-1.2.1-r3.ebuild
index ff2edc930e63..db091b2a3ce6 100644
--- a/net-libs/openslp/openslp-1.2.1-r3.ebuild
+++ b/net-libs/openslp/openslp-1.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="test"
 
diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index 44b330d8ce9c..cadea63285dd 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 
diff --git a/net-libs/openslp/openslp-2.0.0-r5.ebuild b/net-libs/openslp/openslp-2.0.0-r5.ebuild
index 6178fcf43906..c9a5e673bd4c 100644
--- a/net-libs/openslp/openslp-2.0.0-r5.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index b4f01dd599b9..ffe94ab58e2c 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -1,3 +1,3 @@
 DIST ortp-0.23.0.tar.gz 540135 BLAKE2B 46bc411df48f7f8a2fd180ff75dc5f515c36a71bcaced0d3fcf5336ee8e142c6ae6d597ba39a92c38be78ce74d3eb79692f26596f37075829850222cdf381793 SHA512 70560168f1b138ad825e4e836e7ee218bd24b92a2d76666ba2794a4b31cadbdd8fdd40fee78d612187cde6a827005cbd836cdfc13a70947374356fb84a853ea4
-EBUILD ortp-0.23.0-r1.ebuild 1864 BLAKE2B ed15ba43a7c568756b17ffcf88f0774a878c4ea070843f8606d85afaa494892b17f317b8b445ccc4d2b42c3a03a4522c5ee2f6472c56ff95adf166329334adfc SHA512 3488b8230fb0eeff5141cc381df068c320d0bd7de7fcc11b6d069e7dadf57c4ece62b74a5d562d0d76d198768073cb06d7c527b10c71c3c3e397c48e38d24775
+EBUILD ortp-0.23.0-r1.ebuild 1854 BLAKE2B 94303862b295a8fe0e415ee5b89c840596ce696812e33cc5351e228f9294991258943e442bde48dcf01376b05db58d50c100cdede9a7a0791fdcf6dcbe1c2dfa SHA512 3a3b07f8c8ce6c953400fab35da8dcd9cc2e26cc48adc487dd7547b74cdc9c731bd04a0fac108b97c974ae0e13fd3f72e7ca1f78be9844726c0881a8ecf8a0ca
 MISC metadata.xml 362 BLAKE2B e561cbf846ef904afde531f0cdba64d3855a93766622d90a393e45f0d5ad3da533afac394ba031edbb4afa6ca8a4b95c101f76f2f96450edecaf617ea24dc996 SHA512 6a9fd13fe951f0cdd6574a83f53a0c21324fa9cf45c878e71fe1c6aefa6a52ca8e285f2d433d2bd62723241b59793c06d66e4e9f6f8be1530f8377de224a66c7
diff --git a/net-libs/ortp/ortp-0.23.0-r1.ebuild b/net-libs/ortp/ortp-0.23.0-r1.ebuild
index a935eef5e2a3..ac7c45d90aaa 100644
--- a/net-libs/ortp/ortp-0.23.0-r1.ebuild
+++ b/net-libs/ortp/ortp-0.23.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/9"
-KEYWORDS="alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples ipv6 libressl minimal ntp-timestamp ssl srtp"
 
 RDEPEND="
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 0522811c1bbd..105215d86b50 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -3,14 +3,17 @@ DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464b
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
 DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
+DIST backtrace-0.3.38.crate 68133 BLAKE2B 75794901cf8d322cb642672eaab9403b00f802a917f04505d8a4df1466d340f92f1824cd0cd501d5f6017ff98cf17e4ad61ce32fce07b061fbcdaecce5ac0c55 SHA512 a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST bitflags-1.2.0.crate 16814 BLAKE2B 5b7aee7388b01cebf96651e979025e9bcac85f7324982055d7d805361f91da2b9489a07f00350133c8a58eaf70c5397e3561c15b3f2544aa8202bfdb852c145b SHA512 bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa
 DIST boringssl-f18bd55240b229a65df48e7905da98fff18cbf59.tar.gz 17909647 BLAKE2B c14a9559eab74c400c412fbf62cc3642eff3811e7d93b57bcb286fbe15689ab799c524d2f843e027581fda04919c8fd52defd073da2acd3326eade166423eec6 SHA512 83cd2fb9cec52f97e046c5773741359f4bcea9dad38c346123348187af725011a5ade06a0e3c28609660b00ad1003d3e395b03af6cdeced8a850cd9bebc27e59
 DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST bumpalo-2.6.0.crate 124915 BLAKE2B 567e4060019477006f3ca468cb0e087d90626e37d2cb13cecd6938162f78504c8ea9dfb6c571adf573d631c4a60055e5784ee27f2cbf22c769428899d774f107 SHA512 0a2f9c9dfd9ecfdb159228b03dc573d790d0aca777f43452e8e1d638f180dc855b2239779e321fd0b225cf976ac81817d4bb5fc85ac1e45377c863607bef9966
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST cast-0.2.2.crate 10318 BLAKE2B da2f8327bc3c2d884bcfaad9d4b2a79e009d060501be98cfe344598da66306940134c28f96eac39578ac98cfc26fd754b68707fa17adab233b371a79eda8a54e SHA512 7b0e860a3c6c809799a9fc733bb0303cff819bc2b884cf77e1517aa9824c819c259edda7793be2fa5fa6573de4f07c0ff95f90a03d0d38c5905260e291ff9786
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cmake-0.1.42.crate 14266 BLAKE2B eab3de3a5a482f58dcf72809f63109605d71e1376e4ae2695345abad556eab86fc946c080602671b748fc79e6757478b5b4398a9985128d6189d5fa13ba8a89d SHA512 eb91ecb665924e433369bac77060e44950cefe73eb250463b0e0346e58b6545114e39f995f24c8dea2bb663db2b177cb9f1a8646b286906b3060effd6691e4f7
@@ -24,6 +27,7 @@ DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77
 DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
 DIST docopt-1.1.0.crate 39021 BLAKE2B 54a0543879a68cafd91eb61f836426ed5c8b9e02e1fff6dbb9747c44bdf03a45237087e6f094687ccfac4b82aef07c4f8e35acaf994c4afec57f227bd891ccbe SHA512 f5dd97b4dbc9109811a83dba45bb09018f394adf3f5389cc62f7d42749c90dc337b7f5efdee569150a70194f5bda777a22107123ec7341a38c4f9923bb6f9f81
 DIST either-1.5.2.crate 12124 BLAKE2B 514fca1a11697b952d83b2058bfa21b9dac963921d35e055ddd5b132d8035a652b5c76d356a5c221f8eabb8e420ed727a84bf8077a9d4d4534faabee45f468be SHA512 88b4ad9854281d6748177b8e18a1cb1a9ac8948d2de8ebadbad94e72bf8b825361b142d890b6264106069af48328bb9844afd248f64b5469d2d2cb81d0ce5187
+DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
 DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
 DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
@@ -37,6 +41,7 @@ DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f
 DIST itertools-0.8.0.crate 78917 BLAKE2B 4b519303380c421b5ec9af7b5c97575a39899ed77b0ff462d5c5db65a70f9c1f56959254aa7d20db3fc4f8af033340a96fbcebb189f4d92a2e09f887c736a898 SHA512 ce1dd1f52f6792a6f5303e15f74063d50c11b75312cb807eeddaae7811686347c390426956cbe87b827b970b14b6e4d57fb4ac0f288632766218ff8661feb610
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST js-sys-0.3.27.crate 59423 BLAKE2B 19256c0ce8b33a134048d2ef68a2f87a183201ce44f95ddef57405cd5f0fb1e9c82af2b8e97d10f5284017dd8a3eb935e9f04e5bf9cb2e09dc62d4d93fcb24e6 SHA512 1bff1b24ab99243e5d789ad9f729b3157241b159b5520529a3a8bd152c60c4df416afe9ac0c054933406f69cf48f49da4c51d7c90e05e915c1e19af47735835c
+DIST js-sys-0.3.28.crate 60457 BLAKE2B 9dc982e95c8342597b94afd7ed2f0b41468634c43301f66b5c19be045dc8bce4b7cb4ee0cf46784ab76de8d3501ed40c58426fff8a7f2930600e8a8ddaa828ad SHA512 15036d58b01e4f616079d9155c2e8da387900a9f11dcda767415e85a65955f1106ff20b586f47e607acd2b915067f93fac320140aad789ca90c0792296914199
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
@@ -54,6 +59,8 @@ DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c5
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.3.crate 34868 BLAKE2B f97fa38afb8abca38d814673e0cc7d17e3bf623984afa7fc2601636508d8b32160fff4079d2e266e2d2e4519d0d8942e88cbabcde54a869dde0a7f0961d2afaa SHA512 ff4e32e42d206191741880e362e39e33149fec4f94cb38e2693e956e4c0dd680dba4712f436fddbc092a7ebef23b7cd4693345fb93d5b9713a516960c2bfd82e
+DIST proc-macro2-1.0.4.crate 35217 BLAKE2B 5d807f6dcc4ba372d76ca3227b2ed6c6710ebf78c3c4e6ad8bf6020717a262861d9b4017c27e338addba240ff568fbf4510b0c6cbc06bf66a4f38db746e63f91 SHA512 e81800f46b8f0805d10a614848603dbee19ad24339c67986496597fcfd501c528ec4eec081e166b38283b3e7d64a0c2bd972280407ad30e388610b2b81594f80
+DIST quiche-0.1.0.crate 4017747 BLAKE2B 2a78c68d418f70262bfd2916a44ccb2bebf76c4ace8b97b8898d3e04232dd3f48924b510c84080e4cd85642783c058e3514dad9f2ba0cc827cd24ecd2d47bc11 SHA512 9890d30017ce4363f1f7d0bb095c4050f9a5b57991ad740b6b484ba8086b2920b0e7a65760b9fcaabe37843f3cdd06e15ba7c0747dcec558823b4a6edfbfcf68
 DIST quiche-0.1.0_alpha4_p20190912.tar.gz 168349 BLAKE2B 7da7ca968c43ca065492a541e126909d3e884989d0f51775d7e78b1af1b2b7feeb7c913aa3adc99a6ad31bd3c043b79718a51b32fa9a38934b2bd5a2cb950c4d SHA512 7d2ca442efd83d6fc67fca3b3fd974400f76a1fd5b44b241079d386d9c94c8a0ef14f3f5ec17695dac04c42a8d441807bfbc2aa5fe155c7d80e1df01f1197dc8
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
@@ -75,7 +82,9 @@ DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf2
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.100.crate 73104 BLAKE2B d3557c4f170b31ca64ebd07bba8ee24eaf8e1ffbf192c97d5681dd2b18940c559c31b6fa9ab2e4d24d7b1ce9ec21c0953d37a1a5ee845b0d75d6bd1e870309a7 SHA512 bce506b4d30c9743f69a8c599eeb5bfde8e4951f1700901ce03eb9cd198e3725bcd625121f494f8d12e98200520899917794b5943b355acf8993f00d1ede4282
+DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
 DIST serde_derive-1.0.100.crate 49848 BLAKE2B cb81b18d0fd5579918699d2a6284e1c9626cf78673fd29ae279329b0860f89c8e99a1ae84ba6574dc09925c98ac5bd934c969cd35e84bda4cb6d5cdca943a2b1 SHA512 f47e62d3f30b15acf0e5435c5df939bb6089c060bf91e891a7cc0f9e7bb8243c5500a145ec41e6aba7fd1f5fb571e552dbc95eb78633d7a47ed08ed35f0b0848
+DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
@@ -101,12 +110,19 @@ DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2a
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 DIST wasm-bindgen-0.2.50.crate 144511 BLAKE2B 7778d05717281b6c295260f6ec47898e0c565bb107d0c1f6f64f5de9e9208eecfa49cfd6c83eb3cd6eb6c698f5af74fe59ba3a86ec4f6d02439a55dcacfb4022 SHA512 d2c4ddc0d88864539b0f25511770edba61f54cd13a1f1a08c298dbb9433356a2617b24e3f0a1bd2e37eb418976c97ff11780df9ff809f566524462d965c35b53
+DIST wasm-bindgen-0.2.51.crate 147669 BLAKE2B c1221297c38e061da254cd2225d7788dee79c99c9303af3c25f867dd23693c6428ce1bc0c2a16f3843bebbd3f08df1ea43653a49cf069d9db8a50523eb19bbcb SHA512 d2f336335f61192da98750607b660a03d2e76c1808996a5a549b14205e76624f04f167bedb7fb0ccf371e49f1047688e5cb2289a92001d3b55caad3a8b6855d9
 DIST wasm-bindgen-backend-0.2.50.crate 21115 BLAKE2B 79f9322281636c6bec83c8c6aea5f4ceef360cc0b42ed28de667eb0b18f9b0772dd8f455df84933f43b5be0312cc03c02ebe8f11dc652a7aac3fccaa1d2e4cc7 SHA512 6e53da0259b5c3e167129ae67f8a45497973028af2f48d67964605f8924754a1c6ec6045fe0e3d30ab05902ea2962845a1944d3ed13ee4fc0fcdb6892dd35885
+DIST wasm-bindgen-backend-0.2.51.crate 21373 BLAKE2B 8641aea89deb10550b94a5e83e7b1d6309d3179c05b82f29536061f781dde9ac97449f892da06ddeac480426d9c18c1f4c322baff54dc1165a9f2ed8379a3ec1 SHA512 d0740d003e8dbb62494e6a12e41a7b10e0809877501d8a5f59979c797d08fe7ab57b172bc20ed9d2113ae57a2b1868ce923b68cc2413e1771fd8a4844eb58c06
 DIST wasm-bindgen-macro-0.2.50.crate 10849 BLAKE2B b59e71d7f7ce427a60d0c48a5921b4c00f0b97472a8e3c79f9f2a0a3801c02131d0f6b6a249100eeef0e0d6d8fe616511422e70256cd74ccc9edbbe666b36097 SHA512 1d1c273f520c997c6c1b6d86c08ac99c4e25e04da12a25a6efb87e1b8a887618b8435129d6774a7ec2accded5c87c3561285dd8063d28efe19f60052e6d167c6
+DIST wasm-bindgen-macro-0.2.51.crate 11421 BLAKE2B 8bbb0a21d101fdf04db7d0ef31be58a24189c8e5a37593b272213ac4275117aed0caee7736a98f6263634186123ace9c5fb84593fd15fcdf21a4eb6f5293f3c9 SHA512 672a772952773566687ad167bbaa580463d7695d3e040a416263974a4941475b02554e334de5bbeed1f6d3951b1f647728f83055f8bb744a4782f58f8fbb22df
 DIST wasm-bindgen-macro-support-0.2.50.crate 16461 BLAKE2B ae44dd17804d4c554b676d11136868958eed5b6d3dfe58a80fb113c7546e511d20b7cb8a92d53b0b3ff3fff02313d407f8d4e5089b558f0b936332c0a7a82436 SHA512 f855ad370334fc64ccba2d3d00ecff0dec2319ce644b337f60300d4f76c9d8323e2676dda52fdee3ef58e1d9f16ee378beccacb6b02cbda16c2d40f82526df91
+DIST wasm-bindgen-macro-support-0.2.51.crate 16476 BLAKE2B d726d89f063e01c2caeea38ff44d0f7584ebd92a37e139dd5720430a4be54774faec9a4edfecfbc2771adb4b1bbea37c11380c9d9a264663007ef204eb8abc67 SHA512 a53252f8276494a8d706c401e5a5a4b785749da91f7f171f1242268316de926f518e7e3d8c4f36f139e21e2ee3150a6e07ad416125d6f738aa5633f2337036df
 DIST wasm-bindgen-shared-0.2.50.crate 6727 BLAKE2B 9bd99d6f9441c748d1891c532bf42d60838919d3d100eae20b0be2cffc99bdd774a4172e106e121dbccb87130faa2c33e0c4598e43a6252647e63c1c490195ce SHA512 c1d327b1dcdb0abaf76f7121adff7e618691cc8efac5be3fe97e4375446003d9e0c41288288eb1b432e2bd49d1776be11b9cc4f675d42f78606456b711d4e877
+DIST wasm-bindgen-shared-0.2.51.crate 6721 BLAKE2B 651005f120d4d647c3a3db19bcc726ef0669577d2c072f6fe0cde64a7a94933ed51c7b9a5e4f87f41bfa6cc9b2d68e989345c71e4ce2ccbbb1869f0a1f179309 SHA512 29c36bcb531715457f1e2d4b017f505fbc81a685fa80c8137b3558f2448780357e93ca222c67214f32e248585888a58df3f3895b59246dbc59f47a7ddf7632e3
 DIST wasm-bindgen-webidl-0.2.50.crate 24182 BLAKE2B 276641836fc21b2a7513534867799527e56e158ed9f8678f0c8a370cb38fc2dc5eb023fc9aa04db5afae0e7c3f49e5031ab4650daac35dd543594ebc834e24f7 SHA512 a1af0dd9c31cdb8fc52ed55b6f27f1423218c5fa427d8b295b3989122fc3b01650f1c9174bc77f5b6883ad6e05ce6e90af0e1e40aeb236772cf782c63c2d6c20
+DIST wasm-bindgen-webidl-0.2.51.crate 24203 BLAKE2B 7b8f5cf4cc74f357e8c1193262f667551708fea51fed9b8fd38c3bce2ca0608c9af86f998d2a8716024a645c90c83b31dabb214f515783f332991da47710ae95 SHA512 b9dade093a8ed835aaa1be2ef5b989176887c57dccc4cc90cf9e608b54da489bb66bfa9fdaf4c9edc2df1ab2c71fb2018bdddcc502c52250d3d5a36ef354b554
 DIST web-sys-0.3.27.crate 204250 BLAKE2B 73a067c079b3b3c5cf858adf185016f8be9cf02559c18b62b2f24628366df769e5e71010277718dee6a479191d38bc2f97dc42128b1327434dbc9f6c78d869c6 SHA512 906a16b5642a515dbaf996b4b4b42b4fc93ec1c614651fed476fd62ba3296f8e4d111a5f1f86bc0d3d565174e6a9da3a8f9b0a3b2dff827501b03bc734653b26
+DIST web-sys-0.3.28.crate 204077 BLAKE2B b8e7eb716e0eb6b20d2cd994cfe708964923be61c1d71ed303ff3b7a8210dfcb58858f608d28249f33bc6fb03f97ab497143e40fb2665523907b78dd122a1a50 SHA512 c26acca4493e3521feaeb081aea53a1c9be248bc547f42dbac7ef98a108e765e150678c37888de92cb06d97f1102ac96a5faebbf32621f9bd2bb74f668faadc4
 DIST weedle-0.10.0.crate 34686 BLAKE2B 9592932b38543c700717dbc1ea2852acc4fc73cc9c6550e4abdec6d230c7e4a2e01663643222a5fe025767d83d0a802be74a9798fcb57083dd795b513a64ade2 SHA512 c7e5ca778af68d69284cc93556a67884adbc437aae32f85ef305bb9489a5181dd3b77ded68657c1d3a088386586ead4830707a8e6bc0c912c953e1a74ded49ad
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
@@ -116,6 +132,7 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+EBUILD quiche-0.1.0.ebuild 3416 BLAKE2B 3f8e6d6255a0f918e75c68aa7d236552d7265f292a3dfcb447c6f53662f2a9899cd016cf3841183196a45176e6cd8366c4c7468d4b758b22fb778967b43a3a05 SHA512 371ca431bdaac4aed1ff9916233132b50047bb69550bbf69d80512d70794d59912abb1e8e08395f1f9eb7390d8e6cf426d1e7635739347cec4fff4e29ad27b61
 EBUILD quiche-0.1.0_alpha4_p20190912.ebuild 3776 BLAKE2B 78ea083d45b9426a5920160e1faafa0cc0057c7dd1e6f6af5a166be875419eb11b7f2fd5a7884823a42a6c0c7e62863301d71bc40074782ac31de8e9678f5e11 SHA512 b918a7ad17decc581f18944007827b88fb524ddb5848f0cd6dbfc9c74334cc276578ddf29cd504c6108429d27e49c12f45558bf5d169ec66528a92df7ed31bca
 EBUILD quiche-9999.ebuild 3415 BLAKE2B 7e3e0cb674eb426272e8dfc52ebed7f10bba3ebe5d58e697f214a152abeba6dc2db6956fb9ce22f378caa65fce97c2bd8f0717784dc8986434054873e64fb7be SHA512 8f573254a6230e6fb22b32094efa2f59da06befb4f0a59e4d88ff94f6a4b1fd14b5f56e752e2bd77746826f957015004e5fc337fedbd74ef4b224ecf82e7cdd0
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-0.1.0.ebuild b/net-libs/quiche/quiche-0.1.0.ebuild
new file mode 100644
index 000000000000..8736c5d257b0
--- /dev/null
+++ b/net-libs/quiche/quiche-0.1.0.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.6
+arrayvec-0.4.11
+atty-0.2.13
+autocfg-0.1.6
+backtrace-0.3.38
+backtrace-sys-0.1.31
+bitflags-1.2.0
+bstr-0.2.8
+bumpalo-2.6.0
+byteorder-1.3.2
+cast-0.2.2
+cc-1.0.45
+cfg-if-0.1.10
+clap-2.33.0
+cmake-0.1.42
+criterion-0.3.0
+criterion-plot-0.4.0
+crossbeam-deque-0.7.1
+crossbeam-epoch-0.7.2
+crossbeam-queue-0.1.2
+crossbeam-utils-0.6.6
+csv-1.1.1
+csv-core-0.1.6
+docopt-1.1.0
+either-1.5.3
+env_logger-0.6.2
+failure-0.1.5
+failure_derive-0.1.5
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+getrandom-0.1.12
+heck-0.3.1
+humantime-1.3.0
+idna-0.1.5
+iovec-0.1.2
+itertools-0.8.0
+itoa-0.4.4
+js-sys-0.3.28
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+memoffset-0.5.1
+mio-0.6.19
+miow-0.2.1
+net2-0.2.33
+nodrop-0.1.13
+nom-4.2.3
+num-traits-0.2.8
+num_cpus-1.10.1
+percent-encoding-1.0.1
+proc-macro2-0.4.30
+proc-macro2-1.0.4
+quick-error-1.2.2
+quote-0.6.13
+quote-1.0.2
+rand_core-0.5.1
+rand_os-0.2.2
+rand_xoshiro-0.3.1
+rayon-1.2.0
+rayon-core-1.6.0
+regex-1.3.1
+regex-automata-0.1.8
+regex-syntax-0.6.12
+ring-0.16.9
+rustc-demangle-0.1.16
+rustc_version-0.2.3
+ryu-1.0.0
+same-file-1.0.5
+scopeguard-1.0.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_json-1.0.40
+slab-0.4.2
+smallvec-0.6.10
+sourcefile-0.1.4
+spin-0.5.2
+strsim-0.9.2
+syn-0.15.44
+syn-1.0.5
+synstructure-0.10.2
+termcolor-1.0.5
+textwrap-0.11.0
+thread_local-0.3.6
+tinytemplate-1.0.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-segmentation-1.3.0
+unicode-width-0.1.6
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+untrusted-0.7.0
+url-1.7.2
+version_check-0.1.5
+walkdir-2.2.9
+wasi-0.7.0
+wasm-bindgen-0.2.51
+wasm-bindgen-backend-0.2.51
+wasm-bindgen-macro-0.2.51
+wasm-bindgen-macro-support-0.2.51
+wasm-bindgen-shared-0.2.51
+wasm-bindgen-webidl-0.2.51
+web-sys-0.3.28
+weedle-0.10.0
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.2
+ws2_32-sys-0.2.1
+"
+
+inherit cargo multilib-minimal
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.35.0
+	dev-util/cmake
+	dev-lang/go
+"
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare(){
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile(){
+	cargo_src_compile --features pkg-config-meta
+}
+
+multilib_src_test(){
+	cargo_src_test
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so target/release/libquiche.so
+}
diff --git a/net-libs/roadrunner/Manifest b/net-libs/roadrunner/Manifest
deleted file mode 100644
index f33ce944b13b..000000000000
--- a/net-libs/roadrunner/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST roadrunner-0.9.1.tar.gz 338564 BLAKE2B b3e4cea85ed1e4e7834cf758bf4e54e51e7ec4399f5baf75c7ae797c5b0bd571a099acfff29bccc2942d3779247b642372a73efbcb04e7f511786ca22c5b1d3d SHA512 ca1f60ba5a1d844ea088699cfc0b35ac2cae202bfbf7b8846f2b59da3dca0aa9051cf4c7bd7a398ebbf8f3cdbc096faff4a5fc19feb6544576c4141800e90b4b
-EBUILD roadrunner-0.9.1.ebuild 836 BLAKE2B c21d4143274ba0ca2149e1a2e65f9f92eaa7f6e9242838f00618f70a46425c1d6ea6dce664ed37893d4784414dc51411e9e895fb5cc24c8655fc1595261ad6db SHA512 f0811a7a88e0369186cd9cc3da8a9968b8230cd5a181016c6085e9618414e4988ac630b85cf7e8e619acdd9a3b1d60d763943df33c929ea35fb6ae830001529e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/roadrunner/metadata.xml b/net-libs/roadrunner/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-libs/roadrunner/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/roadrunner/roadrunner-0.9.1.ebuild b/net-libs/roadrunner/roadrunner-0.9.1.ebuild
deleted file mode 100644
index 6273267219f2..000000000000
--- a/net-libs/roadrunner/roadrunner-0.9.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# EBuild details
-DESCRIPTION="RoadRunner library provides API for using Blocks Extensible Exchange Protocol"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" #was http://rr.codefactory.se
-# upstream Died
-SRC_URI="mirror://gentoo/roadrunner-${PV}.tar.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="ppc x86"
-
-# doc		= include documentation
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.2.1
-	>=dev-libs/libxml2-2.5.11"
-
-DEPEND="
-	>=dev-libs/glib-2.2.1
-	>=dev-libs/libxml2-2.5.11
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_compile() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# Seems that the Makefiles are OK
-	emake DESTDIR="${D}" install || die
-}
diff --git a/net-libs/rpc2/Manifest b/net-libs/rpc2/Manifest
index bf542beb7331..bbf1e47f6af4 100644
--- a/net-libs/rpc2/Manifest
+++ b/net-libs/rpc2/Manifest
@@ -1,7 +1,3 @@
-DIST rpc2-2.0.tar.gz 623373 BLAKE2B 4b0b1f43634224d3c6d0bac53b43c7b13b784d7f15f2dc98731073415e26316a2dad9e7ff1a694c0c3f5e0497fbe54e4833fb6da62f66b91d8ec96c41d8927f6 SHA512 36489147b29cc69b41a2c7df4044e9a1bcf3e7fa95b0443a9cb429b05493d083eb317feac06f9b026c021c1a654a537818bb23ab155254dd86ddab0f627d7b8d
-DIST rpc2-2.10.tar.gz 595825 BLAKE2B 499834ad86af5b8711a8dbcdb0e6aff88e5cbfca115ad31bf7b2bd224662542a70e83cf41703d6f95e2ef1f4935e0eef216f75e4a76762238015e39ea4d8c364 SHA512 45d67a1eab7938c120a933aaa1c938d569fabe5d4e90f190c327d48a75de17a324f0717eeed05ae2874db59dd45d4dd604d3df61209807aed6ae357317e4b0bb
 DIST rpc2-2.14.tar.gz 628236 BLAKE2B 7956bc218fbdf0d14390c7d7090f14dbc813edd1ea45e105bb75c99cebd4acef17e91db979390835449f9a67c4a5b2e5dd01150049f9fb64daa8d32dc65f673b SHA512 7d80a9d2c69469526fa31e0c0a3f0eee20e2662d1ee03eaa3a642d48f152f611f5e219a4d730a94d49b65b77e67eeefb179bc160c0cf7a9d0e7e31f8d7f882c5
-EBUILD rpc2-2.0.ebuild 597 BLAKE2B a5da401dbb6ffe0b6ccfe722b88db89937b9b637a3810c223465ac39323025118ca4ea241de5c498ff70f2ca3a4c2c9e12dcd8d350473d6891e39e210bc1d377 SHA512 d830a8ef1cab5a777fcd7d8b7c23f0dbf851ddc0d17f2c4fd35058b3e2b90542370cc15e36bf4cf5148833acb3c57a88f4556d157212d75646cfd87678475397
-EBUILD rpc2-2.10.ebuild 613 BLAKE2B be20c734c16ed427ede30c52a9c2316d666649013a40af7c9e1089051b7ac1826cb188d7f0eb35d9ff4f327608bc16a8f2742783ce044c844a18dadb6e2171c6 SHA512 6f69ec0b248b28af25280f5db4fe909159156e3c059b332a78286eb08b79f8eaba86dad9260f655bd02ff01f7224a78e3f6415613c9be56f250d54cd10309113
-EBUILD rpc2-2.14.ebuild 611 BLAKE2B cebbeec716f6a50c69a6a866211b2292e87716ab148025e2cce88f1c864718893b215afb95891621517b504989ee0aa48abc51e9641136dfe7d5de9ad6ed2fa7 SHA512 827d0826ab26aed9f828f2f521d5f27003bf02361744c00a9d34339daca7ba0471573f5371506867613de23ae394a9aa76fbeb3fea45ce6f3743d4dca16f38d9
+EBUILD rpc2-2.14.ebuild 606 BLAKE2B 319adc9d5eac638face82f1e683a7e8c742cf0a4455e9f3e6de542022a94b6660f2f071e1d8ac00fba7b98c8558cc10b2e1bf93a99263f7aa5d75e41d2eeefe8 SHA512 19ff4a64ccaf062ce5fdcf80efe9152a550b8bf99aba539368be57edf4bb6f7361604f2fe887a46373fa0bd35efa3a71337d52514f43ab089bb46820093e61ee
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/rpc2/rpc2-2.0.ebuild b/net-libs/rpc2/rpc2-2.0.ebuild
deleted file mode 100644
index 278b0a039fe2..000000000000
--- a/net-libs/rpc2/rpc2-2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)"
-HOMEPAGE="http://www.coda.cs.cmu.edu/"
-SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz"
-IUSE=""
-SLOT="1"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
-
-RDEPEND=">=sys-libs/lwp-2.1"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/sed
-	sys-apps/grep
-	sys-devel/libtool"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc NEWS README.ipv6
-}
diff --git a/net-libs/rpc2/rpc2-2.10.ebuild b/net-libs/rpc2/rpc2-2.10.ebuild
deleted file mode 100644
index 3621e22d98f2..000000000000
--- a/net-libs/rpc2/rpc2-2.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)"
-HOMEPAGE="http://www.coda.cs.cmu.edu/"
-SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/lwp-2.5"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc README.ipv6
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/rpc2/rpc2-2.14.ebuild b/net-libs/rpc2/rpc2-2.14.ebuild
index baa5a0fa5694..841c66c72d47 100644
--- a/net-libs/rpc2/rpc2-2.14.ebuild
+++ b/net-libs/rpc2/rpc2-2.14.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
@@ -9,7 +9,7 @@ SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/lwp-2.5"
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index a99b8ead8274..b5bd6c00855c 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,7 +1,4 @@
-AUX rpcsvc-proto-1.3.1-old-preprocessor.patch 1018 BLAKE2B c65052ebb526976482c591aaba127d01e5369ffc1b89e6a7dec13d22af97718bf768a75870039f5eaabd1153f50d8b01b56489685ff9c55523746029b1b1358e SHA512 14ee7b2ff5e8e981b6a93f63bf01473b326c40977bb181b7a8ae8549ae7967b4cb7ef20beeac741370af77cbbbc8ee2960487b9f962f764e931269141760de58
-DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
 EBUILD rpcsvc-proto-0.ebuild 481 BLAKE2B 4e507a8892c32f17d0852603b2828ca6b69621fc2686db96016b81f1112d1fd38ef6b83798800710fea95cc2bed21b95957c72c83dbbc2397a724c9907891d6d SHA512 9ca5e01d4aeb44b676f958b895a5bdb754ba88b2db19f4c8522408e073e1c901297c135391e1fd94368e9b1c87671e84523715458c98567d60ff3b037eca4cc5
-EBUILD rpcsvc-proto-1.3.1-r1.ebuild 688 BLAKE2B f86e886eb61a421f74c8373e41ee46a03cc8d92a5616d95cd463df808ea959b2af5e5c67894bce1386d129aaf0606bc1cdd4cf146762ebfb7184ed3bf0272170 SHA512 5a8fab744c86854f0924fb0532bd4c4cb023b83d128572ea440048923c213a5ca6f15df74dbb0537e81b157b6f57d60fba148cc7fd4d38c7df4f5bacbb880cd5
 EBUILD rpcsvc-proto-1.4.ebuild 636 BLAKE2B 7ab5930b37236fe1ea6a68e2388e8cb29537be09f27810213b185686ddd0dba9103cb846155d84fa3a26354ea30bfa302dd3aec98d5a8eb0d045f9696af41310 SHA512 9d14f4183f64d416cc68f8051ab76542330efdc076311eb6000f9382181c1ea888c28698914d7823f069b9eaeac21d2ea13441e4fe83ae1d7a51304466959d68
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch b/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch
deleted file mode 100644
index 5d77786a7129..000000000000
--- a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ce0ed4f45918f9230db435ee3b733090fa4f9620 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Tue, 27 Mar 2018 12:08:30 +0200
-Subject: [PATCH] Remove historic _RPC_THREAD_SAFE_ preprocessor conditional
-
-When the code was imported from glibc, the -D_RPC_THREAD_SAFE_
-build flag was missed.
----
- rpcgen/rpc_main.c | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c
-index 94bd818..1b26e52 100644
---- a/rpcgen/rpc_main.c
-+++ b/rpcgen/rpc_main.c
-@@ -1346,15 +1346,6 @@ parseargs (int argc, const char *argv[], struct commandline *cmd)
-   cmd->Scflag = flag['C'];
-   cmd->makefileflag = flag['M'];
- 
--#ifndef _RPC_THREAD_SAFE_
--  if (mtflag || newstyle)
--    {
--      /* glibc doesn't support these flags.  */
--      f_print (stderr,
--	       _("This implementation doesn't support newstyle or MT-safe code!\n"));
--      return (0);
--    }
--#endif
-   if (tirpcflag)
-     {
-       pmflag = inetdflag ? 0 : 1;    /* pmflag or inetdflag is always TRUE */
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
deleted file mode 100644
index 8a8003bcc44e..000000000000
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="rpcsvc protocol definitions from glibc"
-HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="!<sys-libs/glibc-2.26"
-
-src_prepare(){
-	default
-	eapply "${FILESDIR}"/${P}-old-preprocessor.patch #650852
-	eautoreconf
-}
-
-src_install(){
-	default
-
-	# provided by sys-fs/quota[rpc]
-	rm "${ED%/}"/usr/include/rpcsvc/rquota.{x,h} || die
-}
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 2a032f979523..8700b1481b27 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -5,7 +5,7 @@ AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de
 AUX serf-1.3.8-tests.patch 3159 BLAKE2B 96cd539541f8ca59dd5693bed44854d2aa626cdecaf89e754e8123166559f8e6518f3cde372a42f6d0455302d53dba6a55e51fd44734e1984730f34a090969a3 SHA512 d2b89743e38492a0626b509864c34a3747d73b5aeb7a22df84ce739588663582eea3b6c3d599b8e42896b1720c529e19c5497ff4e830e67981f0664b5e6c533d
 DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.8-r1.ebuild 2125 BLAKE2B f8276c9af00f571b33933b2a6b2676694c8dfa7fdd1f465c3171997936468094a793ac747e419457addca1dd358983dcff2155cc72bfbb577d1c8f8b88eb85c1 SHA512 4db061cb8b0d4af9555eaef6ca6be13b2a731091974086cde09cd6f36b537047265fd56bff4cd46b1739915160a7705bca6e391045c5bc81628f3fe08b90d406
-EBUILD serf-1.3.8.ebuild 1512 BLAKE2B 79480348f4734e32d06e40f9ab7cdda4f464d9226b254d8f31a28f3468cef4af56f12c64e881b9bdc6b3aad0d926155706801729ad3645d70fad034fb33aba4d SHA512 92109ce007871baf0e52a100d8b88df475413b88e900beabb3598905ae41e8a4b8881ecebcd8788954a031c6c2c73742a43b4647aae46a713a0568083d4273a4
-EBUILD serf-1.3.9.ebuild 2127 BLAKE2B 419bc569c5160f8406ac098b959238a47230d0bf762f7644e420168dd6b252e835616a88598573e66e144747bea5923e5c5e49892a2644aab90bfe22939bce4b SHA512 23ba5aa3fbb59ce5b3140a1a281c3868dbf378c1dc93555ffa5634267ca89c9b0a1109aa8240fcca25ad6ae2178d00db7f4e41db7f9e4405429a6ad359e3e4cf
+EBUILD serf-1.3.8-r1.ebuild 2103 BLAKE2B c9c928af25deb62750762a126298839a43d3ebe1476448e068275fa74151975c47b077f6c2def47a452d1649a439f4feb71096b7460b9b38c5562874473ff168 SHA512 1d14932bae9d1cb24370838a6056e847c658ba33c129dae1cbc8168bca6ff7ffbb1ec8136ffdcab7eecf5afca63545d27dec0b757bdc64597c71a830470c2612
+EBUILD serf-1.3.8.ebuild 1490 BLAKE2B 5415619701d339b0eac2ff6c61c34e6a06dd02167f3f5b9ce217433f7d75ab1362ec2161bcdb7728a74b3334c4f265b228ee384d71b6fb719db0f1c0c7022e4d SHA512 d04cf838e7530417cbfc5cbf4ede46a9fa511d5057b7c4b0ccb303eb9ad0f37f02ad8b71950fce002ee9c45a83878d46595c99e4f517d40c874311ea3ddd0b97
+EBUILD serf-1.3.9.ebuild 2105 BLAKE2B a9ea4101ac14929db52d07c739bf5f4800cad86165134e8455855d90de791fac22830dc9c60ef12569a8dbfbcbaf54bb0537e54af6467dcc7b4f815a9dc776bc SHA512 f0d959741a6657632b55038417351d3f51e4c6d38cb1911d3eb3618ee01843e2627d6d03b7d6d80e8d97d89654826a3a312d34c3b9bf0cb703be7dfbe946be21
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index 4b6c23a4a040..80540344298f 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
index b0d5faed2f3f..1f89a3bdc64f 100644
--- a/net-libs/serf/serf-1.3.8.ebuild
+++ b/net-libs/serf/serf-1.3.8.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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="kerberos"
 RESTRICT="test"
 
diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index 32cf476c801f..631439a23f7f 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index f1e4e68e497b..b71e7ed2cead 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,5 +1,5 @@
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
-EBUILD srt-1.3.2.ebuild 1212 BLAKE2B 48b3642928d55c296ec7d874a932f3d966e447d05c06f5be4f2e25facc1d0c8f57f125abf044b59c9aa1bc269eb69588f222e8bf9ff7b95bcd7f5a5c9b2ab9cf SHA512 775c84e4611618ef0fff1edaec95d2da9cc85ba1f06a094421c797bf54419be35b0b0f56f3f4c659a19c1ed7a8c2edfc3e3744ee07539b91746d06dee5b058c3
-EBUILD srt-9999.ebuild 1314 BLAKE2B 190493cd65e60dfb2131cd64910dde9b4d62b10aca1dba5143dd1a34d5f353c22b89b9cfaaae03a3cf3b8f27ed31304aa10533f9c062d396a57be7943e3bd138 SHA512 4c7857ebec342fab43372b5baf7af31455a6a82addff0b5bdaba4df78f733abbaa75f4da5d263313962db51464ab496aca797d00a500bf1f8b0400c9dea1c596
+EBUILD srt-1.3.2.ebuild 1247 BLAKE2B 675103c16054fbabfb3481a5dc9b205f9db7ac28080a52fdcfeda7d2a21ec6a5752ad0d6131b4b2736d29f8d9f2c989f506814a206f99fc7896641b1fb31a915 SHA512 35279b41b08407c2c55f15e5ac4d44d6a4b0065a63d8cb93ae1123f9f7ded7c4ef9f09a88495d996fb3fe0c721c672ca00023a7f5bba6ad996be5e6a144de78e
+EBUILD srt-9999.ebuild 1349 BLAKE2B 73c3530ff5de95c6eae098377bd1ae88b791f157c441363966e5a98b45b14aee2db1334feb94e7fc3029a1a935e564b8ad33fefe80b0c0aac537b61a78119f06 SHA512 81859b511dadbd45ed92c8fad001e70b39f80533eadbed1024627154da885d4abd1ee9ee031ed85f30786d8e322dbb864ddf90eaed642b74a9ed82407cc5f695
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index 998bdd69626e..e1a8cecd0f14 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"
@@ -21,7 +21,10 @@ SLOT="0"
 IUSE="gnutls libressl"
 
 DEPEND="
-	gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	gnutls? (
+		dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+	)
 	!gnutls? (
 		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
index 436354c1ae7e..f5e557bab10e 100644
--- a/net-libs/srt/srt-9999.ebuild
+++ b/net-libs/srt/srt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"
@@ -21,7 +21,10 @@ SLOT="0"
 IUSE="gnutls libressl test"
 
 RDEPEND="
-	gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	gnutls? (
+		dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+	)
 	!gnutls? (
 		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index 191aa59bab47..a07c621245f6 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 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
+EBUILD stem-1.5.4.ebuild 1256 BLAKE2B 6de39bb871cfb8eafe22f76c316866c4f94a73c10c04f78b943ac6215d4b9c2306f5c1a3fdbaebab6fe7dfc7c204a191b0bf0a4435f9d4395cbf36177fe93768 SHA512 d458942576eeb66bdc8a30d7d86ed94923be0856aa567c9828d46cf1a0e939d24430ee1f7f35c08511423888ded97b499a002fa638e454e02a07e6a0f98068e9
+EBUILD stem-1.6.0.ebuild 1256 BLAKE2B 6de39bb871cfb8eafe22f76c316866c4f94a73c10c04f78b943ac6215d4b9c2306f5c1a3fdbaebab6fe7dfc7c204a191b0bf0a4435f9d4395cbf36177fe93768 SHA512 d458942576eeb66bdc8a30d7d86ed94923be0856aa567c9828d46cf1a0e939d24430ee1f7f35c08511423888ded97b499a002fa638e454e02a07e6a0f98068e9
+EBUILD stem-1.7.0.ebuild 1355 BLAKE2B 1e4f64b6dd3303a691a5056cdef819fd0fa826dde78e725d59433fcd70061d11b85fff60517b22ec476eaac488308b47a52f7db5d3c48deb0a5bfa35ad35f1a4 SHA512 de9416b177b784fd47659760362a75a0e8bdb2d80c1a71b4e0678b4d7cc681cf6372cc5325acb1b691b79c317cd737218d79d95fd9da1ed5b45236a605e4e21a
+EBUILD stem-1.7.1.ebuild 1355 BLAKE2B 1e4f64b6dd3303a691a5056cdef819fd0fa826dde78e725d59433fcd70061d11b85fff60517b22ec476eaac488308b47a52f7db5d3c48deb0a5bfa35ad35f1a4 SHA512 de9416b177b784fd47659760362a75a0e8bdb2d80c1a71b4e0678b4d7cc681cf6372cc5325acb1b691b79c317cd737218d79d95fd9da1ed5b45236a605e4e21a
 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 5387c107ba22..712f914398cd 100644
--- a/net-libs/stem/stem-1.5.4.ebuild
+++ b/net-libs/stem/stem-1.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
diff --git a/net-libs/stem/stem-1.6.0.ebuild b/net-libs/stem/stem-1.6.0.ebuild
index 5387c107ba22..712f914398cd 100644
--- a/net-libs/stem/stem-1.6.0.ebuild
+++ b/net-libs/stem/stem-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
diff --git a/net-libs/stem/stem-1.7.0.ebuild b/net-libs/stem/stem-1.7.0.ebuild
index 5e021eb49a68..8c048a3057d0 100644
--- a/net-libs/stem/stem-1.7.0.ebuild
+++ b/net-libs/stem/stem-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
diff --git a/net-libs/stem/stem-1.7.1.ebuild b/net-libs/stem/stem-1.7.1.ebuild
index 5e021eb49a68..8c048a3057d0 100644
--- a/net-libs/stem/stem-1.7.1.ebuild
+++ b/net-libs/stem/stem-1.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 06bf0bbf5fbb..406b3fd1fb2e 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,4 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
-EBUILD telepathy-glib-0.24.1.ebuild 1539 BLAKE2B 086d1bde9c8cb6a35b79ad12762555d1ec2a4f5ae25ffc170bcceb5f0c21529878d28451de73a5d4266bfccefc5f2449681403e59c66dc4f191992021cd57afe SHA512 fd1493bd6ae89af799937a77931f48270a8188112fa2f145c35c887b2dee20d7121d5419cf8aeb2def87065827882b686ec34d6538987ba89f5675dda3f78779
+EBUILD telepathy-glib-0.24.1-r1.ebuild 1502 BLAKE2B 34436cbe92504b4988f1ea7295a1e3970f932f295912e744889611a14e967dd2c4557e1ec46739e58c5ed7e9eabb65551f5d7fcf81412c43f144c59c5b49a68a SHA512 2dfb9d920b92acfc1100177a43114158a39ccb54e391db71ab6fee8bc975b3533745c2778b9517007c941ecc3efd6f115b7eebca8d3bc34926813dfa6c40907d
+EBUILD telepathy-glib-0.24.1.ebuild 1529 BLAKE2B d600e8e085f9708c3837776a09c43ace1558b90eacc07a5594cd2ebc16d7b499dad761e2efd382bceeb6e491fa2c21f7790701ac470476084121b4b036b54be2 SHA512 92f11d3981cc2d8a9744865c5ae4e69ba9f8100d1ee9bb3364a4a498cd44dcc3de6e1c401898861e3fc8e3833ddbf88821ad84ce4055d5e97275cece5b80642e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
new file mode 100644
index 000000000000..758e5eceb488
--- /dev/null
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="debug +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# Broken for a long time and upstream doesn't care
+# https://bugs.freedesktop.org/show_bug.cgi?id=63212
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/dbus-glib-0.90
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# See bug 504744 for reference
+PDEPEND="
+	net-im/telepathy-mission-control
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-installed-tests \
+		$(use_enable debug backtrace) \
+		$(use_enable debug debug-cache) \
+		$(use_enable introspection) \
+		$(use_enable vala vala-bindings)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	# Needs dbus for tests (auto-launched)
+	virtx emake -j1 check
+}
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
index ef22c6ee2bec..3469dd10c54f 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="debug +introspection +vala"
 REQUIRED_USE="
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index b61afee6018f..364851b77b47 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -6,6 +6,6 @@ DIST c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c324
 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-r1.ebuild 3128 BLAKE2B a5a0e3a4ec5171fb513a6567916e84a20ec2400ae4a83e97ada018e048b92e03d1874b5accf278dcecf303eae80a917e0d21514a49c6b262e3662f17f0094a9c SHA512 be7033b60e01d5ff19e9465ad2662822a94b97caecf24bd3babd0aa769eec4c7eff67fb62a11d0887b82b5d84d3ccf8e3e8357ff83005ff79637d2c349cbef27
-EBUILD tox-0.2.9.ebuild 2698 BLAKE2B 6ca306040efe329b02f083a143f45253f08d1e9580b7dcde040b227927a0a03353e31233cd947e52176423ae951eb81b0a0e3f6f0cb11d3fcbd9162db0e65f70 SHA512 d0f6f23e05d9fe3a291f45d01cc294ab6255f5af958ef8e88d50c66b6615a8d9585648c8b312d0d5e341411fede14181b2fb0c4832d6876d5ef71d0ff71d5504
+EBUILD tox-0.2.9.ebuild 2695 BLAKE2B d377d87f4e678929521072e5aba6652b11bfe8722dea5a9d6d2c57a81a8519f76f6d7e1f138049de3adab94db04cfee82ba5d493c509f456eb3f6957201a6dd3 SHA512 7f114ea6bcab068aa456212765ee3a3b573a1607482aa60fa149a1c0af3c250ec4a8351a622e05f151fad5d78b4ada1e8cc300a5135e63b112603afc4d187718
 EBUILD tox-9999.ebuild 1803 BLAKE2B 68f3351d491a75643265226fc47e90d23e44cc66f772fe859cff87fcd6b88ced56ffead16ebef992701d023bcd97edd7be45b4075ec72b5afd37b91488b22d01 SHA512 f5dc655a65c4f5f6566008367208d71e017889136e02ad0f023b5a065e3b719c447c9918a3673ce6e9b4c8b0cffdcf7e81b0ca6f701f97b21f3ac04b340ba083
 MISC metadata.xml 935 BLAKE2B 27a67342b8cc389cc89a3640589c158ece6be9b25ff2550f063bdcc4d0ded3e39f50ed6ea261e3fb627434a00a4d1e1454797f61fda050ad6c38cc4aa0453ed4 SHA512 24effa76d3f6b31308cb2c18e3f618d4a3392c88bb63b55df65ce7ac9dcacd5ed269b126ffb1af29e0f83bd631d6cc96e14a0343fde709693ebe9d301de9b279
diff --git a/net-libs/tox/tox-0.2.9.ebuild b/net-libs/tox/tox-0.2.9.ebuild
index 046b33fd197a..c026338dbbfc 100644
--- a/net-libs/tox/tox-0.2.9.ebuild
+++ b/net-libs/tox/tox-0.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-libs/udns/Manifest b/net-libs/udns/Manifest
index 575a2b5cf76d..b015cd51f150 100644
--- a/net-libs/udns/Manifest
+++ b/net-libs/udns/Manifest
@@ -1,3 +1,3 @@
 DIST udns-0.4.tar.gz 84716 BLAKE2B df41b325ae2ffaaaf09e1bb6f52d9e9a7c468c70d8bec849cb90ebcb1fac773ee2dc7e37125a75750b61a1a78d0416e6c9aeb72e43780b474d36e370a1b9cd8d SHA512 2990d57b3b6bf176a12ee07fd4391921e13634fc8409e8ce4df8dbe7b3556a116ae59ab328a1b6a95ebc94298f6b56ec7197a06a649d8d642b371b8ecef3e40b
-EBUILD udns-0.4.ebuild 1071 BLAKE2B 20b900b982901fa1e818700d5760c335fcc2aabf4b324b60e296dd80f40329ed8aeb14670f5ddae42bd316a499a874b5f9fdab006de869309a03eaba668839d6 SHA512 94a2a9f396392cd6d624e670b80a86336d40359e3f71a1e148ee836885d4ab2741da262c8bd34dd812eb65bf00921afabc90a5121c9533138cdce3cd5de8f7b5
+EBUILD udns-0.4.ebuild 1061 BLAKE2B a9b22b19fce5bda505da153d26ec15bc2a94a057c16002f65773d272d763132a17c29f066d02009322ad37e335b5564caa6445a653c55b97bff36d8572e724e2 SHA512 13ef0e82fd344454d8430c07d6e48aba252a552a8218e8d7f005b22f64e319ef13dab34a6c21170c120dd11d6f0a6b832dbd263efe50ecb9f5539b839fc45ae9
 MISC metadata.xml 401 BLAKE2B 4a02ce216fb82441c4add303cba714bc621299b1fdd944203297925e9464751e683cb64fc2f7ead3df8de41da6b6cccc5e6fb884820fba841320e486a91ed950 SHA512 dea311676ce60848f158807241d561e062fb5b51a37137b732af1014d9ea702e57870c3125067ce90795bf97b1d3a2da8cad242fb4cc4e210ae7509b7f3362dc
diff --git a/net-libs/udns/udns-0.4.ebuild b/net-libs/udns/udns-0.4.ebuild
index 4702098a5cba..f19b2595dc0b 100644
--- a/net-libs/udns/udns-0.4.ebuild
+++ b/net-libs/udns/udns-0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.corpit.ru/mjt/udns/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="ipv6 static +tools"
 
 # Yes, this doesn't depend on any other library beside "system" set
diff --git a/net-libs/vanessa-mcast/Manifest b/net-libs/vanessa-mcast/Manifest
deleted file mode 100644
index 811985bd9f3d..000000000000
--- a/net-libs/vanessa-mcast/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vanessa_mcast-1.0.0.tar.gz 292643 BLAKE2B 90428c33e77621871f64a1b18b9387b117d6f6f60e0d6bc4e5c54d679bfc242e9de9e60227570d34a53e09ae56e987c7d66db875a94a26d75bf792ca05bf67fb SHA512 594b1c02368b2e90f8a31a53bc03ab1d16fde010094ddde6790802d0c444c3455de6a633fd5c9265d583548cd213ebd992d45cf578fe55cec710eba318a28f23
-EBUILD vanessa-mcast-1.0.0.ebuild 568 BLAKE2B d386456a856c89418892ae7df7cd20427f543d45e5f8ca8ea66e3b0750d1c70f2f57feea9ce20d04ea8d4e1321c9162a75eea366b57645d22697dd0b5beca556 SHA512 f6e67ca7b0971e4f9e871d175c83121351bbb3855816af14c7f8af95f66a9d1fadd59d155beb10d86a01ce6ba56489893377ce4504c9ab3c544b6a9a68205ad6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/vanessa-mcast/metadata.xml b/net-libs/vanessa-mcast/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-libs/vanessa-mcast/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/vanessa-mcast/vanessa-mcast-1.0.0.ebuild b/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild
deleted file mode 100644
index af1d1c54d277..000000000000
--- a/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Multicast Helper Library"
-HOMEPAGE="http://horms.net/projects/vanessa/"
-SRC_URI="http://horms.net/projects/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/vanessa-logger-0.0.6
-	>=net-libs/vanessa-socket-0.0.7"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README NEWS AUTHORS TODO INSTALL
-}
diff --git a/net-libs/vanessa-socket/Manifest b/net-libs/vanessa-socket/Manifest
deleted file mode 100644
index 6954aec602f4..000000000000
--- a/net-libs/vanessa-socket/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vanessa_socket-0.0.12.tar.gz 346375 BLAKE2B d07054d0fb3477e5d1783d7dfba5b1124977cf5a85cdb3ddced708c485a438ccdae7ae6df0b39f1edf256c3caeea3c4a4a96fabaa0e6404b74ebbd1cc6d2232d SHA512 24767cd77b6017156eb82df6c76b364bcc379d043562528d389b994497bbc041d29aaf72fc94bb877e7df19f196f8cce8879e203ac679570a92ff0782bef2d42
-DIST vanessa_socket-0.0.13.tar.gz 384431 BLAKE2B 46a66f4fee72118717e7242febc3d32837bfea475b2f2034c795302ea6db8afa27d4d4b11d626b168315a3e990ae65cffb07bff2e44af230902af9a69f1a1631 SHA512 c25ddabb3ead8e88fc924277ed1aac3a932f35f31974ee6340310cb8c6dabbe9ab163ebe475c9eb7b2dc66f79a07b1c70e00b228f57ba2b06bce87e5e0e3ac65
-EBUILD vanessa-socket-0.0.12.ebuild 665 BLAKE2B decd949980b53837d963fb81cd44365832e5c178038732d60f1238283460bf47b512271917add595272c078dc78504b595ce25e501b3b0603dee3c08076a44c5 SHA512 16692aeacb0bc5dab71f15e62e589ba09cf6e92598548cb395164c55f5aa7da3dc2f2bcd2710ca5b4350565f3e860d5c21088af7b3162b5c5b1b1ac9819149d0
-EBUILD vanessa-socket-0.0.13.ebuild 583 BLAKE2B 7340f6cd76e4eab8dc8904435e74509b1f77b1708b8684900ec1c941395a282ec1fd2313ef9cf8ddcd9cbc2cfd4bb1a8a28c85d9f9d58f1332ee0dfc9a698354 SHA512 ee58e2451c0d901bf9a219a99fd4c37d5be86d9ec2e1c4765067082b5a3666b01ad620857e6da8fbcbc481945f1d07fd8febf49cd466df64c23326adc394db7b
-MISC metadata.xml 289 BLAKE2B ece359bbc1cd696797428b31c61c58e5d63559ec8bfb734e3869421e1ddccbebe109c854225c924ba71d0321cea7ef3a63b1dee3d56b728a4d53bfd34eca8e37 SHA512 eb4947560bda57063dd746f397daafccc5d30e8aa694d75419a2dd4da56461fd6c82274c13e1ac01f8bad0d742c00f4116c20ceefe50f383988c9d12be27c90c
diff --git a/net-libs/vanessa-socket/metadata.xml b/net-libs/vanessa-socket/metadata.xml
deleted file mode 100644
index a7029b1a1086..000000000000
--- a/net-libs/vanessa-socket/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <maintainer type="person">
-                <email>patrick@gentoo.org</email>
-                <name>Patrick Lauer</name>
-        </maintainer>
-</pkgmetadata>
diff --git a/net-libs/vanessa-socket/vanessa-socket-0.0.12.ebuild b/net-libs/vanessa-socket/vanessa-socket-0.0.12.ebuild
deleted file mode 100644
index b3d41773bcc9..000000000000
--- a/net-libs/vanessa-socket/vanessa-socket-0.0.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Simplifies TCP/IP socket operations"
-HOMEPAGE="http://horms.net/projects/vanessa/"
-SRC_URI="http://horms.net/projects/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/vanessa-logger-0.0.6"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf || die "error configure"
-	emake || die "error compiling"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "error installing"
-	dodoc README NEWS AUTHORS TODO
-}
diff --git a/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild b/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild
deleted file mode 100644
index e393e77c63ec..000000000000
--- a/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Simplifies TCP/IP socket operations"
-HOMEPAGE="http://horms.net/projects/vanessa/"
-SRC_URI="http://horms.net/projects/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/vanessa-logger-0.0.6"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	make DESTDIR="${D}" install || die "error installing"
-	dodoc README NEWS AUTHORS TODO
-}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c56c6c3d3be5..59b134aa714d 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
-EBUILD webkit-gtk-2.24.4.ebuild 8333 BLAKE2B a99c45d4923a31f68acdbbe60bcdd374cc2388d151766c2466db58805e0e90662190bd97b771da3b72b51020dc2e6739dd183cdd9535267f37e13a5a23184a71 SHA512 61aff64d782c5713ebea6d16f18a1d8d6e39759adc245c0cb215e47b8ae264c32dfbd1dde687413433205c152a6843b4c5cd4ecd7438f357dbde7055942e9f53
+EBUILD webkit-gtk-2.24.4.ebuild 8321 BLAKE2B d3263ffbd469097ce1e7df535b814c0e1b4b66bb6b26b816223a54da92d4ba064c4bb01bd4daca76d25f6250e84475364da555fb2a3cee96b610313794d0316b SHA512 370f62eb690ebc54a78924482468b98ee8ac28ce04183637f1ed5f1904cc1b60e6e9769477bffb19ff5fc08e7fbedec2a8e4b14b47abddcf24129db8d9b58777
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index c8444e26f612..f8ed8e6fec93 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ 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-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 42c06088b025..ef60a16445da 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -12,9 +12,9 @@ AUX wvstreams-99999-soname.patch 273 BLAKE2B ef364e25848b4727a0e8b75f155ac2807f1
 DIST wvstreams-4.6.1.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
 DIST wvstreams_4.6.1-14.debian.tar.xz 21124 BLAKE2B 2af6ec180c3130dd7def733e5ea569fd0a81cd2c2411daca25e6042dcbe78792bafc4b13f1c1fffddb6cd66273f11c62f54b415c975cbea0af052b18ff0955d1 SHA512 93ea7c4fbab542bd552d6e91ae0c49a27ad8aded177ae6474943acb08d204ab31eac49b3f416b4d90a38ea697f3641c09651a64f9c40d12543d454aadf2ad9e4
 DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
-EBUILD wvstreams-4.6.1-r3.ebuild 2404 BLAKE2B fb696df3dbda56527f29646f03d3f4cfd7507b9af6d08b50771fff15770c35e96bdb19e61b3651abd72f63beb17096216a85b10fd01ef7306ca082406e8e6c68 SHA512 f4a95c3d74d79315e297a78c99ab2fca17b953c2b2b0f62934ed1de78b3ef98aba423057033eee1936717ff32f469b404875944f81b8e6f723f8cd701990ace9
-EBUILD wvstreams-4.6.1-r4.ebuild 2038 BLAKE2B dc58084533c0dd159f6cece9f3e71a0fd986ea9ea79b5042f597f323f34787f2084b1f823cfa014f820c65317b3d27ffa0da7cf138caac68a4c229282d2e5d82 SHA512 b2a9ead8d0b3bb82b8b7dc2f08c51994ba43abae7cda7177ee700d1410652f46f07a8464dacefa8356fb2a97b9d23de005f070fc94b82a14ace273d3061101f2
-EBUILD wvstreams-4.6.1-r5.ebuild 2112 BLAKE2B a48edb2558858a642096d3d5ca9026556d96983d509a4c5cf1d13fee70780354c5b268583c720aaf76f41d3cef73d406fb76b44fd798f9cd075305f527fcb352 SHA512 343a767d872bb15a883444b531461860f57b367478065b6bf190d2db1dffe7576d2e9e63a76a7ff1b66cc7e44c764692e0fe731a895bf937602ef9dc38866d20
-EBUILD wvstreams-4.6.1_p14-r1.ebuild 2192 BLAKE2B ee62497b120f33efe48cab6eca998c142d32db0eafdb86413c72e8352d4d3f706dd84e8d78cd31b90a34f32fe5064266172011bc62433f0014aca0e950796750 SHA512 cb0fefeb8deb030026190dd35ddba28217cd5553b8c0c821f5c138c2ad6bb384bbd08a5648fa63567c7c174a60647ee45c86895d021588db1bd6695d8db913e0
-EBUILD wvstreams-99999.ebuild 1967 BLAKE2B c6b1ef94c65245dc9c5cf3937b957a552411c6d7b2eb374526b890257f1bd803e0b3055345996f40b233f48dc444a515aaba5b86f923ec43aec44e896374878a SHA512 bf142a212c96d94795fff5da6e7516f8f4ed24169711a36ecfb51adce5cc9a312f0c14abb17e83a42683fb94126f14f5693a2e4e5b7f25d5fd83040acde5ed0d
+EBUILD wvstreams-4.6.1-r3.ebuild 2402 BLAKE2B 11f5dc37d031861bda2deb3dc218b8d67a6bedb6bf8b16d35f1d55629e41ff9442bc84194f26702bc9e04f9a3bab49aaf1dea0c2ebf46609dbf4f85e19b9ab5f SHA512 3d2ef93469dcefac2389f9f0cf6db5fa8a5971449ff33e146c290de7d45984078a8652a8613f0ee7aecd3adff65896d131b8363613dd73e36f1a6f8569a517d7
+EBUILD wvstreams-4.6.1-r4.ebuild 2039 BLAKE2B 8d2e705b314f886c8522e63fac56614962ac58326e208f870f72725827a9664d1b758800fc3df1d1c51c4bbe2e350614ed820a06eab3d9af5b6613179bf069f4 SHA512 4ba831bf157f148dcf3e2e9b8f5c23cf84ce81868031ac8e88390a867af988eb2b332a55e19867a99838ddd088ecc12bcc038c305303e3b1741dbce826989ffa
+EBUILD wvstreams-4.6.1-r5.ebuild 2113 BLAKE2B 312af3556c5452ce0b995389d5aa90259fd86d3fcc3267e621caa8688aefa90f0f48886e500eaf7e56bb0118edb4304da26114e747c3f590825388f9ef715b9d SHA512 54240ebac515d1e1c042d9ae4f558d95c3051ddacb2ec2f3aa1f686c4bccfb2d10f1d0aab44c33f95cdabc8df91a7563824bc0a2cbdd30542444f4b763fe32c0
+EBUILD wvstreams-4.6.1_p14-r1.ebuild 2193 BLAKE2B 8e964f898aada01fad32b1fa1c226af81399cd1b936f910445c59d4cab2d77f16de1f2701ee16eec28ede2a18a3223fa94994e60ac5b150644617e6470f89b5b SHA512 67d1faeac0d55c48b5a2f2606c96c95b8ebb58e032bcfb5faad504116a1545e7f7138ace858456b667702dcbd8e4c081d833e89f7dc0daf57c7862171ccc5e8e
+EBUILD wvstreams-99999.ebuild 1968 BLAKE2B 201f9877c6b7a826896dfd477dca8e70bb851be3189107b5aac33b2cfac891fa0d82e04687ace39213c36e753d07bc760368be67af73f4f4a8f2128de703379b SHA512 4cec4908411d8e650ba2fd047bc37e2bf60b78b3abb2ec7befb4cc0be1ce6f1a1f70139523e15162492e9f73ccfa6e9e0763917bb9cfab9a13c4b814c1c2242c
 MISC metadata.xml 567 BLAKE2B 75e97c66b9091dd12ae8cabfc3f1f80b772e7cc835d5fe6fc4399dc837ca0576d567af45186bfdaeaefb862938f82d0b75c339ec73fcb0a5f6abe2b81ce8ed83 SHA512 11ce01ce8844fa3c43e8175c36a0f76266ce43acc9d6ed86156bfddc0b8e5f5ede6ecac9518e329c48fa46a448e57021496e46f9282d6d0cc81133ac9488c437
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
index dad2d2f206a9..34eb54286d84 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r3.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=5
@@ -24,7 +24,7 @@ RDEPEND="sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
 	<dev-libs/openssl-1.1:0=
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
index 52d22d3b1ee3..2cd4879c7322 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r4.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
@@ -25,7 +25,7 @@ RDEPEND="
 	sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild
index e9caeed7582e..db808c10219b 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r5.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
@@ -25,7 +25,7 @@ RDEPEND="
 	sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
index 34a203bd673a..a38bedb32199 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dbus? ( >=sys-apps/dbus-1.4.20 )
 	!libressl? ( >=dev-libs/openssl-1.1:0= )
 	libressl? ( dev-libs/libressl:0= )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/wvstreams/wvstreams-99999.ebuild b/net-libs/wvstreams/wvstreams-99999.ebuild
index dc51487d43e1..c1820cfa0dbd 100644
--- a/net-libs/wvstreams/wvstreams-99999.ebuild
+++ b/net-libs/wvstreams/wvstreams-99999.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	dbus? ( >=sys-apps/dbus-1.4.20 )
 	!libressl? ( <dev-libs/openssl-1.1:0= )
 	libressl? ( dev-libs/libressl:0= )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index b176c083a916..dbb895512fd0 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -4,10 +4,10 @@ AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99
 AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
-DIST xrootd-4.10.0.tar.gz 2532873 BLAKE2B 076c935d969ce7c5de6c5bde447d7579669c2908394318ddf4e2ef2938aa5cfdf36ac0f52771340b1586a1f933316278eff76c8f568c3f2a67c419ad096d1067 SHA512 deb40ed2d751c3e5a8512a85a9fb13c8fc432cda14682adb0755d0da1f95f177115d09df9438de97d224b36d00d487112d4deeba1c3db9382c7a727daf956bc3
+DIST xrootd-4.10.1.tar.gz 2532982 BLAKE2B 79cc334c631060e9be48c4f443837065e786f49513e535150f7490a9a5a17ec91f4f5dd054b0f15cb6b60ecfc18a1447e28825dc7d6665ef59004ab11665f9e2 SHA512 49234db532292c6ef04d455a1a6a5d1ff4d6705c088d5c2571602f444cb9bf03699e63a12ba962a6d3a8b9cc9f43635889ec33976840326a8301c81da7099397
 DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
 DIST xrootd-4.9.0.tar.gz 2517614 BLAKE2B 5f1ce6f599fdf5b1f9b4fa078d9b306be241757f95e9b5e9bc0a6f06450a21315778428d8c1d1ffd28ef0841bc50fca387036740bb707d9a96b7f07e94e15540 SHA512 a956262a8adae4c9cb9a91275d4207943cf43251fc61ade111c91152c62baf06c1cbdf1d659c6d792703045a4c2a82bac732220ecfd2fa707e445d6fc66ee047
-EBUILD xrootd-4.10.0.ebuild 2603 BLAKE2B e73ab288f2dbf0482364e083c8d93cd21523d13242a8a3fdf5053d6fd0147de2b21f469bc1bdc45667cdcf52ec24ef17e2634d837e19263aca9e40cbf0bed7bb SHA512 4366482e0c0c7d6ef657e51dbe14978b301f389ffb3b9a67d39ff3c8e0e8980cb6ad8176ca1691c4e04bce4838731a4625e3980b1593a23469626ea08d69a163
+EBUILD xrootd-4.10.1.ebuild 2586 BLAKE2B db28f1d8ca2288bec601fe22328b563a4116b93daa49f3d5e36f91340ba540e181f58fc16714896bd94a964ad1eb5e1b1d4ff37057bc9a19e43f0b22564547a7 SHA512 b5235f0f3e90dc78d665b68c23132f93c8ef6f29d464dd8a3b4e7d89c865772d44667dd559fc23afc2e948164240c2d6342f7a9876ca80b658d8da72b726cc86
 EBUILD xrootd-4.8.3.ebuild 2593 BLAKE2B e0aef6a1c55d34fc4175e4f57acf99083f208ea0283b49c988de16d58176c8e63b5bbdf8378361be34313b5a3734d6d362c64d02b723cd56b903bf655f72b0de SHA512 75526b8954ceba00889d4649b01f0995c758998bdc4b11af5d11f826bbd7319e112b368997ee144aee8299a74d5ee38ac3732621faed9b75ecb4cd6afe518a9b
 EBUILD xrootd-4.9.0.ebuild 2603 BLAKE2B e73ab288f2dbf0482364e083c8d93cd21523d13242a8a3fdf5053d6fd0147de2b21f469bc1bdc45667cdcf52ec24ef17e2634d837e19263aca9e40cbf0bed7bb SHA512 4366482e0c0c7d6ef657e51dbe14978b301f389ffb3b9a67d39ff3c8e0e8980cb6ad8176ca1691c4e04bce4838731a4625e3980b1593a23469626ea08d69a163
 MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25
diff --git a/net-libs/xrootd/xrootd-4.10.0.ebuild b/net-libs/xrootd/xrootd-4.10.1.ebuild
index d0c6576d614a..c4d503164d30 100644
--- a/net-libs/xrootd/xrootd-4.10.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit cmake-utils python-single-r1 user
 
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline rbd ssl test"
 
 CDEPEND="
-	!<sci-physics/root-5.32[xrootd]
 	sys-libs/zlib
 	fuse? ( sys-fs/fuse:= )
 	kerberos? ( virtual/krb5 )
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index f0d2b26a4334..380c9fb9964f 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -2,7 +2,7 @@ AUX zeromq-4.3.1-fix-test_security_zap.patch 1008 BLAKE2B 17f5a316601af1c8e7c307
 DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
 DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb5e40aef85ae8cd8fedef4c655fd2698a7f81431e34550b5156814a75c0b1a738393e7c44acbfefe96acc4c4bc SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f
 DIST zeromq-4.3.2.tar.gz 1697442 BLAKE2B 70a1f6da357987c32483050fcf86cb81a1fb0b65a527f6900f54eea8958c6aa6024af04067114663824d42305f507cba67e03c7aaab7e23e4f6332d4368613eb SHA512 b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4
-EBUILD zeromq-2.2.0.ebuild 1290 BLAKE2B 41766c48411cb623c574f20b72d9190877c0f4a53708c132863986059b620f0175a46fa3ed840dcc38298419642f186124289db64bbc9c092dfd896788c26eb7 SHA512 83c7f2b4f30aa15b44c2761c879762cb8cef3e19ba84f9bc95ab6e8f7bb0e3d01c0fbf91688be12ac662c231929793544d7769f2dafcec718f2e22764b76b9a0
+EBUILD zeromq-2.2.0.ebuild 1280 BLAKE2B 0471def5d47bf06f5560cef735faf909275404f8f9352578bba2e90b21e71b62cb00bbf002a84228d3ca316803ba9f58fbd3104403bbd72e244c1d1825e5d93a SHA512 12c947c2583f98d40c393cfd5e3dd04db3f9d8eab94195a75015dca7271feff15b3e5d3435b6d8b3dc8db87406a4e454ec36fb1e9f494ec555ecd779ab67c39d
 EBUILD zeromq-3.2.5.ebuild 1469 BLAKE2B 0c63cffa55d6ce54d430dfd3f4997f1426a80aec72e5778cdb3ba833c383d2c5d487824bda6ab413c7750de790755f266d3c69b79f8cdf6ae982fde417fb95d9 SHA512 85a0a5c8184dcafaa29d93e59568fb569ef015fc2f1cd7c26bd5c66f0333050c04505587e6922691641d43b679c34eac13dd7ced4cd2955a5c2e926ad559bfbc
 EBUILD zeromq-4.3.2.ebuild 1410 BLAKE2B 67d14de3edc28c07106685be656e92603347f0b5393cfc0d17ea5f6add9d5c6039e7a489b2558f36ccf8e211a332a5c107c8dc6a3643804a33cf6afeed04d233 SHA512 7ccd9ac284061cb9bf2fa615bb745f929f1e45acca46dde27b906b107d220550343964cbcb92d7677886d5a0dc99842351e05c0cbe6d02a4b4e3b0b5a362dec8
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-2.2.0.ebuild b/net-libs/zeromq/zeromq-2.2.0.ebuild
index 30d5fa3b3749..3aa9e3dd9622 100644
--- a/net-libs/zeromq/zeromq-2.2.0.ebuild
+++ b/net-libs/zeromq/zeromq-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.zeromq.org/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="pgm test static-libs"
 
 RDEPEND="!net-libs/cppzmq"
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /net-libs
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)