gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /net-libs
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
99 files changed, 486 insertions, 2015 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 705950ea1b1b..d0bc06dcb99e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index cdee0b3236a7..561257cd66a6 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -5,5 +5,5 @@ DIST aqbanking-6.0.1.tar.gz 2551617 BLAKE2B 0f18e63f6fc695b4fb3c5b831d324cf039f0
 EBUILD aqbanking-5.7.8.ebuild 1597 BLAKE2B 23dfae67ac7874727307ac8bae890b804ff84cea65f1ec6f239cad33891541ab81e9ab80e6956dddeaf74fc365ceeba6fef5b71bc4eb159630a88f201c52f71b SHA512 5ff2f013a85766a9c292bbcfaaa51dfdad02871d98d7639444d72f02720a6ad616482738ed07064e037c42a64020fe50c586cee724c54027cb94db752eccfabd
 EBUILD aqbanking-5.8.2.ebuild 1454 BLAKE2B 9c008c308d7ba122076de9d94492619ab13fdbd0bda80ea46d17ef60bb8c5e712be92099e6db4b3a04d39022b39a88a250346dc9277e40623dae15059beb68f2 SHA512 5505c4150f5915cd349b6d6331c5025f9c996df59b377ecf0f441502a34f1c125620bf7824660ec4674d95028de724b11301c97b580a5e2084d823cd89d7b799
 EBUILD aqbanking-5.99.44_beta.ebuild 1407 BLAKE2B d9d6b5b1f773b13b30c86b02c04e5477137ac53b932d001dc27a9f833497e44aa8614148d54e78fb63aab54b3489e896daeb44b94161e55f16e40bd1d380c91a SHA512 49ff085ccffe5ffe1805cd7a96235c024c3493d9b496ff332090e377cf22eba8f3731ff2619e4cf7f0cff56d733eafbb684e6fa05bc32af05840dea99cb1a4ee
-EBUILD aqbanking-6.0.1.ebuild 1403 BLAKE2B fec653d12882516fb876e32c7ac67edd7369c43bde81c7be015906bef2bf3a970cb31dcd458a58df24c3beafe2dc2b5355e937e5ff1252ba62733f6034aa318d SHA512 1a32a1d19576b6cd140f401174c5a2c15d1ef768825695c53774d1fa10af81e95aabab93378213523500ec87d2d91ac8e5afde0fa4886c15597ec53a61dcd6f9
+EBUILD aqbanking-6.0.1.ebuild 1402 BLAKE2B 0b1ba38a730045154ee73cc71665a22b30e08c78d88e888bb55fdded0cbdc78b4e3bf8738e1f2cd16c3df0acb105a787b4afcb7e842229ac9cfa6aae3fc55f62 SHA512 4dd97971115c74c10795682dbfeee5ddea3df1d078024b4fdd96ce4d9b4479bc0a3c03d69841fea1b0e27fd2df0a886696a5295317a3c76d9546ef316fe3db99
 MISC metadata.xml 412 BLAKE2B 71c913459f7d3fc1d6bede5ee1e78fd189b840cff496c1e0da86434143be173cb7f00f8457174f9e9b6b22a3a9673a316e7a80649ab6ebaa7cb4c4f7c10270c2 SHA512 d32767c7a1c63a22e61318687c3591d86b2adaab9773d3330b451c099306412003bb07f449c3cbf0791b8d2370e742ecc3922076e9bc8e6c0a1ad7fc92d24999
diff --git a/net-libs/aqbanking/aqbanking-6.0.1.ebuild b/net-libs/aqbanking/aqbanking-6.0.1.ebuild
index 82c1fc073a24..c50b81b94185 100644
--- a/net-libs/aqbanking/aqbanking-6.0.1.ebuild
+++ b/net-libs/aqbanking/aqbanking-6.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/238/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc ebics examples ofx"
 
 BDEPEND="
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index 35071f9c6cfe..9af9f423dea0 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -1,5 +1,5 @@
-AUX canlock-2b-make.patch 2986 BLAKE2B edaa828eedc85e6e4568403e107bbf42076b5b0a098dcb41e4352d5fd54f7bb631110164e53bc38aac27a4651431b7a7eee5fde392baa1fd13fe43732188a3e4 SHA512 4c41aedb6b26e9205726ad992354f57daef192d6c6ceaa9b1fe961839725a5b831f5c16dcd2bf2e451499539e22f1f1ed7b0ec113844d0c1306afa5e69dc4db5
+AUX canlock-2b-make.patch 3370 BLAKE2B be7d14d664284886b2f798e8a46df4b4d9fdd2e2f098487391b51291c87dcd7055b7b31f59fb5a62ff1ca7bf09acc5cc3b1c90834bf309e3f6c4b9779b49fd93 SHA512 3040988dde4d7a79d1a73ebd90f8c7eadcb01489129ce47641e49c08ee38ff94d055f3da936c6ef1bf19fbff4f6be5ea41dc80356cec141b278c502dcabdc7ba
 DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b3c02a8e614bffbefafd2fd3ff9f5720b2df0dead30e6d70dcd510380fee8cc2b535268266408719ca030e35 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f
 DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e
-EBUILD canlock-2b.ebuild 1109 BLAKE2B 2f398ca68b15bf49f52d60fa51215b7ff5d6c7b94009216730890ada940bd3bb4491d2c3bec4585da82552d6a2ac72eac4999da494442745a0795ce9344d8839 SHA512 41368cbc1d21ca9eafa48a1c38fa1dbc892543b508c4549fb5a4b4b8c30bcfd6e246a4f09082bf8d26a03692d789a3043bf1b4e76c658d62deb23f761d290455
+EBUILD canlock-2b.ebuild 848 BLAKE2B 68ee1efa0605d19ef8ad449bb8e57113b27d2b17c7e11cbf85789e6c9bf2de4a984143b3872737a76193d8463e90a592f2fa84948e24ed3f2f14c236ed205b65 SHA512 e7348d495c1b7bef6f786b82e71b8097300125cb45c0061a0d9a63f3657abc763f54856fe55de051a6d38dd40306ab9580c4c16d7a2cd2414e1cad6300eb93cc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild
index 9d58b0a2dc63..d54ed58f3701 100644
--- a/net-libs/canlock/canlock-2b.ebuild
+++ b/net-libs/canlock/canlock-2b.ebuild
@@ -1,43 +1,39 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${P/-/_}"
+
 DESCRIPTION="A library for creating and verifying Usenet cancel locks"
 HOMEPAGE="https://packages.qa.debian.org/c/canlock.html"
-SRC_URI="mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/c/${PN}/${MY_P}-6.diff.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-S=${WORKDIR}/${P/-/}
 
-src_prepare() {
-	epatch "${WORKDIR}"/${MY_P}-6.diff \
-		"${FILESDIR}"/${P}-make.patch
-}
+S="${WORKDIR}/${P/-/}"
 
-src_compile() {
-	local targets="shared"
-	if use static-libs || use test ; then
-		targets+=" static"
-	fi
+PATCHES=(
+	"${WORKDIR}"/${MY_P}-6.diff
+	"${FILESDIR}"/${P}-make.patch
+)
 
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ${targets}
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	use static-libs && dolib.a src/libcanlock.a
 	dolib.so src/libcanlock.so.2.0.0
 	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so.2
 	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so
-	insinto /usr/include
-	doins include/canlock.h
+
+	doheader include/canlock.h
+
 	dodoc CHANGES README doc/HOWTO
 }
diff --git a/net-libs/canlock/files/canlock-2b-make.patch b/net-libs/canlock/files/canlock-2b-make.patch
index 492b88bee143..da90c738af69 100644
--- a/net-libs/canlock/files/canlock-2b-make.patch
+++ b/net-libs/canlock/files/canlock-2b-make.patch
@@ -1,30 +1,30 @@
---- canlock2b/Makefile
-+++ canlock2b/Makefile
-@@ -1,33 +1,35 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,38 +1,39 @@
 -CFLAGS = -Iinclude
 -LDFLAGS = -L. -lcanlock
-+CFLAGS += -Iinclude
-+LIBS = -L. -lcanlock
- CC = gcc
+-CC = gcc
 -STATIC_LIB = libcanlock.a
++CPPFLAGS += -Iinclude
++LDLIBS = -L./src -lcanlock
  
 -all: hmactest canlocktest $(STATIC_LIB)
-+all: shared static
++all: shared
  
 -sha1test: t/sha1test.c $(STATIC_LIB)
 -	$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
 +sha1test: t/sha1test.c shared
-+	$(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
  
 -hmactest: t/hmactest.c $(STATIC_LIB)
 -	$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
 +hmactest: t/hmactest.c shared
-+	$(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
  
 -canlocktest: t/canlocktest.c $(STATIC_LIB)
 -	$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
 +canlocktest: t/canlocktest.c shared
-+	$(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
  
 -$(STATIC_LIB):
 -	cd src && make
@@ -49,20 +49,25 @@
 -	
 -test: all
 +
-+test: hmactest canlocktest
++check: hmactest canlocktest
  	@echo "hmactest: "
- 	@./hmactest > t/hmactest.out || echo hmm
+-	@./hmactest > t/hmactest.out || echo hmm
++	@LD_LIBRARY_PATH=src/ ./hmactest > t/hmactest.out || echo hmm
  	@diff t/hmactest.shouldbe t/hmactest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
---- canlock2b/src/Makefile
-+++ canlock2b/src/Makefile
-@@ -1,9 +1,11 @@
+ 	@echo "=-=-=-="
+ 	@echo "canlocktest: "
+-	@./canlocktest > t/canlocktest.out
++	@LD_LIBRARY_PATH=src/ ./canlocktest > t/canlocktest.out
+ 	@diff t/canlocktest.shouldbe t/canlocktest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
+ 	@echo "=-=-=-="
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,32 +1,35 @@
 -LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo
- CC = gcc
-+AR = ar
-+RANLIB = ranlib
+-CC = gcc
  LIBTOOL = libtool
 -CFLAGS = -I../include
-+CFLAGS += -I../include
++CPPFLAGS += -I../include
  SOURCES = base64.c canlock.c hmac_sha1.c sha1.c
 -OBJS = base64.o canlock.o hmac_sha1.o sha1.o
 +OBJS := $(SOURCES:.c=.o)
@@ -70,8 +75,10 @@
  SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2
  SHAREDFLAGS = -fPIC -DPIC
  LIBS = libcanlock.a libcanlock.so.2.0.0
-@@ -11,22 +13,25 @@
+ INSTALL = install
  
++.SUFFIXES: .c .o .h .lo
++
  all: $(LIBS)
  
 -libcanlock.a:
@@ -83,11 +90,8 @@
 -libcanlock.so.2.0.0:
 -	$(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES)
 -	$(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
-+%.o: %.c
-+	$(CC) $(CFLAGS) -c -o $@ $<
-+
-+%.lo: %.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) -c -o $@ $<
++.c.lo:
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(SHAREDFLAGS) -c -o $@ $<
 +
 +libcanlock.a: $(OBJS)
 +	$(AR) cru libcanlock.a $(OBJS)
@@ -95,6 +99,8 @@
 +
 +libcanlock.so.2.0.0: $(LIBOBJS)
 +	$(CC) -shared $(LIBOBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
++	ln -s libcanlock.so.2.0.0 libcanlock.so
++	ln -s libcanlock.so.2.0.0 libcanlock.so.2
  
  install: all
  	$(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index 26edd65b5aa9..39b0384e14c1 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -4,8 +4,8 @@ DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0
 DIST davix-0.7.3.tar 4341865 BLAKE2B 8ba2855f7170ca24f4a15edc32562e47711304f48eaeb1e2870e1325396ae2b664f8af7a482986da6883ab5c92ab6e61034e8840baf3f59c3bd691e7e483fc7e SHA512 b7e7814066ca53c44c2aa0a0d1d6a2d995ea44d3d122da1d19f12849d8c2d4e91eafb40c18d4d18d1736a7c5c5099972519c08a6c7ab5b32300fc8a1fcdc5bfd
 DIST davix-0.7.4.tar 4343614 BLAKE2B 0fd618a4575cfdcbb0142b26ed8bd5ea0b8d880706ec6ebcc8e9a8755a8f392c715e2bc3cb25dd316fa90f06e7223ecd3e8272a0e5867eb2f5d74eec3053ddf2 SHA512 835d49f1729be95b88c1c422723a2ac6fa9fa0c4a85089e67d68a365c482bf648471fea000b90e7797add0809a9262b5c7275a965fde437bb8206154266fd970
 DIST davix-0.7.5.tar 4343329 BLAKE2B dfb71e0524e47a2378cd8a49fa4c7d209b8b658e8515f4f0750c9c98cb03073e2ff82a5fbdb2f7fb563f31671789cd7e9cb1656a16dfd0811934730961695db4 SHA512 4be448d6d28f315c0d098d9cf2ddf95bbd818659821935571d83dad1b2724b8f90b87be298ca8a7984cb57a88b18b0253e23f6e8cb192cd1792472993da36bcc
-EBUILD davix-0.6.7.ebuild 1506 BLAKE2B aceba7478b91996bb52fe4b7970b7aeb8419a7fc3f29481975a76eeb9d30e31df2971ed439be84dc2e803f7d152eaf0375cf2a9f0b295cd817b8e713f04e976c SHA512 a6e47ef1da6ddc3baaefa77b0be97a52f8b294929e2dc732e92d60635fab76aa2eda95ec5acded889e254d037aad5698e2c2189dfcc8fddc816d34c3c55a505a
-EBUILD davix-0.7.3.ebuild 1622 BLAKE2B 4bf101451170858ea1005626d38a907ffd8719897eda2078d6f838538bd8a21f300adb45316e81c03572ad718c71c0fb748a4d715c7127b6d2847998653efe82 SHA512 b8fb905d9c08c0dfa09d45ddeffb198b9d1c934a7d892383ceb8403809156015384d032efbf330f477655743108ae50f778aa49345985422a8606dca4176156b
-EBUILD davix-0.7.4.ebuild 1624 BLAKE2B e073022e62620ea2926cba34fd321375a0adc482d9bb27c6201b7df3a452aed6dcdc187f5132ef9835aeacbf9421cf0a4f1393d49c2a966790ecc702c53ec1ef SHA512 a738d2b68b5ea10a259c52a984e3b540bd7d79cdd7cf5976dff256acd0841755a1c87822ea1aaf2246b5fea4329b566e9200f72f9d757613846c3c9a7345109d
-EBUILD davix-0.7.5.ebuild 1624 BLAKE2B e073022e62620ea2926cba34fd321375a0adc482d9bb27c6201b7df3a452aed6dcdc187f5132ef9835aeacbf9421cf0a4f1393d49c2a966790ecc702c53ec1ef SHA512 a738d2b68b5ea10a259c52a984e3b540bd7d79cdd7cf5976dff256acd0841755a1c87822ea1aaf2246b5fea4329b566e9200f72f9d757613846c3c9a7345109d
+EBUILD davix-0.6.7.ebuild 1464 BLAKE2B b32265029d69d507c5f77b9cb71eab458ba320c588db0eba975716d7532d60aa7835f67fe8514b26bce288cc38805945030ccfe8431e0d05a4cf57ec638aefa0 SHA512 0bb2a2b3f57b8ad525df4b56481c173b3a53521cdb31bddd0b452846ea5a3559efd42521368d90f2f751f790218588e00161d582abf1ae1467d0567ba50009ec
+EBUILD davix-0.7.3.ebuild 1580 BLAKE2B 6cd6b4a7659b97a2aae3bdf070b2fff9b2040d1036b7042e761d7a7c0b094fab20d749fae91a4f2414d7097c3c9b582825034be26721b3870fe046b3746d206a SHA512 76db6ac1c00cffa869101602e882727e418c9aa2bc038f63abc230816807460c7bfe5e03de644697d973b3cc5e3c32d07e835f98387b60489a3151e31530e0b4
+EBUILD davix-0.7.4.ebuild 1582 BLAKE2B 2c5813eb32e5ccf9baa17068b660a3bf9a91f5f030a785ab9c4df6538906cc718218d5c6d479bdc419f81f456685787f3a2d488120e58fced625855eb88d0fac SHA512 d298da378194e83fcfbe266b206466f2dbf10a1c504f5e38515d2765045db36148392ec6dfe805dd5dff25f5fffc6dc006bb907cebbfb923d6bab76bf5753839
+EBUILD davix-0.7.5.ebuild 1582 BLAKE2B 2c5813eb32e5ccf9baa17068b660a3bf9a91f5f030a785ab9c4df6538906cc718218d5c6d479bdc419f81f456685787f3a2d488120e58fced625855eb88d0fac SHA512 d298da378194e83fcfbe266b206466f2dbf10a1c504f5e38515d2765045db36148392ec6dfe805dd5dff25f5fffc6dc006bb907cebbfb923d6bab76bf5753839
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.6.7.ebuild b/net-libs/davix/davix-0.6.7.ebuild
index 7bebb2047181..4eb8ff364a23 100644
--- a/net-libs/davix/davix-0.6.7.ebuild
+++ b/net-libs/davix/davix-0.6.7.ebuild
@@ -40,7 +40,6 @@ REQUIRED_USE="test? ( tools )"
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=$(usex ipv6)
diff --git a/net-libs/davix/davix-0.7.3.ebuild b/net-libs/davix/davix-0.7.3.ebuild
index 325471ef2fb5..1d6ee68badbd 100644
--- a/net-libs/davix/davix-0.7.3.ebuild
+++ b/net-libs/davix/davix-0.7.3.ebuild
@@ -45,7 +45,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=$(usex ipv6)
diff --git a/net-libs/davix/davix-0.7.4.ebuild b/net-libs/davix/davix-0.7.4.ebuild
index 610959a3bbd9..9aed78284960 100644
--- a/net-libs/davix/davix-0.7.4.ebuild
+++ b/net-libs/davix/davix-0.7.4.ebuild
@@ -45,7 +45,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=$(usex ipv6)
diff --git a/net-libs/davix/davix-0.7.5.ebuild b/net-libs/davix/davix-0.7.5.ebuild
index 610959a3bbd9..9aed78284960 100644
--- a/net-libs/davix/davix-0.7.5.ebuild
+++ b/net-libs/davix/davix-0.7.5.ebuild
@@ -45,7 +45,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=$(usex ipv6)
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index eb0758897b5e..7dae621b57b7 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,30 +1,14 @@
 AUX grpc-1.11.0-pkgconfig-libdir.patch 2295 BLAKE2B 9e9cfb9f150c30bf55a5443e387c9d0e8f3507fdaba56c2ab5cc318f51959e45bda8e0cee39487d8116b76c15da1a7ca9da1e02a5e29bdbc7edf85d508e5e857 SHA512 4648fceb8a6b8a364126ba20ef2cc2f5b4baddfb4f622de93f377714eff793e05062f5bb02b39e2699b00f3cce309fb23a9ea35a9fef3a1df4e3682bd707e8d5
-AUX grpc-1.13.0-fix-host-ar-handling.patch 1654 BLAKE2B cb4172a31dbec91667661c1bbe4830a5485816f649f48637706de22502efc3f8d328a414e141b35c83b2b1f70b0b383d5e44caea8fc1de764d47671c064b8520 SHA512 67cd7832669b067e4acb85c01e46e9710a3e65523d84b5f932baed77c20c4bcf270bed77dd842610b7e0ceb36dbaa729912bd84e9496e172325714d9a55bc499
-AUX grpc-1.15.0-fix-cpp-so-version.patch 4772 BLAKE2B 96efd477c385c7a4714025081288576f8ef4fbba691257e3638e85b850c20b1db9a72de6fb9f85a8b6b3f4f990dd4456ada838ce6ccd01d4bb5043071926eec9 SHA512 49c5da5883a6e8aac6d37fb1920b6b8af23ec9f45c1dd9c337e1a9455adb1eded0ed3763003818ab261fd367e38b705af0dd409d01b97060b1e5020228acef2c
-AUX grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch 3039 BLAKE2B 1da27e75874229261115b174b168e0b478add3c844c58e81a84bf74b699447310decda09e0cad89056a3f5d7fcc8d0bb1835889438ee8efab89471c66a77b69a SHA512 a6f59a3b518310c6150439fba5ad058048540f0f84152406f607873248e3e0d95cc0077b634164f4bdf391427c847614dd88e2ddac9feded0aa23044ea58c051
-AUX grpc-1.16.0-gcc8-fixes.patch 2323 BLAKE2B ef938aee88c894314313749e070e443462005a0add69abf463e93f7d414360135d399dea3f7cbb282150f1e03a6e2df33ad9965327392aed32d76c2875f976c3 SHA512 ad46c4187604212d628004cc783a69d95e4378e83e2673fd99265f2929a000429a269abdb98936ad5611fe9d99df581ff5f122f51661227d13d9e7145ee0a40c
 AUX grpc-1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
 AUX grpc-1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5
 AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e
 AUX grpc-1.25.0-pkgconfig-libdir.patch 2199 BLAKE2B 4625e03eeeab9235fa1615bdfc485a5a0f0304ce4613b3f0ec0d0edf0d12d04d48a34fd30e680ff48bc1a7a7838d1b1b51ce58921a20472b5be0ad60dbce23e2 SHA512 93077a0cd6fd48694238b42fc60c2c986232ff863b09d068aac3f813733de5a7b4d3ac32929ad4e58e93e2990d5903cdf0b7491a0ea924402262d04b75fdb57a
 AUX grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
-DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d
-DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
-DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120 SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
-DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7 SHA512 6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90
-DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
-DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
 DIST grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b9e56f8012795000c30f20fa4d5c1bad37d117cf8ea54fb372b8b02702a866c027c6e0a467f276a752ee9d17c6 SHA512 086ceb7a4fc1439bd23a2cab8c90ba2542491d5a9c278a0ff6e1b3ad623cf7725b2a7310bb793d9b36882bd9394d02a3616331ac26c78d822e68b305c2ae27f6
 DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0
 DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c
 DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61
 DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
-EBUILD grpc-1.16.1.ebuild 2405 BLAKE2B 1f3e8e9383fcb1f4eb371abde99377f653aeac44dba6e268dcf760b3e2cf20015d08965f9a8b3a2ed1fc31626326239634977d6ecfea893b9e2ca5de2e2d6034 SHA512 695ea5cbd96bb1b49cd562677911d43cfdc78f9ca95240b9103e09f8027f75eb1effbf755adb0487f8a833cbd41d4b1c0ec2de31fe9069be049198b9c526c2d0
-EBUILD grpc-1.17.1.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
-EBUILD grpc-1.18.0.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
-EBUILD grpc-1.19.0.ebuild 2396 BLAKE2B 4a63200218f221390ec05f50699768c68110a460ae43d1b4122924a1c3ce1f16c0fdd0864592c45d423395cc5d4541692202aa05ea3341747eaea1cf5eb3ee2e SHA512 76dfe9ccb26eafcfa67fecf81d155fd35ccf390b46fa756a0475f3929c200d8a3e98af7e12d99f598f9a966505365194f6facb5cf38969d38dde307cb23e80f9
-EBUILD grpc-1.20.1-r1.ebuild 2413 BLAKE2B 283f25fd00b590bcf935841f3f8ebbb3d955dc7041e303b8ac45d9b9415bb2792e21086e6f8ea214498224f50b0f6aefc9dad75a3a8bba14fc502c1432f2e120 SHA512 8c43c88a01143466e5cdb11b224da94b544becf0d7b73e247554b371445a1fd8462af9889d7fe343a508e4a4cc2560828ebea02ca03b4c4781fcddd6a4401c96
-EBUILD grpc-1.21.1-r1.ebuild 2505 BLAKE2B 23b382c761d81822080ef873517dfece795056356a8da4218a7c82489525563caa5b660ac23d4a7b45b35648d7d6c0d8cc3a1d36454c2595fbd294802115ca61 SHA512 e162969923aa7c9e9ef27ce35b22a57d93f1cea297b4b4fe4667a912cbf9a953738da5beb223e36c041648ee809e3073e26b41a37b0242179cdc61fa0bf1e64e
 EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.24.3.ebuild 2546 BLAKE2B e674d2495e07f5eb4f210dd1bcec87549987460a4340723160c5e04c8b8874b17b9a39d8c890c602eef96d82853e98c7effac8e9766cd196df6c6116145e81ae SHA512 94dab7dafaea4f86de5609d912616033ce9cee674e430af358b2c94d2415f8f008141b523039b8252c1864e72792b837c30782f1c874dbbbd9c5582e2e38bbb0
diff --git a/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch
deleted file mode 100644
index 926952f47f2a..000000000000
--- a/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7e2d98df390787797fa494b26c72896f16f6e2a6 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sat, 30 Jun 2018 00:21:53 -0700
-Subject: [PATCH] Makefile: fix host ar handling
-
-Cherry picked lines from
-https://github.com/grpc/grpc/pull/11476
----
- Makefile | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8333858588..b5a44b7096 100644
---- a/Makefile
-+++ b/Makefile
-@@ -328,6 +328,7 @@ HOST_CC ?= $(CC)
- HOST_CXX ?= $(CXX)
- HOST_LD ?= $(LD)
- HOST_LDXX ?= $(LDXX)
-+HOST_AR ?= $(AR)
- 
- CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
- CXXFLAGS += -std=c++11
-@@ -444,6 +445,7 @@ HOST_CFLAGS = $(CFLAGS)
- HOST_CXXFLAGS = $(CXXFLAGS)
- HOST_LDFLAGS = $(LDFLAGS)
- HOST_LDLIBS = $(LDLIBS)
-+HOST_AROPTS = $(AROPTS)
- 
- # These are automatically computed variables.
- # There shouldn't be any need to change anything from now on.
-@@ -6886,10 +6888,10 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
- else
- 
- $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
--	$(E) "[AR]      Creating $@"
-+	$(E) "[HOSTAR]  Creating $@"
- 	$(Q) mkdir -p `dirname $@`
- 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
--	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
-+	$(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
- ifeq ($(SYSTEM),Darwin)
- 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
- endif
--- 
-2.18.0
-
diff --git a/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch b/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
deleted file mode 100644
index ba2ca651f0c3..000000000000
--- a/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a443abbdbbd402951138bb8fcb2a4f159b920fcd Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 12 Sep 2018 11:22:48 -0700
-Subject: [PATCH] Fix cpp soname symlinks
-
----
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4e993782ee..09bd52e8ad 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3050,7 +3050,7 @@ install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-con
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3059,7 +3059,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3068,7 +3068,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3077,7 +3077,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3086,7 +3086,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3095,7 +3095,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so
- endif
- ifneq ($(SYSTEM),MINGW32)
---
-2.18.0
-
diff --git a/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch b/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
deleted file mode 100644
index fd9f91419542..000000000000
--- a/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 0892788776d60d92a0cddcd22078779166b736db Mon Sep 17 00:00:00 2001
-From: Dario Berzano <dario.berzano@cern.ch>
-Date: Thu, 5 Jul 2018 11:27:20 +0200
-Subject: [PATCH] Prevent shell calls longer than ARG_MAX
-
-This patch we breaks the relevant paths array into multiple shorter arrays in
-order to make the shell calls succeed.
-
-See grpc/grpc#14844.
----
- Makefile | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 54823a31167..25eb092d996 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2946,8 +2946,14 @@ install-headers_c:
-
- install-headers_cxx:
- 	$(E) "[INSTALL] Installing public C++ headers"
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-
- install-static: install-static_c install-static_cxx
-
-@@ -5278,6 +5284,8 @@ PUBLIC_HEADERS_CXX += \
-     include/grpc++/support/stub_options.h \
-     include/grpc++/support/sync_stream.h \
-     include/grpc++/support/time.h \
-+
-+PUBLIC_HEADERS_CXX1 += \
-     include/grpcpp/alarm.h \
-     include/grpcpp/channel.h \
-     include/grpcpp/client_context.h \
-@@ -5325,6 +5333,8 @@ PUBLIC_HEADERS_CXX += \
-     include/grpcpp/support/stub_options.h \
-     include/grpcpp/support/sync_stream.h \
-     include/grpcpp/support/time.h \
-+
-+PUBLIC_HEADERS_CXX2 += \
-     include/grpc/support/alloc.h \
-     include/grpc/support/atm.h \
-     include/grpc/support/atm_gcc_atomic.h \
-@@ -5376,6 +5386,8 @@ PUBLIC_HEADERS_CXX += \
-     include/grpc/impl/codegen/propagation_bits.h \
-     include/grpc/impl/codegen/slice.h \
-     include/grpc/impl/codegen/status.h \
-+
-+PUBLIC_HEADERS_CXX3 += \
-     include/grpc++/impl/codegen/async_stream.h \
-     include/grpc++/impl/codegen/async_unary_call.h \
-     include/grpc++/impl/codegen/byte_buffer.h \
-@@ -5406,6 +5418,8 @@ PUBLIC_HEADERS_CXX += \
-     include/grpc++/impl/codegen/stub_options.h \
-     include/grpc++/impl/codegen/sync_stream.h \
-     include/grpc++/impl/codegen/time.h \
-+
-+PUBLIC_HEADERS_CXX4 += \
-     include/grpcpp/impl/codegen/async_generic_service.h \
-     include/grpcpp/impl/codegen/async_stream.h \
-     include/grpcpp/impl/codegen/async_unary_call.h \
diff --git a/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch b/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch
deleted file mode 100644
index 0afd8254dec0..000000000000
--- a/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 807a938a576ec52bc8c971100b2da26b059d9347 Mon Sep 17 00:00:00 2001
-From: Tobias Jungel <tobias.jungel@gmail.com>
-Date: Wed, 22 Aug 2018 21:14:46 +0200
-Subject: [PATCH 1/2] mitigate gcc8 -Werror=ignored-qualifiers
-
----
- src/core/ext/transport/chttp2/transport/flow_control.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
-index 53932bcb7f5..4b1862735d6 100644
---- a/src/core/ext/transport/chttp2/transport/flow_control.cc
-+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc
-@@ -190,7 +190,7 @@ TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t,
- uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) {
-   FlowControlTrace trace("t updt sent", this, nullptr);
-   const uint32_t target_announced_window =
--      static_cast<const uint32_t>(target_window());
-+      static_cast<uint32_t>(target_window());
-   if ((writing_anyway || announced_window_ <= target_announced_window / 2) &&
-       announced_window_ != target_announced_window) {
-     const uint32_t announce = static_cast<uint32_t> GPR_CLAMP(
-
-From 5a03e7f10145c6591f313055907a9cf26ccb9234 Mon Sep 17 00:00:00 2001
-From: Tobias Jungel <tobias.jungel@gmail.com>
-Date: Wed, 22 Aug 2018 21:17:01 +0200
-Subject: [PATCH 2/2] mitigate gcc8 -Werror=stringop-truncation
-
----
- .../client_channel/lb_policy/grpclb/load_balancer_api.cc       | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-index f24281a5bfb..8c064214729 100644
---- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-+++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-@@ -68,7 +68,8 @@ grpc_grpclb_request* grpc_grpclb_request_create(const char* lb_service_name) {
-   req->has_initial_request = true;
-   req->initial_request.has_name = true;
-   strncpy(req->initial_request.name, lb_service_name,
--          GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH);
-+          GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH - 1);
-+  req->initial_request.name[GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH - 1] = '\0';
-   return req;
- }
- 
diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
deleted file mode 100644
index 6ab28ceba67a..000000000000
--- a/net-libs/grpc/grpc-1.16.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
-	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild
deleted file mode 100644
index a5959280313b..000000000000
--- a/net-libs/grpc/grpc-1.17.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild
deleted file mode 100644
index a5959280313b..000000000000
--- a/net-libs/grpc/grpc-1.18.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild
deleted file mode 100644
index a0877fb616b1..000000000000
--- a/net-libs/grpc/grpc-1.19.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.20.1-r1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild
deleted file mode 100644
index d8c812cd259b..000000000000
--- a/net-libs/grpc/grpc-1.20.1-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.7.0:=
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild
deleted file mode 100644
index bf11250c29cb..000000000000
--- a/net-libs/grpc/grpc-1.21.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.7.0:=
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	rm -r third_party/cares || die
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	local myemakeargs=(
-		V=1
-		prefix=/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		AR="$(tc-getAR)"
-		AROPTS="rcs"
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LD="${CC}"
-		LDXX="${CXX}"
-		STRIP=/bin/true
-		HOST_AR="$(tc-getBUILD_AR)"
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_CXX="$(tc-getBUILD_CXX)"
-		HOST_LD="$(tc-getBUILD_CC)"
-		HOST_LDXX="$(tc-getBUILD_CXX)"
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		V=1
-		prefix="${ED}"/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		STRIP=/bin/true
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index f955755cddc8..82ffc91f3703 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,3 @@
 DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
-EBUILD gupnp-1.0.4.ebuild 1944 BLAKE2B afe621fe5e42a61db2c38156adc1018c0171e95b0a25535f44f0afd3e7d7543eaf15e120c63d63cfbb410725eb30d1eb3cebe0c5dec3335a8174d52cba288ba6 SHA512 7298438379023f729d3d20bbdbb20aad25c159a08fe787bdde804f8ad9295708ebf8b336f1541860b10467f90787044b1e6b1910a77ce2657584f8f2457eb39b
+EBUILD gupnp-1.0.4.ebuild 1940 BLAKE2B 804a14ef78d457d699ba6df7ecc9a15ca80162aa3e9c41fa51e6f7991ad9c1f4effe819bcbf52728d9def24fd12db3a505a3216224e2f3c9198a18c3e8849e9e SHA512 4eaf6306c791b84e6c3bac9cb83892b12a44fab27c454763ae38fae4ed9012b0f03a7c42824677f427d0add0155c491ab370767faa24f368fe5f1fea763e7a4f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild
index a559d480cc22..f1bcbce03df3 100644
--- a/net-libs/gupnp/gupnp-1.0.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 multilib-minimal python-single-r1 vala
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 29f6b8ec213f..74a1e2d3cb6d 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -1,8 +1,10 @@
 DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
 DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691faef9cc6be3fb99426a3c1e3f24ae50689dfd8e46fa52a22d713780476130ee6fae6294b83cc3526bb5131cf16b98f2 SHA512 110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052
 DIST http-parser-2.9.2.tar.gz 51298 BLAKE2B 5d37ea197acbac468de03081010fb3b755a093085e56c9fa5a3d4dbd70dd2903335a8113ec21664ca54a74aac4cbbb1cc64b861d021df944790453c2de9baaab SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
+DIST http-parser-2.9.3.tar.gz 51973 BLAKE2B c46160e811874f3d4d2a7390e3b64520c7c01d51f74fb608ca8972ffe264cc389b744c1b6d8b5b6a7c9d7816eb95c179a9c210ba1a122ac4fa95996308d667af SHA512 d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b
 EBUILD http-parser-2.8.1.ebuild 1009 BLAKE2B dab1aeac7fc07cabadc19ae29050975d5f7712b260f314e06115f9367287edd0a8b524706a6817ea0a90d2a29fa8bb2d5d132dedf21b1d7476a8635e963346bf SHA512 b764290864401b181216c761847f54903671c19f2ebbe45de9d736e2c8fb02758054364970f9b1f913081004495087049c282130679536b785a877951a036688
 EBUILD http-parser-2.9.1.ebuild 1014 BLAKE2B 303409bf197182a0a4afa540e5c522abb4ecbbb677a5d79b5419a94b44dfc10ef2e08a24518961aa425817751cdf2c207fe50721be016ce912af524a1b16f45f SHA512 ed2453a71d655e2b2f5ac9157d7d056a8ed73272f2ca8405a079782be1fd2ac92a640649ee2b078b20b375e5be512889fcbd5c56df3f067dae294f34c538b283
 EBUILD http-parser-2.9.2.ebuild 1011 BLAKE2B dfa48329f6c92622c5368b939fad36e1cc5eb1411a088eb3040e62bc6cfb2804a1a216ce8e12041b807068446aeaf6d7d3470f0cdaf4ddd66eb27a7b9729b100 SHA512 ff635a86de6ceaee6a71fc7b501ec9e133b9b46531db0b1fae4f424098570bb8f29c06a1bf5e9a47b458c810fc790dcbe64a79361f797418b4c2b808a85f4f39
+EBUILD http-parser-2.9.3.ebuild 1014 BLAKE2B 0e49d3893d32f53525a8e568706d57d1e65e32220cbaca91c52283e724b52f149fbe2263fb428431c9c1da61463899dba1e3454cbb47ab6803d14ac033e2dde4 SHA512 c85c7b57215496c937724f84f317ba21189aa04a9f41cbeeed5917fbb4ef9db3f77d34ea3f628166a023d3b1dbb453e2c4783b764c02e7f43b4b7532d7d5a410
 EBUILD http-parser-99999.ebuild 874 BLAKE2B 7ca6132687ff6da292034c94565f29c11ab2c32e2391daa1b984463828b7254fc3f3b9399063a2f37b344969520ba00fd3f8617c111a691e72eaff9731ef9c11 SHA512 9ff2b79fc825ffb0d5c047c02381a03ad8b42c24bb2e3c1bc5feace6f751f91910d66b259d2ad66b704d868e08086c6de2b1aa89f6508d99de7ee497d39832f9
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.9.3.ebuild b/net-libs/http-parser/http-parser-2.9.3.ebuild
new file mode 100644
index 000000000000..28a3330d367a
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.9.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="HTTP request/response parser for C"
+HOMEPAGE="https://github.com/nodejs/http-parser"
+SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2.9.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	tc-export CC AR
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
+	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
+}
+
+multilib_src_test() {
+	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	use static-libs && dolib.a libhttp_parser.a
+}
diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest
index fd11141cf00c..aa989af051d3 100644
--- a/net-libs/libasr/Manifest
+++ b/net-libs/libasr/Manifest
@@ -1,3 +1,3 @@
 DIST libasr-1.0.4.tar.gz 413258 BLAKE2B 971dabb83e322808344c4b53622623556f662c6ada200862469dcfe4f0277ade438b39e0c0e19d372622dfd3c3bc69c2bf1ca22200e6318c062f280f72efc15e SHA512 6f189f9f492da8204396fe1246b4a0162751b2060a881469649ecf987b7ac1cc834193d2052e80a09bf94fedc8fc64123e9dfcfe3a2e4395f9e26d37afc84501
-EBUILD libasr-1.0.4.ebuild 397 BLAKE2B c54a538c3378209f7f69a97912d9dcbb6bbfea4f11ab22b983826d6d1f0bf34a07b691f993675e65580a42fb985b4d7f4ce86325a22020da11ab89b7370aa766 SHA512 6ca184cb4d5bc22ebdef9cad546336aaca5fec5812cdf10315e39d4a1e2d0af5ce7ff8eb0c3698f73ce815be663a6f94f298c7f55b4eb316dd367e90e9edc78f
+EBUILD libasr-1.0.4.ebuild 404 BLAKE2B d1fb56eb16ba3d9ab9472e7955abe62aad7e7e05e205ef73e117b25b28d6780ce17c3a0d17006b98490e78bff6b0a413ac6532e8721eda5337d7a1fa3cfda25d SHA512 b484bdc6d0c10187212eb81f5721a6ce205045fce4840d1d078a5f073d3fc7d9b1bcd4c0c93305bf06bafe823d3048943117fc3a61e1ed4bc617ca5e55c1a04a
 MISC metadata.xml 331 BLAKE2B fb0ff46381f7fa14f0fd15ffda08e378a5a88e9771ce464ad813e4c8cf7d2146ca45b2c2cc8c13756bdae2413758f7cba2c68cf4752405359f311eca700c7fbb SHA512 dedfef00a1e0f26438a1e0fbc9b53fc64566bd6def05260410d21aa3ff941ef0c5c9dbc205b3516052b0409943acbfb431e4702c87d1c94e9950ab9492f68850
diff --git a/net-libs/libasr/libasr-1.0.4.ebuild b/net-libs/libasr/libasr-1.0.4.ebuild
index 8c80ebc66324..87b8e9693bf9 100644
--- a/net-libs/libasr/libasr-1.0.4.ebuild
+++ b/net-libs/libasr/libasr-1.0.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index e173f6527847..b80d4bb1bfa8 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,5 +1,6 @@
+AUX libgadu-1.12.2-fno-common.patch 907 BLAKE2B 22e147267c88ba1bd7fc1f289332517f7ea72f684fcaab1a74a0da0ee7ab8a1dc8e6e3fc5dd9853e22c11e326c65d08ff26a6f6fe85d44843398b6d574cbf629 SHA512 f4179768b86b80d71b6ede4608bbb598f7ec2d9d5e901d925436faea997ce23358707910a9b4f7adc1f290c369d2ae664f74f96b01de35e8220e96a79c5c26b7
 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 1292 BLAKE2B 40404179c96488fed718be19f910d1829a14b46faaf3450c65fcd42d7b590bc060bc772999d8153f67a61bcda31e413a934f599de47ba9aa767b84c307d3b3e4 SHA512 441fcacc738c922f50fae46c0b12baf43a5cbea937f401ad73978e248906ad48de4a0ddf8f5406bf97a13904919708070b602057fc1e06211ba64027483583e2
-EBUILD libgadu-1.12.2-r1.ebuild 1120 BLAKE2B dd5e351f16b7939df2ea3df069bce09c3753a70623740bfa91c1517e6ed2d56ae71841872ce6831a807e68727beae0dd343cff23f59273ea13e282769f84c21c SHA512 be04f5871e20b5d1bb2c05972e7f1e469a4a42c0b8afa2ab205424061e220df0d7baabaa27e3a809d012ba287c8b279e7fad0e599f0a611d9cf788ee20e02731
+EBUILD libgadu-1.12.2-r1.ebuild 1167 BLAKE2B 37e131e94ebd3160681005136154a834b2d70fa4bb35152bae5e44b299e8576ea539044445caf89ed017df2093cedb7ad44505fe43c5bf43381086e51779e9fa SHA512 59a72cd119e8c22091a8b7e7f728376e31f826291fefd3441955a84a625897659658ce199991e86d7989e2a3814f58c15ea87f684176efa04e2297346e99e98d
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch b/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch
new file mode 100644
index 000000000000..2eafd3748ee4
--- /dev/null
+++ b/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch
@@ -0,0 +1,30 @@
+diff -ruN libgadu-1.12.2/test/manual/userconfig.h my-libgadu/test/manual/userconfig.h
+--- libgadu-1.12.2/test/manual/userconfig.h	2017-01-21 18:57:03.000000000 +0100
++++ my-libgadu/test/manual/userconfig.h	2020-02-09 03:18:29.040560145 +0100
+@@ -19,16 +19,16 @@
+ #ifndef USERCONFIG_H
+ #define USERCONFIG_H
+ 
+-unsigned int config_uin;
+-char *config_password;
+-unsigned int config_peer;
+-char *config_file;
+-char *config_dir;
+-unsigned int config_size;
+-unsigned long config_ip;
+-unsigned int config_port;
+-char *config_server;
+-char *config_proxy;
++extern unsigned int config_uin;
++extern char *config_password;
++extern unsigned int config_peer;
++extern char *config_file;
++extern char *config_dir;
++extern unsigned int config_size;
++extern unsigned long config_ip;
++extern unsigned int config_port;
++extern char *config_server;
++extern char *config_proxy;
+ 
+ int config_read(void);
+ void config_free(void);
diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
index 6172f02348e2..87d39897c0d9 100644
--- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc ssl test threads"
 
 RESTRICT="!test? ( test )"
@@ -33,6 +33,10 @@ RDEPEND="${DEPEND}"
 
 BUILD_DIR="${S}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fno-common.patch"
+)
+
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_prepare() {
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 8055e6c4f010..8421795edb77 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -3,7 +3,5 @@ AUX liblockfile-1.06-respectflags.patch 665 BLAKE2B db252cf9257548591e0171167ff0
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 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 1214 BLAKE2B 6ff0fc868cd36467903bb332460d6eefc2f9f73a24e2d6ea9ce6ef170aefca91dbc7d3092253e700de26c3318de3223009e45f47603a121d72f35e1a341ab27d SHA512 47266158c92b618968d9bdca784e24eefc8666bcd34d5b8db11595ef4034097d4dd4f932a963222ed9e1209a9a85ca92ed38b1815ac5c16097ba4f872040d788
-EBUILD liblockfile-1.16.ebuild 1333 BLAKE2B 80ef3d0fd89374e8fc4d9f9655bf1dd20d440941881f865cd2fbad0ad05f930970a071ac38bffec0f1c8fbe80e496abc962b6581f45a8a1d2929853c026e8031 SHA512 c3d6a25d23b5315ff69caef8f7812ec8f7569157a27489fa63519e40beb354698cee5d1e042f628d1cc10de632d94f0a1cb443c8ffd58e7cd60c644f4e77c91b
+EBUILD liblockfile-1.16.ebuild 1324 BLAKE2B c17a0b473e0e17698e250dc00409b1982c59f0bc3f981950b420cfb8dfd343f82b5aa7ae8de2230d675669f726a852aaa4d18d644f868e2ee3a5baa815887bbe SHA512 f9824db2a7d500a3f98d98e8300f1bc4f389610d21a71a4faf159040a33d37614b847a69e4a04b0669e43b4241fc3b2610a6aee9dcd91d5e4a0ff59316a698c3
 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
deleted file mode 100644
index eeb84dd9633a..000000000000
--- a/net-libs/liblockfile/liblockfile-1.09.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib autotools user
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/"
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-pkg_setup() {
-	enewgroup mail 12
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.06-respectflags.patch
-	epatch "${FILESDIR}"/${PN}-orphan-file.patch
-
-	# I don't feel like making the Makefile portable
-	[[ ${CHOST} == *-darwin* ]] \
-		&& cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	local grp=mail
-	if use prefix ; then
-		# we never want to use LDCONFIG
-		export LDCONFIG=${EPREFIX}/bin/true
-		# in unprivileged installs this is "mail"
-		grp=$(id -g)
-	fi
-	econf --with-mailgroup=${grp} --enable-shared
-}
-
-src_install() {
-	dodir /usr/{bin,include,$(get_libdir)} /usr/share/man/{man1,man3}
-	emake ROOT="${D}" install
-	dodoc README Changelog
-}
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
index fa8d31db2fb9..148796e9abed 100644
--- a/net-libs/liblockfile/liblockfile-1.16.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools toolchain-funcs multilib
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Implements functions designed to lock the standard mailboxes"
 HOMEPAGE="https://github.com/miquels/liblockfile"
diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest
index 649831b6beda..ae128f1c507d 100644
--- a/net-libs/libmrss/Manifest
+++ b/net-libs/libmrss/Manifest
@@ -1,3 +1,3 @@
 DIST libmrss-0.19.2.tar.gz 375238 BLAKE2B e01682d9223d3f2cea444b5e6b5e9b6e476782ef0ae1c4a85d5ea8e8e5383d5317f2d35eff93347e6b5fde0778060c212b8e489915f50b20f098f7e94805e148 SHA512 0997ced472b767174977b7623484c57bfd0b901a9650cb7f7738ad7393153752ebfc1f717e2eacfb5f7eb319140599128d73de7e095327ee089cd1f85ab42b24
-EBUILD libmrss-0.19.2.ebuild 966 BLAKE2B 8007da172df5ac7162eafb5b74cc0813f20d90c457f46484f5237480565a3cf7b766143ee0c6f21c7d68d48e6411934ee71466c692b6134c77f9345a1ed62309 SHA512 512f9d4da1d84aefc3581a86e7b593f8a1b07c525d469b8c053c83c0f8e32555c8791717f906411f2fc45d477f8ef4f2fd1a3d96fc194ac4dafca0af0b033f2f
+EBUILD libmrss-0.19.2.ebuild 978 BLAKE2B 0556b62d1b1e86104b3181fc5b92d72ba9d3e60e1010e2cc654eb5e97475d8f72170578dff6c0030c68ed746ff92ee190d4738d416f57ea065e9a51138c733da SHA512 0fa630105a7f356ffb490147d6415a641f3df9416fd9dce29d483ed0586254341f7c38d06adee1a27a4871d93ce63561c20ce8e190a740011ff0701578ba29d9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libmrss/libmrss-0.19.2.ebuild b/net-libs/libmrss/libmrss-0.19.2.ebuild
index e57dc41abcab..f4ce0a9497b3 100644
--- a/net-libs/libmrss/libmrss-0.19.2.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 DESCRIPTION="A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams"
 HOMEPAGE="http://www.autistici.org/bakunin/libmrss/doc/"
@@ -10,27 +10,31 @@ SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
-RDEPEND=">=net-libs/libnxml-0.18.0
+RDEPEND="
+	net-libs/libnxml
 	net-misc/curl"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 # TODO: php-bindings
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_compile() {
-	emake
+	default
 
 	if use doc; then
 		ebegin "Creating documentation"
 		doxygen doxy.conf || die "generating docs failed"
+		# clean out doxygen gunk
+		rm doc/html/*.{md5,map} || die
+		HTML_DOCS=( doc/html/. )
 		eend 0
 	fi
 }
@@ -38,14 +42,11 @@ src_compile() {
 src_install() {
 	default
 
-	if use doc; then
-		dohtml doc/html/*
-	fi
-
 	if use examples; then
-		insinto /usr/share/doc/${PF}/test
-		doins test/*.c
+		docinto test
+		dodoc test/*.c
 	fi
 
-	find "${D}" -name '*.la' -exec rm -f {} +
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index f5ade29a5e4e..70c014fd0061 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -12,5 +12,5 @@ DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42
 EBUILD libnatpmp-20110808-r1.ebuild 722 BLAKE2B bdace565e17460df38361f3b7e7bbe6c83be72d0a7b863b0f989108aa02196c175b2fcc7a454b08d21992924de6a458bd8ed750e407d8bfdb91c357e2e04a9e4 SHA512 00fc715e7b04c7ca32ec24bb6fdfb72592745edd2a4ad77c27248d908b567da26b91c108d655b996e24c10f3ed9d383cf72735ec245921683e3625aea3f9840c
 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
+EBUILD libnatpmp-20150609.ebuild 821 BLAKE2B 7ad1cd8505ff19aac6a04b534ef21bbc9360301b877186facb28dc8206a6dca818e4158b4faeb0e9aa76faa652ee31e7af1efeeccb57acdc38691f1d0091de0f SHA512 94f34a2b69d5964b047ad7262c9fa3daf05aed0444d703e66108a65838d54af7fb12fa6c06291f13ab62a9cfc73a9444f190328ab8ea92f88fbb14b414299a49
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
index 95c1b853efb5..dacd2137cb04 100644
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils toolchain-funcs multilib
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="An alternative protocol to UPnP IGD specification"
 HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
@@ -10,19 +11,21 @@ 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"
-IUSE="static-libs"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/respect-FLAGS-20140401.patch
+	"${FILESDIR}"/respect-libdir-20120821.patch
+	"${FILESDIR}"/remove-static-lib-20130911.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS-20140401.patch
-	epatch "${FILESDIR}"/respect-libdir-20120821.patch
-	use static-libs || epatch "${FILESDIR}"/remove-static-lib-20130911.patch
+src_configure() {
 	tc-export CC
 }
 
 src_install() {
 	# Override HEADERS for missing declspec.h wrt #506832
-	emake HEADERS='declspec.h natpmp.h' PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+	emake HEADERS='declspec.h natpmp.h' PREFIX="${ED}" GENTOO_LIBDIR="$(get_libdir)" install
 
 	dodoc Changelog.txt README
 	doman natpmpc.1
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index b1c2429ad278..c701d0ee3fb3 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,4 +1,4 @@
 DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41
 DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104
-EBUILD libnfnetlink-1.0.1.ebuild 1491 BLAKE2B 4518555de24016fbdf500c799889ba3b4dd7b0db9f42e9175c159a80462803be49f2b603324b760f0ae7119af997a77be7e5bccaabaca4e18e98dd217793b8a8 SHA512 b50e44bcd24d5f6d0f5551242c2a6fca5ffcdeee022e94b9b218ba29ecc3974dacab7b1850b07bbfa3e57684fc0a33366baad1ce440ce674a56a4557d33a781c
+EBUILD libnfnetlink-1.0.1.ebuild 1435 BLAKE2B 391283df9b28513d35a3a96e1a6265aafcf05c1e689965a70c7d60778f1e704c0dc1195353bc1b1b00d21da797749e7c0585de9c21949b4ddb2d6740a84fe0e4 SHA512 e88cb62dcd0bfb487c5ce72d05cc7d688ab52508953d027be2be50200f7d0e6363a495eeac8d44cd8cb920e61bf2e69a515e0932289c381bd9fa9fdc21da9292
 MISC metadata.xml 364 BLAKE2B 688c9d5bb9c4fe16699fd7535d4201c069573e833f805a8321a30aed5d51cc988439d463d9b780387c641bdf477798673fdf3a92153b9f61760f5de79cad3843 SHA512 cde7260e5a76b9e921692fd265f3e5da028492bb920db58ef3b12dab29cfa402cab322b4f5f48f1949e37941a6d6065039f371861e5fa7fd1de56feff62c97bb
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
index 7f4eb46d560e..26088b852aa0 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit linux-info eutils
+EAPI=7
+
+inherit linux-info
 
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
 PATCH_BLOB=04aef8a4dedf267dd5744afb134ef8046e77f613
 PATCH_FN=${PATCH_BLOB}-musl-fix-includes.patch
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
-		 https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}"
+
+DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
+HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
+SRC_URI="
+	http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+	https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE="static-libs"
 
-DOCS=( README )
 PATCHES=( "${DISTDIR}/${PATCH_FN}" )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
 pkg_setup() {
 	linux-info_pkg_setup
 
@@ -44,10 +41,12 @@ pkg_setup() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
-	prune_libtool_files
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 57a2d2ef3811..8b248b19d90b 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,8 +1,5 @@
-AUX libnfsidmap-0.19-getgrouplist.patch 3459 BLAKE2B bf58f1234c9b306643698250c0d5cc9ad4290a22582e18af09b91d9c9d7b49cffc959c77758ab1c7d1af0be9401cef2c0f5c1127aceb9a175738236dfb6e0d58 SHA512 a778620b51158b07b7224ca010ba199feba85af7fc087bde65cfb8d2660bd7646c08d303a39d2af525b3a449694a60c3c35fe3b696cb0354b5d74423240a9e8d
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
-DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.25-r1.ebuild 1223 BLAKE2B ae79a23338129b33a90dbfb413e7e79e7c7197ce49cdcbcab99d85e2fbedf3a3be6d554e599c1efd43c91554d21cd57da0d0f06762cd33737491100b3b2fc71b SHA512 6755869f3548ddc644923c8d0bb2fab4ddf49eff2132ee3947ee887e4453cb0d0fa4313c348082f8ad427d3103f8b4166768b423f278c607b969e0fb5452ab29
 EBUILD libnfsidmap-0.27.ebuild 1344 BLAKE2B 564b19b40ec929cf5935b4f7dab0b646df7f684096e1f67c404772f333fe8f73d45608d102605d1eacdc90cde1a9f97e75fa751e810cfe564286975d751c8e2f SHA512 571afccadb16609314c71ec1ee0bf1d6624d13f6215660910add92af96fa0c278d491b56cc3372376077639d3f6c60c9f7b573df89b9785c0a7ffe88b01d4de0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
deleted file mode 100644
index 0d5d367b95b4..000000000000
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/169909
-
---- libnfsidmap-0.19/configure.in
-+++ libnfsidmap-0.19/configure.in
-@@ -38,7 +38,7 @@
- 
- # Checks for library functions.
- AC_FUNC_MALLOC
--AC_CHECK_FUNCS([strchr strdup])
-+AC_CHECK_FUNCS([strchr strdup getgrouplist])
- 
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT(libnfsidmap.pc)
---- libnfsidmap-0.19/nss.c
-+++ libnfsidmap-0.19/nss.c
-@@ -49,6 +49,8 @@
- #include "cfg.h"
- #include <syslog.h>
- 
-+#include "getgrouplist.c"
-+
- /*
-  * NSS Translation Methods
-  *
---- libnfsidmap-0.19/getgrouplist.c
-+++ libnfsidmap-0.19/getgrouplist.c
-@@ -0,0 +1,88 @@
-+/*
-+ *  getgrouplist.c
-+ *
-+ *  if system does not provide the non-standard getgrouplist, we will emulate
-+ *  it via POSIX standard functions
-+ *
-+ * Copyright (c) 1991, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#include <sys/types.h>
-+#include <grp.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#ifndef HAVE_GETGROUPLIST
-+static
-+int
-+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-+{
-+	const struct group *grp;
-+	int i, maxgroups, ngroups, ret;
-+
-+	ret = 0;
-+	ngroups = 0;
-+	maxgroups = *grpcnt;
-+	/*
-+	 * When installing primary group, duplicate it;
-+	 * the first element of groups is the effective gid
-+	 * and will be overwritten when a setgid file is executed.
-+	 */
-+	groups[ngroups++] = agroup;
-+	if (maxgroups > 1)
-+		groups[ngroups++] = agroup;
-+	/*
-+	 * Scan the group file to find additional groups.
-+	 */
-+	setgrent();
-+	while ((grp = getgrent()) != NULL) {
-+		for (i = 0; i < ngroups; i++) {
-+			if (grp->gr_gid == groups[i])
-+				goto skip;
-+		}
-+		for (i = 0; grp->gr_mem[i]; i++) {
-+			if (!strcmp(grp->gr_mem[i], uname)) {
-+				if (ngroups >= maxgroups) {
-+					ret = -1;
-+					break;
-+				}
-+				groups[ngroups++] = grp->gr_gid;
-+				break;
-+			}
-+		}
-+skip:
-+		;
-+	}
-+	endgrent();
-+	*grpcnt = ngroups;
-+	return (ret);
-+}
-+#endif
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
deleted file mode 100644
index e069cf37e05a..000000000000
--- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils multilib
-
-DESCRIPTION="NFSv4 ID <-> name mapping library"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ldap static-libs"
-
-DEPEND="ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	!<net-fs/nfs-utils-1.2.2
-	!net-fs/idmapd"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
-	epatch "${FILESDIR}"/${PN}-0.21-headers.patch
-	# Ideally the build would use -DLIBDIR=$(libdir) at build time.
-	sed -i \
-		-e "/PATH_PLUGINS/s:/usr/lib/libnfsidmap:${EPREFIX}/usr/$(get_libdir)/libnfsidmap:" \
-		libnfsidmap.c || die #504666
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable ldap)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins idmapd.conf
-
-	# remove useless files
-	rm -f "${D}"/usr/$(get_libdir)/libnfsidmap/*.{a,la}
-	use static-libs || find "${D}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest
index 558b7511b50d..da55bd199f9b 100644
--- a/net-libs/libnxml/Manifest
+++ b/net-libs/libnxml/Manifest
@@ -1,3 +1,3 @@
 DIST libnxml-0.18.3.tar.gz 361977 BLAKE2B babe5773f102889d52d0d63511984201e220205925b703221559cf73c8e380b78b3788ff48bdc2da382746bb95acf4c9a70c69d689c4fd7db3be4bd65f44000d SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a
-EBUILD libnxml-0.18.3.ebuild 884 BLAKE2B 3dadc1abbff63d0c3431337c585e7bb6df499feee1e2d27e5f30163f3777269c1aa1940e5476b6e1f95ad5057a8cda4dd97122464accf2729a17fcec7f15a068 SHA512 c3a311f4fc10e5842f867154bed23ea4ec495a29763cfd17f24a25981b520469256fe1e0ac63d5b75114394dda5bafdf4162668bbc60ffe66fdc7b28a96277fe
+EBUILD libnxml-0.18.3.ebuild 912 BLAKE2B 4d3729f8b862c08a2d6d06ed672379e0a30296548e881432fd536505f73040474faa5381fa7c6e9bf0fda6f25c9a0ebedb97335c7b684631694b3a8ddf7b3098 SHA512 934c9f1d41f0e1215b9f55a4953972234821c639e6ac3a09dfa2b2614153d5bdbf3d1f542e5ea6bf321812eed1045bc9a3d0d0f8bd5037171c7720b985ae05b8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libnxml/libnxml-0.18.3.ebuild b/net-libs/libnxml/libnxml-0.18.3.ebuild
index 259c8a928c03..8d4062c2bd02 100644
--- a/net-libs/libnxml/libnxml-0.18.3.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 DESCRIPTION="A C-library for parsing and writing XML 1.0/1.1 files or streams"
 HOMEPAGE="http://www.autistici.org/bakunin/libnxml/doc/"
@@ -10,23 +10,25 @@ SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
 RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_compile() {
-	emake
+	default
 
 	if use doc; then
 		ebegin "Creating documentation"
-		doxygen doxy.conf || die "creating docs failed"
+		doxygen doxy.conf || die "generating docs failed"
+		# clean out doxygen gunk
+		rm doc/html/*.{md5,map} || die
+		HTML_DOCS=( doc/html/. )
 		eend 0
 	fi
 }
@@ -34,14 +36,11 @@ src_compile() {
 src_install() {
 	default
 
-	if use doc; then
-		dohtml doc/html/*
-	fi
-
 	if use examples; then
-		insinto /usr/share/doc/${PF}/test
-		doins test/*.c
+		docinto test
+		dodoc test/*.c
 	fi
 
-	find "${D}" -name '*.la' -delete
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index ccc49f58f82b..33c2025dc1da 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -4,7 +4,7 @@ AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
 EBUILD libpcap-1.9.1-r2.ebuild 1891 BLAKE2B 17126e5f18ea988e73e2bd47643bbb419f783cfe0e6d59cd1f45b1ffc0a4a83abe24ddb2d5d0a9332c1a35a8531708271dec8b43a30efa5f2ba99ae9529f2eda SHA512 e7207fd3b6727973d6c3fa766fc140e3117cb5ee936abad08ee36b9557f1d8e8a43be677e47cc1cbd8a5c9b344f17d29725232418e7bbb1795c9f61bb6aab0fe
-EBUILD libpcap-1.9.1-r3.ebuild 1873 BLAKE2B cb06d4694a9bcba570ebddbb4426e86f1c6e8f56b85dd498408badfdddb7a44af901be602718bf8dd34f8072dcdb390fe8713d1c23bc922c428a30682c022418 SHA512 2141fced1a48f22288aa712cb69229d1fb5e5583c9bdf274c93bf48dca556f043b757d53d331195e75c6097153c46f210ae79f0a347d3a059eb562f733477614
+EBUILD libpcap-1.9.1-r3.ebuild 1891 BLAKE2B 73ecb606bb002f7fc47e79982d6017d6884fa08cbcb9ea9ab794a111627081e8203bfe679fdc111fbbcef56d49be7e94f44326d367f0241cc8faccbfa492a7e4 SHA512 88f9a0d18dd55f037068b26b5ce51ba5747dd3d1096bc32807cee6125e25c640f66174fef02dd3c543d1ba7d16c0e24df0c09babe00c09a7a7228733940dddff
 EBUILD libpcap-1.9.1.ebuild 1763 BLAKE2B 139c2018a2f15097971d814b0a85eff10fc24d9381472fbb0e1481bcefb789376dd74be86bc220e1461bb8351e86c66cf570e815c08e4997ec1da852fcfbacd1 SHA512 a24b353553930a591fb0aa78e08b161132a6fbab1e1c0b1b5038cf4c5762c8b22b157183000360826660addc40e6afc969be15ee254f78e736b4f8ee8cba1ccd
-EBUILD libpcap-9999.ebuild 1661 BLAKE2B 306757d0d320e1da01ded053903966f50375f46c14e8d2ea1b9c0fe9282f9b0bee25a8ce8fc9eb5fec2c0fe21d1b3b0d93a5176e71bbc700b7f00ea9f83845d8 SHA512 01caa0d110f040593bb54480ad8b2605105a5a9408571ac35a4ef66ab2cfaf0b3bb40f3777b87d0956895be61d412f87a97af2dcc3ffaba2d0d0c467fed88254
+EBUILD libpcap-9999.ebuild 1689 BLAKE2B fe3e9048f399aa9fccd6d70bc15522e103b59277a69bda73c72d106b9a5451d793d9bf4ebbefdf13071d3488ae0b715432f15958bda5f167b8da1587e7257766 SHA512 6e2c1bff6a7519578a17035b17460935bee69b3521141e2848a524b4af3d9e3dd02cc3afbf4f16096b5e9bbbb53f4d5cc6209a61713958af8d35e15d3e6d7e75
 MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index 0e379a44fc38..c3c84c594222 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index b8aa26910221..6ff5bf8f081d 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A system-independent library for user-level network packet capture"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
 HOMEPAGE="
 	https://www.tcpdump.org/
-	${EGIT_REPO_URI}
+	https://github.com/the-tcpdump-group/libpcap
 "
 
 LICENSE="BSD"
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 970cb8328c6c..678155aba690 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,15 +1,6 @@
-AUX libpri-1.4.12-multilib.patch 2592 BLAKE2B 3a460e16340c241cd3c40f7e5fd9aad10e8af3cc8ee2b832421c23dff697619b06512a8af0629704fa3b49619f59dab0bff2e48f03ddd996f99f85b7359ed4c1 SHA512 fc6fb3fec61b0c18b16f35d78065c9d17b2c579e2a7fc6d93df2b25937aa5b056016022e77a7001a12b38ca1d96b6700b72ac37ea52bdd32cf135d7ec7d8670a
-AUX libpri-1.4.12-respect-user-flags.patch 1694 BLAKE2B a28cc1fe446d9928d4e3af4b29371da65a08551183daf0b16433e92cc12b501047d420433ec665e875580bdfc2f513c1cacdc4f553e896ae153f6b5941bfb33b SHA512 bd72c53cdc575c74b07cc32d5f4f4cbf9b49e43a97b3a82a96c2fe85e4c2b4529eec27adf1d3f8af5fcc9ac16e3636af5256dd7461b2adec7c4e3db5fdee4ec6
 AUX libpri-1.4.13-multilib.patch 2541 BLAKE2B 082b9e44d102ddac090faa2efebb9047ed469d762ea00f4836ba131ced6041b0e6f03a7a124797d637df90c9b636202ca90d3d670af63a6e746a871b748e5a28 SHA512 7e6b43e64c5a4fd791090d3b20008a2bc1b9deeedf613ef6e72ec6b5dc105449705bedac5f4628d9d53963ae9649ad22480daa114de40f83854d045c2f3d9247
 AUX libpri-1.4.13-no-static-lib.patch 1252 BLAKE2B 07df96fe923d1e95eaa9041239e706b7fd6043ca8012a74c79b900b00f9a98414812d50b5a6b26acee1bc5b382831ed11bf5636ec6fb4807163017d62f687e9c SHA512 3d057a8bc1401e4580dcdbb401c697cc25117b8ab9fc4feedba39bd980dc9745423eae7cc75fe48c3684b07459d0f5de11717020d3e7726ca89de7c6a8a3861d
-AUX libpri-1.4.13-respect-user-flags.patch 1354 BLAKE2B 68737c732ea8b31a6ee29dde627533317c0cdd4580d78f5e9bb305840ffa63f558e81f1a22a84bdeeac7c5bc3ac32328a911e6f7e3f38a4b2eecfccbbeeb6666 SHA512 6b6695a3e16de652c7dc05a1fa95948498d03901c6e106cbedddc2681b7b0a59d3567c5161539e397f3e1759be682537e57712e24b771a55c59f6bdec152440f
 AUX libpri-1.6.0-respect-user-flags.patch 1626 BLAKE2B ec91c7cb1b2e2cecc8f97dc9ff2275527372e670ccb23f2daa3339fdae67aa4f065fc5e5dfa224710fb32e271cf2f6279c44fe999040d13b954418c3627d63e5 SHA512 69bb194721741613ec9e4c6da9d19154dfdb2ed56b2b964e09e888bd0dedd104501f3a51f0bb57587d1c15dafeeacf790ea122bc1c2a8edfeccb2f7d9252519e
-DIST libpri-1.4.12.tar.gz 339669 BLAKE2B ff34c4167ec0c974c6a00b3039a97a55dcce8dfec2db1bb6db62fccd82848c47081d31a3dad855302f8c72c0b089b31f1bc41bc7d39654dcc1c24f7d3a515e93 SHA512 54933b9fc23a09c71a1c9ce40d648fc90e6900043ab04f097ee3d01918b46f65462337e98e1b2c1917e36becdccc871bd5029dedc522020ea731c29172ccb1fe
-DIST libpri-1.4.15.tar.gz 338633 BLAKE2B 0497797e4d799b07e073c93e224f5c8d5acc3b130ee87e0ced15d7d9d3315d77afa1562d0f477c6d224d618fa15ed68b05c26e2131b12858da19a1486802175f SHA512 2737ad404440a0c809bf0bb0e406565757fe850040911561c2e5e64f4c49b02af69db0d23dac322dda354583bca0ced88becc07017e686a848b69c8f152fb9d4
-DIST libpri-1.5.0.tar.gz 340683 BLAKE2B b7bde7a81655c30e491e6a0311979c614c183e5909d1f6a875277ffa33e758b63b69f0817c833899e231c53d3f18296981a610276beaff203691011ae17bcaeb SHA512 194e4b525e77a28665525e43a2d105d542fab242d3d21951574668bf4d14d90adeb4e0b18384eca1628d75a16d89c8b1e6577e30542d77dd5dfd3d6f4d60ed3a
 DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5
-EBUILD libpri-1.4.12-r2.ebuild 689 BLAKE2B d6b484363c6a9680ded3a370be977ba3fff68d582c6dca4dc2bac86b0ee6f5c945fd055920d623a5047a77c1ec40133a5e8fe87aeca023ea971f05caad2ab232 SHA512 ec5454f729f1a47fb821827c8ad305422ec3b17825e46f7875f1df4ad3d91614da98df089c969ccc9aab3336c927e682f4fb0ecaa84836225662bc21cbf0ca4e
-EBUILD libpri-1.4.15.ebuild 721 BLAKE2B 1a031b8ea00603207c00725cbb183eee713808125e9e44b81bb4ebea343852dfb46b193249798dec9292530554e3df28e9254ba93a990cd86a371b9c9e029a2b SHA512 15eed20f73274b14855239451a0e95771aa0ecbdd256e8175006e7968c7bd9fab7683193c361fa638a6fdfa580cb3feef9350469a9dc2c688695bd70f2abc769
-EBUILD libpri-1.5.0.ebuild 674 BLAKE2B 67ac07eac4429c8068517e7253ac974f672d2e1179a8ed2626c3a64c0c8fe1f4c5cd1821fd228c6c743adfa143cf87c0b8019ee63b0bc07c619023a02bc0206d SHA512 fc3248e584238a16baace740c749616a11bb2d1b170c7543d74d995c4d53fbb3fe0473da3d988305013ee4055a858108167a3cdeddc1d8e29ae47b600c32bcd3
 EBUILD libpri-1.6.0.ebuild 734 BLAKE2B 71e6d9b61b87df3ec13166d8a217a4f7ae9a5fd8b3d5144b2e6a2e45f47ecd51e20025a91d79390f55893fb96aa73ed62519f617d9f4e959db5a0525e0989715 SHA512 7cffae1730136be08fb3757a6d60ce5e8f3898c84aaa0f8b85f8b4b708af03e4b257c0a59cea0f409ce8b928e108dd7509b537fdec18eb0af39c352d435f2006
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/net-libs/libpri/files/libpri-1.4.12-multilib.patch b/net-libs/libpri/files/libpri-1.4.12-multilib.patch
deleted file mode 100644
index bb30900a0ca5..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-multilib.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- libpri-1.4.12-beta3/Makefile.orig	2010-10-07 06:00:04.000000000 +0200
-+++ libpri-1.4.12-beta3/Makefile	2010-11-23 22:04:59.884448930 +0100
-@@ -96,7 +96,7 @@
- CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
--libdir?=$(INSTALL_BASE)/lib
-+LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
- ifneq ($(findstring Darwin,$(OSARCH)),)
-   SOFLAGS=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
-   ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
-@@ -168,27 +168,27 @@
- 	fi
- 
- install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
--	mkdir -p $(INSTALL_PREFIX)$(libdir)
-+	mkdir -p $(LIBDIR)
- 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
- ifneq (${OSARCH},SunOS)
- 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
--	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
--	#if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
--	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
--	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
--	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
-+	install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
-+	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
-+	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
-+	install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
-+	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
- else
- 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
--	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
--	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
--	install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
-+	install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
-+	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
-+	install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
- endif
- 
- uninstall:
- 	@echo "Removing Libpri"
--	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME)
--	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
--	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
-+	rm -f $(LIBDIR)/libpri.so.$(SONAME)
-+	rm -f $(LIBDIR)/libpri.so
-+	rm -f $(LIBDIR)/libpri.a
- 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
- 
- pritest: pritest.o
diff --git a/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch
deleted file mode 100644
index dd5b28587db9..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -uNr libpri-1.4.12.ORIG//Makefile libpri-1.4.12/Makefile
---- libpri-1.4.12.ORIG//Makefile	2011-07-27 10:37:34.247793740 +0100
-+++ libpri-1.4.12/Makefile	2011-07-27 10:38:54.183790788 +0100
-@@ -90,7 +90,7 @@
- 	rose_qsig_mwi.lo \
- 	rose_qsig_name.lo \
- 	version.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
- LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-@@ -124,20 +124,12 @@
- 
- PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
- 
--#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
--#This works for even old (2.96) versions of gcc and provides a small boost either way.
--#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
--ifeq ($(PROC),sparc64)
--PROC=ultrasparc
--LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
-+ifneq ($(CODE_COVERAGE),)
-+  LIBPRI_OPT=
-+  COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
-+  COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
- else
--  ifneq ($(CODE_COVERAGE),)
--    LIBPRI_OPT=
--    COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
--    COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
--  else
--    LIBPRI_OPT=-O2
--  endif
-+  LIBPRI_OPT=
- endif
- 
- ifeq ($(CPUARCH),i686)
-@@ -216,7 +208,7 @@
- 	ranlib $(STATIC_LIBRARY)
- 
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
--	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
-+	$(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
- 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
- 	ln -sf libpri.so.$(SONAME) libpri.so
- 
diff --git a/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch
deleted file mode 100644
index f10303d80590..000000000000
--- a/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- libpri-1.4.13/Makefile.orig	2012-09-26 17:46:23.000000000 +0200
-+++ libpri-1.4.13/Makefile	2012-10-10 08:11:24.000000000 +0200
-@@ -67,7 +67,7 @@
- DYNAMIC_OBJS= \
- 	$(STATIC_OBJS)
- CFLAGS ?= -g
--CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-+CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
- CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
-@@ -107,17 +107,12 @@
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
- #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
--ifeq ($(PROC),sparc64)
--PROC=ultrasparc
--LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
--else
--  ifneq ($(CODE_COVERAGE),)
-+ifneq ($(CODE_COVERAGE),)
-     LIBPRI_OPT=
-     COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
-     COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
--  else
--    LIBPRI_OPT=-O2
--  endif
-+else
-+    LIBPRI_OPT=
- endif
- 
- ifeq ($(CPUARCH),i686)
-@@ -196,7 +191,7 @@
- 	ranlib $(STATIC_LIBRARY)
- 
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
--	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
-+	$(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
- 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
- 	ln -sf $(DYNAMIC_LIBRARY) libpri.so
- 
diff --git a/net-libs/libpri/libpri-1.4.12-r2.ebuild b/net-libs/libpri/libpri-1.4.12-r2.ebuild
deleted file mode 100644
index 26dc7714dac2..000000000000
--- a/net-libs/libpri/libpri-1.4.12-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.12-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.12-respect-user-flags.patch"
-)
-
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	use static-libs || find "${D}" -name '*.a' -delete
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libpri/libpri-1.4.15.ebuild b/net-libs/libpri/libpri-1.4.15.ebuild
deleted file mode 100644
index ce6000921355..000000000000
--- a/net-libs/libpri/libpri-1.4.15.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.13-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libpri/libpri-1.5.0.ebuild b/net-libs/libpri/libpri-1.5.0.ebuild
deleted file mode 100644
index 4cc9c20b37e5..000000000000
--- a/net-libs/libpri/libpri-1.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.13-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
-)
-
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index f397f5dc8902..f6368443d4b2 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
-EBUILD libpsl-0.20.2.ebuild 1471 BLAKE2B 9af489487b1e22a454b4415f44bd0fe9e1802b4bdf1746aac66a4eb449839c39ac49f03d62b95c2567a67bc9ca515d7a5a11a8f5f9d13c0d23506189057c1fb7 SHA512 021bfebc1b92093254849da5049b358225b0cebfd3bcf91267287010db72fec4bf12e09641501ae086c69a50f0181af95bca354b289eca364e71932beea29798
-EBUILD libpsl-0.21.0.ebuild 1480 BLAKE2B 592b61af2d34ed4e87b579258f62f748aa004b5cf85fe14d3f2d7043d401398f306c0a3e9b2449f7f099a36a1edd380fc4a935fabfac2139a386c8d121bf7fb3 SHA512 411c42c0d1ed1e73cc824e1d8afb660ca3e58166e2aed92278053cdc5961cbe386051af1976552ae57db5f152815a7164e94aa1dce1960e33ecb8a6821cd906a
+EBUILD libpsl-0.20.2.ebuild 1465 BLAKE2B c4a6222de8dfb1bbe040d557fa5993ce0e4589932b2ecbf2b8dd2555fc34d3ac52c7be7107907c99c69e2eb72ee4641238c75667a714e945a87325b36e12250c SHA512 51bfda0c75541704bc96d684e6a588c87f858fc86f27a005e8d0a59b31a7b16a8f893acc5a4a3a75261244262dd5e3fb6109d1ce754ecbae8c65711558a3f486
+EBUILD libpsl-0.21.0.ebuild 1474 BLAKE2B 4f3b886747c4ffcd6491432ec8e9d069b41aa301d46da469bd88ec8936993ddfc4f3e44d17bae6202a10d0b931bf5666b3c506cd38ae555f776059c8b5def2a5 SHA512 7806d3f7e36d25ce63a6e6427d6664920bc0deb996701c6df4415fe2054811799a41b79a53849c6d61589c3869ed7b633ceba82596279e3951a0cc5d5da57c06
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.20.2.ebuild b/net-libs/libpsl/libpsl-0.20.2.ebuild
index dec232286541..77d9d740faae 100644
--- a/net-libs/libpsl/libpsl-0.20.2.ebuild
+++ b/net-libs/libpsl/libpsl-0.20.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7}})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit multilib-minimal python-any-r1
 
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 8d013ebe7b36..d8bdf4556620 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7}})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit multilib-minimal python-any-r1
 
diff --git a/net-libs/librouteros/Manifest b/net-libs/librouteros/Manifest
index 0c099d12d13d..edfa1325c766 100644
--- a/net-libs/librouteros/Manifest
+++ b/net-libs/librouteros/Manifest
@@ -1,4 +1,4 @@
-AUX disable_werror.patch 302 BLAKE2B 147e312a34ce604bb86e8d7048f1f715bc430df2dc7464e3da230c9033af9248c82627fbf656b5ee0dc5767ad996ff16e0064124b25d247c782a8f26d67608f5 SHA512 13cb3d720814cc9a8a6b975cf1bbf13aab5a177e05e95c8c80de637a04119045bbaf5e91d0a8b1664137be6adfa710a7d061ac8309be27657c6ba1e6593a6400
+AUX librouteros-1.1.2-remove-Werror.patch 229 BLAKE2B c1a10b121c1bd835fc97aa864af5fae7350c8c4af77ca475f7ad4a8bdf1368410fcfc7cdcdacb65ebd1e51cd6f60bdde1b0ddb054f12927e4809edede74e0091 SHA512 e46dfec5344978595de438ed210a238c9380db4b74c26d31f55bbaac75d694ddece70a60196071ebc821fa6363ec52356d39892408cf5675c29aa3a239fcc58f
 DIST librouteros-1.1.2.tar.bz2 234942 BLAKE2B e5fbb28957280798539d81fd908d9198084dbc3f15e403c7d21a3be7b0211bb2e0cc387b3e237c530454396df430dd2781d2c8184609cebd9cde906eac1288fd SHA512 b4974f84f23544276e426b94410107d24565060034423dabb49157ed2cbee8042d4d415f716fae50a757f24c87c0deab51435236a5bc1bcffe5fc888b7047fc3
-EBUILD librouteros-1.1.2.ebuild 569 BLAKE2B 12f6063b83b944e68e933739116b5c549be0b6a48eb68ea3d6c94dfb5e4c4034d0d37ef67e3f8da2ca2cf20b142d3b57ca0f99314560433eb03c02d3e2f5e60c SHA512 8a5b1a28f74ab625fd63cb4bc8bff5a8f391a035e4e2deb44abfa481891e24c61b49197b8298b52bec7bf973b14fafd0b1500f58b447a9ff80be8e140766328d
+EBUILD librouteros-1.1.2.ebuild 648 BLAKE2B e1a786e84787c9a6088b329705db0e3f5cac8f6c6df4655212b8a3ad52cbeeab743e9e45de3135473ff5dc47435b52e94902178675fcf589ee4f73c02c403539 SHA512 0fd3017e5510aa77db1b710c1e3e54c75e135e2bbbd9d4d7f5f536151d39dd29e1b6f07d589acb88f6e0dd476dbb4aea628b67ebd70a98451bfc601d918f32a6
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/net-libs/librouteros/files/disable_werror.patch b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
index 599e85b74d00..b3f005a4be3a 100644
--- a/net-libs/librouteros/files/disable_werror.patch
+++ b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.orig	2011-12-30 21:17:04.233158203 +0200
-+++ src/Makefile.am	2011-12-30 21:18:42.186354842 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -1,7 +1,7 @@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  
diff --git a/net-libs/librouteros/librouteros-1.1.2.ebuild b/net-libs/librouteros/librouteros-1.1.2.ebuild
index 9e89899c90e7..a6be5fce2804 100644
--- a/net-libs/librouteros/librouteros-1.1.2.ebuild
+++ b/net-libs/librouteros/librouteros-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit base autotools-utils autotools
+inherit autotools
 
 DESCRIPTION="Library for accessing MikroTik's RouterOS via its API"
 HOMEPAGE="http://verplant.org/librouteros/"
@@ -12,15 +12,25 @@ SRC_URI="http://verplant.org/librouteros/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug static-libs"
+IUSE="debug"
 
-DEPEND="dev-libs/libgcrypt:0"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}"
 
-DOCS=(README AUTHORS)
-PATCHES=("${FILESDIR}"/disable_werror.patch)
+PATCHES=( "${FILESDIR}"/${P}-remove-Werror.patch )
 
-src_prepare(){
-	base_src_prepare
+src_prepare() {
+	default
 	eautoreconf
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 089b3af23888..ebf15fe55621 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,5 +1,5 @@
 DIST libsearpc-3.0.8.tar.gz 48740 BLAKE2B c2743d7f03001dd971821ef72f403ad2c26aa8e2e8350e2c751e7aa3ffc2be2bcdec0adc75ef5dd23b12b31a866ff9b590f8a279616a5f5c76db0eacf225b2f2 SHA512 1f2cf9a15a004b6ddf8fc0b6a436a5db09a514cea4cec94ce9fa6ce973cd71dfc4a112e948a36ab0be61d736f1021622e46429d07de70b23c25b886d1e51c02a
 DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd
-EBUILD libsearpc-3.0.8-r3.ebuild 939 BLAKE2B d9b32b8e8fc34eeecb2a516cbdceb031a353f83d833372f4f305201b71168301df8ecefe9158a234a0abf3f2510af005b77e36b2349d0c36bce56620ac60e090 SHA512 b4b0519fff93be89506a45fdc7a76dfe31bcd5213b49a8f248506897178f24a89cc558fc7a2512bd771c981e83007623d907e98ceaec521649a7c26ce9093b36
-EBUILD libsearpc-3.2.0.ebuild 856 BLAKE2B 46963564f039d884000f558eea9a5a148bbfe7bbdfd155a1e3acc76028849464c6dba261b799e2c86e3e5c502a7acdf6a878a29c6d60076579ce3113dfaa0f89 SHA512 1b7e13cbd72cb9f61a75d5ea2bea565d2fa67d2a1e6b9be48171a20d6af3dbf0124eb5dca8a6915015470ca04efb218b6c3920d63d575895bb95f1ccb060021f
+EBUILD libsearpc-3.0.8-r3.ebuild 972 BLAKE2B c9c8ea665ac2dce2090982e10d755b9addf8c950d94ca01543aa73fef832cb765f9ee019eaf6904c6cd9209239d3680f6970c90dd1d3d7111d71ab9adc98f37c SHA512 9b6f516b7f9911f133e18b9017a2baa1b4adce76b02a53ed1804808f6822a3c44e2ede4945cbdabe45e7308cc1cdee86be6978b5d283b5cf704d8daabe4e681a
+EBUILD libsearpc-3.2.0-r1.ebuild 892 BLAKE2B edf92e0e49f00e23faf417c512cb2a37950f56c9f9603201e72c1d5e291e1e9ddae67daa7fdcccf43413e9733c329c18e1658f1847897d0a1a959d4c31b30004 SHA512 d1f78e33fcf2ba923d90405145a60958f2c678d86970dabbb5f6a8a5a192c398c8fffe5d1ab8b6f8a92014a8b1c036596f3d03b2a2bb4cb23df792ad40ec9d3b
 MISC metadata.xml 248 BLAKE2B 95ce6c164ee8faf34471896ffcaad9a285d3418dcf763f778c5f58d38f545845c46c87cb3af4f3a8d71c542b127313a909e8f7972c15f930b1fdeffdb660478e SHA512 ffe6a49d28d3659fb952d60aff92836d3d1280f24dc340985d81a5b6600abe5ed8d961bee9ed1188b83be02e547676efcc06689b89ba5484a940a47fe48ed45c
diff --git a/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild b/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
index 23605ce88036..fa39547c3c5f 100644
--- a/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,9 @@ DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.26.0
 	>=dev-libs/jansson-2.2.1"
 RDEPEND="${DEPEND}
-	dev-python/simplejson[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+	')"
 
 src_prepare() {
 	default
diff --git a/net-libs/libsearpc/libsearpc-3.2.0.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
index 3402888bd457..5ae50cbad5a9 100644
--- a/net-libs/libsearpc/libsearpc-3.2.0.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
@@ -23,7 +23,9 @@ DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.26.0
 	>=dev-libs/jansson-2.2.1"
 RDEPEND="${DEPEND}
-	dev-python/simplejson[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+	')"
 
 src_prepare() {
 	default
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 466336c6f7ae..c3c6b9eb10d3 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -5,7 +5,7 @@ AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
 DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
-EBUILD libsoup-2.58.2.ebuild 3013 BLAKE2B 1450b2256aa632d07f1e4e9ee0e9ea2e05e4e2762b0e56a90400d35f1ee8ae5008943ec9207ebb48e04519e81b561e6d8950a6aa0a9da0d9fcc8a14997f0a12d SHA512 9bb7ae42f9f740c1e50364a95d64ac90dd3055e0fc4ab48448c05af1b09cb154dc3c2f75c3792860921d05635e0878bc52e5f2edf3d49ee71a1f205dffe9757c
+EBUILD libsoup-2.58.2.ebuild 3007 BLAKE2B cc8fa9d41608878724fb64ba3f2ea5c60b93f882c3805854a329d2dbf05409ad8f1964a9ddbcbe0f8909ba770b123f63178cd1303b53403ff32b1967600e5a76 SHA512 a7dbeedcf8f44d03336a9b51f787f44d442392306b16b79a13961ff38f814a38bd5dc255b3be3849b8140c4549aee48be13d84a2e5644884c12a1b17fb5b8dbd
 EBUILD libsoup-2.62.3.ebuild 2921 BLAKE2B 6a14f5d15e79b4da02d367256edcb39f1a67c1924776fa7fecca2cfbcfaace3c432930b06836a161c899bf481ea603e78c3ae9443fe22bfe707ed855d53bf6e9 SHA512 2b759c494e6ca3b008156dbc790f4b46c9f363e107adc8873725a7dc046a748a7659fa952e82f2ce6baadee595d4ae8907d490accfa57ec943231c4d015d8e5b
 EBUILD libsoup-2.66.4.ebuild 2775 BLAKE2B 7d25d6419d78a71984c815998f0f04c4518e41845e89a7dd8c068d16df9d1be48913f2857920c2a1717b3f27f373ca714b01cd90dab626cd5fd503181b7d4d35 SHA512 fd37118f4aaf39e4ce0bea567332239676d1369f458e8b5e2ef5c06de57dce85182fd150832bd6ef5d0b069bfe3f1835a6f31065179a55c9098b5b89a075fc12
 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 9226739e9650..43389753b616 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 multilib-minimal python-any-r1 vala
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index ff183c31f18b..b695cb9b972a 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,7 +1,9 @@
 DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19d0b416f909daf15078b1461ab6724ee086d3194f6c378c305174676a3399fc3e6cb23133faaa334ac5dfc9457fb597c65dad7d36 SHA512 021fc54353fdf5063d55ccdc2057dada292bb0008fb92e93e8d94dd89f529630f290fcdc4f4d095e3192522c57fe0f0da260b5ef8e8e15a8c6ac05728f5f7160
 DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
 DIST libtorrent-rasterbar-1.2.3.tar.gz 3591081 BLAKE2B 9766a21c948997b35c6d209940a2d2cfd76b130f1a9d1f611e07d3eeb27f634a3c5eca12c92261139200084b9678913d85f6a56f98ab6894e5def761615c39ad SHA512 11a81c9f4b968ed360740553f8d856a2fad4eb2f6962f6403394e0a4a6b198ef6f04ce92d11fc6bed9aa979c84efd03fb396027dfe6603f394104b4302e04d82
+DIST libtorrent-rasterbar-1.2.4.tar.gz 3598403 BLAKE2B 7a9a6b3244137fff785d0bd82dc0b1900b9e8c673f1cf9492bbde2c8f14d0a9d4ac3e4835eb9721bb9fa388d1a5d0635f2ffeb0f2a6f5a61f4fda7f89d6a10e3 SHA512 d24901acc0f462b6ff873f9aea880bf44698165db5343e8437b1dd7d7f20dfa6e7fe1e72a44a518fff5f2167a48552ec359696bb682c82e86012737177e082d3
 EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2352 BLAKE2B b1b274c01f49cd03d919bfe038352e51db8eb4279a2454e911632e621c370a49109803e9f2eaa1e7836f885043bcd5d9ad488a564bcd93b9d2a97043d27dc9bb SHA512 f7015e3325fed2f39ccf5a4d2258b36524939237dd6606021be20e865d8d462e5b830f108cbf6e8870df0c2d2e9721a89e8b9f2d9b90c1dbdcef7a887baf9c3d
 EBUILD libtorrent-rasterbar-1.1.14.ebuild 2354 BLAKE2B c934e84456e6a15d3dbc7298bb6a04f7a2577d12f853053675d47cd38b280b5f71808e5b9153c7a3b705574bfe01f82b6f28280230f721061f04317bc6ede5af SHA512 ced4871e896e046b29de877c321da6f91f31e205f8df9ae5b18322ee827a97001f30d4d8810478ce5f7262b8e3934109eda549a0fd5de7a0eec2fb6b33712b61
 EBUILD libtorrent-rasterbar-1.2.3.ebuild 2503 BLAKE2B 7594d465b23d207cbcf3ae0c20c9f8750d6d1561d48f444f9b3b17341251257c0695db5b3bb4f9776659c3895887e0bce99f9906bba993388fe1dc05d383b159 SHA512 2f5c73c76980f74af89a12d2853ab12f8296e6090eaab8f618bd9e9e3da7550efda2e430d26f5a4393a44dbaf55fd4c43e42b5994df8c9fa2bee697bd6518898
+EBUILD libtorrent-rasterbar-1.2.4.ebuild 2505 BLAKE2B 35494a15034d186dcd00704a72db167389986a2e2be4dcd4db3b1e3e09ee71700b725bd82752a385bcd9ab7c87b78f136c7e2f01adc4c26439ac08bce0469676 SHA512 7b6aa95fd0e16fb3c0b7aeb98b5d99abe7ee8b3d4c6190f8cc95477b3a9b0c3e0ee477dfaf1c562738d7537711e3ccd691233fbd9dd278f8c487767449408030
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.4.ebuild
new file mode 100644
index 000000000000..21d2139b85be
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1
+
+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/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+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() {
+
+	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/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index e8edafcb2aa3..1e31531697a6 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -1,5 +1,6 @@
+AUX meanwhile-1.0.2-gentoo-fhs-samples.patch 588 BLAKE2B 1905d0d49a814157ae8f6c80f94dcfebcd742404f1329f2f2cd75c6d50cdf50934f93baedfdb79a3b5ad1f2b1b264b6ed7163da4ef51f96f56fdbe6d8d8a46bb SHA512 af12dff949c06994f2834978cac405cb4e6d39714a09b088eab33b433f8597ef3a70f523ec903b4df0f8d272ae63d0c25cd73efe68f3cba58624c9a6682a3e2c
 AUX meanwhile-1.0.2-glib2.31.patch 6461 BLAKE2B 1d46f23d60776dd3f3743ca8c892828b966bc3bcf679d7e3f33739fb1d54fe999bf9ff605590c7458b3d4e12a374109903ba53bad1763e343c30224c506b89bf SHA512 b22a45ff231f33294808e65dd0e0461810be26078d94493c56e3e0303fa9d5606f7916f14edee7f94a2b78574300ba76df433b9e3c1ba0b5df3da0d07aa9ca70
 AUX meanwhile-1.0.2-presence.patch 1163 BLAKE2B ba471439dd6acaa5e4b3db78432b76379570c8bde5c760ce0ce388ef33b41527e43c001445c7bfad3e998590c8e80e13b6b12723d340bfac338e9394ed4b8e9a SHA512 f4caf5f727464b044ed533abcb3929227bc55cba4132b55587411ae5c78c320c916924c5b9228a34634af68f4a00d8103616c64b4b77f04e15f66d8ff62dbbd7
 DIST meanwhile-1.0.2.tar.gz 479325 BLAKE2B 70b032ab9b1fc6f556a16afceec5eac72b8efc686977734c84068fb34e49fed01c2c20743ba058cd99de155dd0172ea2132c8bdbfbbfcaa572f889c15da96e01 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6
-EBUILD meanwhile-1.0.2-r1.ebuild 1046 BLAKE2B e8e7bc3383d15cbfa019f20af67e1e5ae3892ac0844eff9d5ebf2b34c84a29167c4084405ef23f36aceedecfc84284ae2e83499948c8bfe7766bc3c8ff1b356c SHA512 3c8a1896f09c52d931bbe1358b8417d048a55337ec5f57356384d86dfe1b271a54476b438f7ccc9801ba4fab0d9d84bec1d9a26ee82cb4345357ed2712990090
+EBUILD meanwhile-1.0.2-r1.ebuild 963 BLAKE2B 18bd3fc4818ca0adf81d89f5502a065b3cb1bd3b2e80493db3abc7ed156598184a52c5900d796fee28fa7ff5860e7921b5a7d176926b904ffab499a850f577e7 SHA512 58238ab186eade328404d592b7efcef1b3b727bf32baca2eb719ccb557c1d06858fb59fdcf84bffba3fa3fe1b67f1b9d3eff067df564af9765732277d84021d3
 MISC metadata.xml 246 BLAKE2B a740e9a1a3e17c2fa628a8e04b07077f2495eda755cbd903ea5934b0409f05f7297ddc90aa9693b9d7f1b7b3bbf3f2070f5e266cfbe230cf07d71749ba54df95 SHA512 9131560c103b0fbf21dae354b0a00ac68bee1b326a3e38b3c18fa7396b4369c4c29a0e550344cb219fd48c94b2d1c21b185a329c992096c0693ea2bf24aa31b2
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-gentoo-fhs-samples.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-gentoo-fhs-samples.patch
new file mode 100644
index 000000000000..d0bfc20fa76b
--- /dev/null
+++ b/net-libs/meanwhile/files/meanwhile-1.0.2-gentoo-fhs-samples.patch
@@ -0,0 +1,26 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -5,10 +5,10 @@
+ if ENABLE_DOXYGEN
+ 
+ htmldoc_DATA = html/*
+-htmldocdir = $(datadir)/doc/@PACKAGE@-doc-@VERSION@/html
++htmldocdir = $(htmldir)
+ 
+ latexdoc_DATA = latex/*
+-latexdocdir = $(datadir)/doc/@PACKAGE@-doc-@VERSION@/latex
++latexdocdir = $(docdir)/latex
+ 
+ docdata = $(htmldoc_DATA) $(latexdoc_DATA)
+ 
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -19,7 +19,7 @@
+ 	$(SAMPLES_SRC)
+ 
+ 
+-sampledir = $(datadir)/doc/@PACKAGE@-doc-@VERSION@/samples
++sampledir = $(docdir)/samples
+ 
+ 
+ EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS)
diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
index 7a2a8a624595..7d3f38645197 100644
--- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
+++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
@@ -1,45 +1,53 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils flag-o-matic
+EAPI=7
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="Meanwhile (Sametime protocol) library"
 HOMEPAGE="http://meanwhile.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
-IUSE="doc debug"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="doc debug"
 
-RDEPEND=">=dev-libs/glib-2:2"
-
-DEPEND="${RDEPEND}
-	dev-libs/gmp
+RDEPEND="dev-libs/glib:2"
+DEPEND="
+	${RDEPEND}
+	dev-libs/gmp"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-src_prepare(){
-	epatch "${FILESDIR}/${P}-presence.patch" #239144
-	epatch "${FILESDIR}/${P}-glib2.31.patch" #409081
-
-	#241298
-	sed -i -e "/sampledir/ s:-doc::" samples/Makefile.in || die
+PATCHES=(
+	# bug 239144
+	"${FILESDIR}"/${P}-presence.patch
+	# bug 409081
+	"${FILESDIR}"/${P}-glib2.31.patch
+	# bug 241298
+	"${FILESDIR}"/${P}-gentoo-fhs-samples.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
 }
 
 src_configure() {
-	append-flags "-fno-tree-vrp"
-	local myconf
-	use doc || myconf="${myconf} --enable-doxygen=no"
+	append-cflags -fno-tree-vrp
 
-	econf ${myconf} \
+	econf \
 		--disable-static \
+		--enable-doxygen=$(usex doc) \
 		$(use_enable debug)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/nfqueue-bindings/Manifest b/net-libs/nfqueue-bindings/Manifest
index 40e027c17b9b..0c63694e99a9 100644
--- a/net-libs/nfqueue-bindings/Manifest
+++ b/net-libs/nfqueue-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST nfqueue-bindings-0.5.tar.gz 22385 BLAKE2B dd14df558dcc3f811f7f649f0e4ef305025f863d850deceae0dba308974865150265899d3cee43d2a279d6c6d6237dd4df6b01b72c39b6a96819d25fa4413dbe SHA512 c88ef6997b8e4b3ae2c2eb6c1002b74f39979c73b4dc3a4da428aa4eeb6eedeeaff1cbc27c0740e8b29fb8b6a6f98af326be0b4fbc6ed3e432a9884febb3f7a6
 DIST nfqueue-bindings-0.6.tar.gz 22425 BLAKE2B e338268a41e29cbab9a5dc2e891caa78a75d7849439fd9afc8eb105c965e8d201d854f95460d337dc60249ee2c90d88582075a14bc321bf5b952e5a8b648ed0e SHA512 6ee31b01377c0e4b6aa2d2f2e14b34d4d432f04d0e813f90a9d7e52ea9c8483044f7a36b48220887d658c80ca07bfefc88f8aa92309cff30619ec8fb9f52ab43
-EBUILD nfqueue-bindings-0.5.ebuild 1983 BLAKE2B ba1f4bc6a61f198560d0a415202972d32e896a62aae7a88ca11938ddad49f58011801a1260977b77092c05a48f59fa02e3bb9c801c7e384b26fed57561196c33 SHA512 6fcecd6297f2f4d2e6778c7263e87e910a8ba51a526ddc35ea328379018ce069df6d9b9c5a8ba6a7936ac7781bda8da06ae8089214e8339ddde834a38955651d
-EBUILD nfqueue-bindings-0.6.ebuild 1959 BLAKE2B c6ab4990c06d9904704d102490fdf1b1b01e3e4a916b6c93144c4730cafbe1d5c1f3cc0570eda16df729b0c0dd2267f41e82b16b9aa0bca1a0ccc4be5fe92991 SHA512 13b245b2fbcf98569a37d50e24cd481d24c8ad92f3deaa1999bb5b058b766816dcc53ffcdc238f4580a93bde932305690c07d3f2777bfa28b8ab60deecc46fa5
+EBUILD nfqueue-bindings-0.5.ebuild 2021 BLAKE2B fe6ecd4d9a92f1e3a69b812240701156db89f41d3796bd9a5fc8d2a69d276d7d00d3c10dbe2d64d7b09fc7921952ae0431f032045fe1d09d59cd63d841842878 SHA512 c683a51c9151adbba9a8d482b6a9915dee3773032a747de5b8e8cd242e9f1e3f039427e10d2d04d878f24207da0bd86c3756ca7966dfa0a037022031f5790809
+EBUILD nfqueue-bindings-0.6-r1.ebuild 1997 BLAKE2B f302f0ffffaf1f03aa7d487037a6b5c03647b73b9b85492e0b803046c90017dda12289a7a9877f957e478acfd86ab344132db4b91165b709a66796b59ba64923 SHA512 e9ec990f1274bf78715a22e603d0f31e1fb91cd98f7e7aacb331cd94db833211c08475cf6a87dd03074c3fd353804924ece20e9dcc64bd7df12aea671e06c7a6
 MISC metadata.xml 389 BLAKE2B 7d33c22b26e297b9cf696712e893a908f0dc1e6db264d9dfe39eaed7e5fea809c1e0d5bf5661a50783192c75cd414f92e3450da533aa9087f8e94fa016bd891a SHA512 93f27dce7f495f0e0bb277938e5133cc8a2ca33fe8d6b822da48dede56b94dfb35c471a77679cee6e8cd08dbca41f7459440b21ca1c6a1f02368ad5bd8c91d96
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
index 208daba1fd23..97d6ee2d4ac5 100644
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,9 @@ REQUIRED_USE="|| ( perl python ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	python? (
-		dev-python/dpkt[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/dpkt[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6-r1.ebuild
index fb8f566b9270..56b6ed038b47 100644
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,9 @@ REQUIRED_USE="|| ( perl python ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	python? (
-		dev-python/dpkt[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/dpkt[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 323462bca1c3..1a40824a4a89 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,20 +2,16 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3
 AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v10.18.0.tar.xz 21913328 BLAKE2B 84b0b5157671dcc3e96bb2cfd11e085251fd2942c03b27491f712f5603797bab7503d8f7c0eb45ca8e348b20a0555c1767d4d1964fff474c8590a47eb01523a5 SHA512 8fc9062e150af6f054f1ebebbdf67151b16f14bcca9cbb35338a4c7fcd7fa1c3f05c4a7ace12d4153180cec0007a195cbc94942c4d04c3895384dc18951d2c1c
-DIST node-v10.18.1.tar.xz 21920068 BLAKE2B 9dc0887a33f0888a347628e5bf15eb3687f15cba264a00317a15336fda48e41da9b4c45df6d0f223f2017c6b55b99eda0c4cd6f5913673da29c52a61450d03e2 SHA512 0979d264ef5286caea61a527771e2ac2fbe1b909a151061dbb7d9e0fde9461edd76b6060f55cfbd49d3ae2e7e10595a2eb4d2e98182e735e7df10940120fb9b6
+DIST node-v10.19.0.tar.xz 21906168 BLAKE2B 395504ef3befa47d8b967114e019e6a76c799871e7eb21e2c6c0453655ffa07f17f42209daddeb5417342cfbad71ba1a35ae15a2d210b692bc60be270c2fc415 SHA512 512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee
 DIST node-v12.14.0.tar.xz 23244684 BLAKE2B 0e25cbba5e256b139efd45908236f008834afdf01f57a8e84c7e55ba950e56b786cd52eba9a02986eb0e1d38cbf6df38e1cd719d7dcd8085e8c71767adf8155e SHA512 12e887709a54be911c5a81ab7b7be995247b47ebbd2954ca942f9ed8a784ae1a8e4bdb2613e5bb671196f9101d8861cd29e10650a3f0c414db4d096df94b309b
-DIST node-v12.14.1.tar.xz 23258936 BLAKE2B 125289ce3e342c2e5e7bbb6f0b1af109f0ba8fbf2d6630f2cdc4aa31c25a3d846afe773e84daed9824360a6680a2d21378af4fbc42c6337399a143f92850a82f SHA512 2e2b6fa8351b59450ab5491b5e31dc36ce4d9be13c55a14e6e4d95a82cc8334f9fc35261a56a8843903f8021ff333a333bb4d5f24c92b5d7483d4779c3d88342
-DIST node-v13.6.0.tar.xz 32706824 BLAKE2B 69e66354570e057fe215830a2d5bd157e5decfd1e58e4ead4304e0dfcf64e5adfe48503f3bf54afe2cc27df581a0f2ae79e9b730257ceb70c412bd2a47fa5603 SHA512 e7dc8356ac1b167cc32055e209f13cee82c9251440b6a6cc99b26c91f9625e11bd025cfc1c22b6ece95ea178640209a7c8700d678678b3e8bad26080aa2762c6
-DIST node-v13.7.0.tar.xz 32739116 BLAKE2B 2bc4331a059d18f37f41bb472bb19d864366cebae32b6be18d9c14ab91019fbfa6dcb2a8c3c1c256ddd54773d801e852e1820d90bc3b55f3509bfa8e5425121d SHA512 e2a9b0b6c6e038b9c5c55b51531ed30e8767dd492d3c5c50a0de764f7a97f22a3fcb65c4f50adff62219b076e0c688f1320dc87061fbb751a867746e22c60ccf
+DIST node-v12.15.0.tar.xz 23271600 BLAKE2B 20e31e2ecb6352f6fa9e2c60fc505046034434e287e827edd5e0b091c4d5e124b681ba178e1669db26ab3d1b588e3b0894595e9cd1fa46d560f7100d8ab7e1c1 SHA512 40cc5fc252e8939856886cd57cad50df11eedc37de8e50b1b2d49a2e7439d1f4bbba8de90efc030a659919106eca72facf8b31280323fc4803bed9a175ffbbfa
+DIST node-v13.8.0.tar.xz 32745596 BLAKE2B 14bf82e8cecde1a4125c7c00c4c9e613c1dbc5bb0241b20f4d30cb8d172612d5a8c362ac786ae516baf9553d5a9c3053414b269fb040cebb664f09096a57985c SHA512 b50d79f029bc04caf193f137b7b3d03f1e1ec9252712015cab2efdeef92bc3176cf7eb36e835cda6221950792e516f9c1894cd2c480e082106e07a11aa1d0761
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
-DIST node-v8.17.0.tar.xz 19013844 BLAKE2B 2f35f61ccc2d67132441dace8b59df6565e5df9e14e6798ab0cb0a024493182881708368248964db30e1213fa7b66301bd73b5146944129d7b14cd2b5b1a9583 SHA512 9f7b0b5695e882b4f727802ad855d398da596f908e64263902781e01f6222a4044be48c104eb76182ddb525dedfc4b28ccd07d64dfa126c462a248d9e8b49fca
 EBUILD nodejs-10.18.0.ebuild 6276 BLAKE2B 24f1dd3c3af4fec3b456f899744b13b0c9451e55a159db5f56f4fe6a4062942798cd94f0b47b01fa933e51ea2fc91482cf2624e04c43dbd53cecc7bdeb573b57 SHA512 f9a3ca0b9eed22383069c2f4de9a0779ce8a0027bd268f1b8ca41d5d2a55e5010ec45c7d3a990ffbec5acc36d81dced37b30d80bf2b0316828eeeec3ce7827d1
-EBUILD nodejs-10.18.1.ebuild 6279 BLAKE2B a620b05278a18edf70fb786e6840238a38b780469479cd9c8fb18deb8c0d89202c0e1ae324b04362538ba1059d6e049e1b7da52f02592a82edf94cc53991e100 SHA512 b243a92aff7c7b3c93321a910c180ae2b26cef726ff96232edfa87352ae38d16ad9fec439428233070df72ba5cfde6a5560a4c798b67b417866b2285af211342
-EBUILD nodejs-12.14.0.ebuild 6116 BLAKE2B bcf44cabcf2c5463d1bfb4697212272eec662c41f181b3500ae27aeea17684fc3a5131f6a7e9f3a3a38bf7417c4190f5f3293b691a54899ece793d0c3ff1840e SHA512 6857bd8e8e26e642a133cef54e0df170b6c59a31b46dd68757d6be889c5e360ddbe93f8966eec63d7c91e3cf10a2d71e05b4b07abf001a93380309cdae55dad4
-EBUILD nodejs-12.14.1-r1.ebuild 6127 BLAKE2B 032f5d5427fc431eed654aed03872f48d243b2017672742db9f540809bd44a3b9c7933ae365159ac0459413080f2327fb2d44c7c86436b3f5f49ac00efb0ea8b SHA512 1ae825a848cffe5111390338084b225f1a353771888dd45698560487fc79e19d77c674cb9862efdba2a15617693134377bfa1403ed60e0eea5dee3bc274f82fc
-EBUILD nodejs-13.6.0-r1.ebuild 6148 BLAKE2B 74293a23b70ce6c9665540550d036f81b2e2cffbc6b5ed78d2042aece3e9d7b11e53b68096e26611456380594a1face29ae4165c9890a1fe0ecaf66d588309f1 SHA512 a3c2f91a9312d24517f3403f2eb1c0d7330a92370e7748a8180798faaf45ce93a783615c9b862be281cec256a8883f5f90cd122ca85c26561ffd4470360f55de
-EBUILD nodejs-13.7.0-r1.ebuild 6148 BLAKE2B 2848363d047918da656f60fa4072d40b6bb0bd9b6f1cdad0245bcfe081d124f2d4827255a168bf5346b781d504b63e2aa158c0a24fdfdd9cf5d788ea120d0027 SHA512 e67c8f1a1d72b72b3536196a9c05d6b5377b37aafac37faff6d1f68e201dcd937c0a2ba56ca6b71df1c5093d4ec73555d18d829bc3761cc947e02214bcbc1cdd
+EBUILD nodejs-10.19.0.ebuild 6279 BLAKE2B b8b58ad58ef8c236e1aafe873d963ea9479c76960f5e743996b461832f27fdeb0f2d20bec60c3a5f0ecc62e809f01ea8abf7742b83f8b7fa91e20c25ccb2020f SHA512 ca15af7d4ed6f6c7ef29a75292c1b01263d1c467d391ccf76b35d95d101a038adb9c7957934665bd4f3eaf0b00bbf3f1b37a066ac27b7cbd9755a9076411bb3c
+EBUILD nodejs-12.14.0.ebuild 6110 BLAKE2B 67694a25f08b9af538b36885254f680a9328b0c46fc6f19fe434806f76534d35ae907df0a726fbb5243087a4a80d28c9bd0ab7ef63e6998d7a3383c2a1c8cda4 SHA512 fae5d806aaf00d2aa319f244c2685f5de8378964dc7396ff5c892ff0a2563d6a746df47f30f0832f1191f343895b0af8ce73e755959395e41e8f4388efc9c9b7
+EBUILD nodejs-12.15.0.ebuild 6121 BLAKE2B b4cc6314e12478e0818eded7b11dea2f1a7750ab06b88c1e9be8f33a5754484a702035871b3ca9b6b3cd128596018690fe9f60fb45f52be69aa08c2074bdb96e SHA512 ffbbe1acb6cd40ea4ae80369ab5f749fc8baf144b8b42f4be48cf398cf171cde44668d2ad09f211bbdc5dbc897a98824a90076b296117b5db9e8b1c4db375ed7
+EBUILD nodejs-13.8.0.ebuild 6142 BLAKE2B 8fe1281e8a015b9e7bb10970101da317e43e1b181ba0aa6148571fafff089f5328f1701efa2e819b1b8fa19f897caac30a56398d0fc1cdca5bd2d930048d4424 SHA512 018f28e0dbae02375855f25e3831af1fdf2fac638b9c18fe4cf900ffb7e0bf6565dfc5639dae560c67f7cf5fd6ce4b241c88bb39705b1a768e4ecd3c6cf27ff1
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
-EBUILD nodejs-8.17.0.ebuild 6474 BLAKE2B c7748e57d37a828a52127ba285b1b27b472063badf6784fc42616ca5a88a5151bc95162158d34715018db433d8b9e4875f20a7640b1f5b373012d3eb61b5c0eb SHA512 5ca66326a80139455dbe9f2ccb77e588a50142da005c51261f0223b06b4b52d61693f08ce9d22479b8801c5e219a38267e844f3de5a913fad334ebe1dc55cc3c
-EBUILD nodejs-99999999.ebuild 6064 BLAKE2B 558a1e4ce81339c8e4ef99bb25b03bb45468817d5cc07dc18c64c3a9c58431c778189bf28b4514cc120166cb6cbf034edaa6efd2a66467b67d2ac7cfbfa643bd SHA512 cf87da1dba9131ad0390c3a8f4e6ef5e8b566631bb2e944ba817f4878b919cd930ad9db217c4d0cf9c0a15ed384632ebf2507c54846edc96fa405986fe28bb42
+EBUILD nodejs-99999999.ebuild 6058 BLAKE2B 06c5909d0ea476b144d92d6dfc9daaf21854e43e52488af26e3f5a5e83996f5b1c0256ca8ceb5f00515774a5b8e57c66a1e56fe57d516a398031a83a93643711 SHA512 f05beb244a2339863f9b61d11ba0427bd646b2336fadda1a4cb3aaa06e2525d9de8159f34b654e87909486007ac8ac24e03deb1b1a71b951b601f17957d61e6a
 MISC metadata.xml 549 BLAKE2B 89d9231225010c703e933104cc5beea0706d4e865c61c6cb4f95194d2e0b0e4445800eae8c1074c5c313ace3cf3de2a71a05eed880f055b477023dff9729ab2e SHA512 e34ee9c52b2793f6dddb1f82f538598b5085a4bfea37e30047bd3e9bfabce52e3b826b8a2fe8e0e0842a288e14d8f3c229815e287354bdb121ba3e86018303c4
diff --git a/net-libs/nodejs/nodejs-10.18.1.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild
index 489857c39f97..9134f5e478fa 100644
--- a/net-libs/nodejs/nodejs-10.18.1.ebuild
+++ b/net-libs/nodejs/nodejs-10.19.0.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.28.0:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/http-parser-2.9.3:=
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
diff --git a/net-libs/nodejs/nodejs-12.14.0.ebuild b/net-libs/nodejs/nodejs-12.14.0.ebuild
index 1d622544b67b..511d490c1153 100644
--- a/net-libs/nodejs/nodejs-12.14.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.14.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
diff --git a/net-libs/nodejs/nodejs-12.14.1-r1.ebuild b/net-libs/nodejs/nodejs-12.15.0.ebuild
index b8a749a17459..f1734688f143 100644
--- a/net-libs/nodejs/nodejs-12.14.1-r1.ebuild
+++ b/net-libs/nodejs/nodejs-12.15.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
@@ -24,7 +24,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.33.1:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/http-parser-2.9.3:=
 	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
diff --git a/net-libs/nodejs/nodejs-13.6.0-r1.ebuild b/net-libs/nodejs/nodejs-13.6.0-r1.ebuild
deleted file mode 100644
index 640cc3cc0b12..000000000000
--- a/net-libs/nodejs/nodejs-13.6.0-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-PYTHON_REQ_USE="threads(+)"
-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
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.34.0:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	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" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-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-13.7.0-r1.ebuild b/net-libs/nodejs/nodejs-13.8.0.ebuild
index 35f1444b8a49..16dce04460c4 100644
--- a/net-libs/nodejs/nodejs-13.7.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-13.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
diff --git a/net-libs/nodejs/nodejs-8.17.0.ebuild b/net-libs/nodejs/nodejs-8.17.0.ebuild
deleted file mode 100644
index b45783fca1bc..000000000000
--- a/net-libs/nodejs/nodejs-8.17.0.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2020 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 xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.23.2:=
-	>=net-dns/c-ares-1.10.1
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.39.2
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-60.1:= )
-	ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i \
-		-e "s|lib/|${LIBDIR}/|g" \
-		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
-		tools/install.py || die
-
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index aad8df6897f2..70a17cfbe3b0 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index 9aab40f5fc82..fdf6d31c279b 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1532 BLAKE2B f80fa0860316eb0352ca01daf10b544b963a5b7644cf4c14c7c94f16b7fb065ba27b872a2c3d079803287472977dcc34a61b3c64c6b653271be28dac05e81e1d SHA512 74e01aec4b7335fccc5a744ba3693b42c32578e5b128493bb4f88b73ceaf42d622f5304416c4fd136f31f0da2b14ed6789c82e30ef69b7481420712ecee749c4
+EBUILD rest-0.8.1.ebuild 1533 BLAKE2B bf6c28bfdf25513445316d726148ff595b584cb8c866863050f839b75c96f19cb2e9fcfa1b481309f99b07a5e5064f7a83681088cfc23f53260e42664f89925c SHA512 95e7d8598b2b0827cef026d6747cbd95f0ea8cf82029c0f810cd341859c4c9a986bc564de0091e795754b422948bc40b98337e7ffaf441ba964c9afd770cd779
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
index 91da837445dc..541ab5c65511 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0.7"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
 
 # Coverage testing should not be enabled
 RDEPEND="
diff --git a/net-libs/ripe-atlas-sagan/Manifest b/net-libs/ripe-atlas-sagan/Manifest
index 808600036966..7557c56133e7 100644
--- a/net-libs/ripe-atlas-sagan/Manifest
+++ b/net-libs/ripe-atlas-sagan/Manifest
@@ -1,3 +1,3 @@
 DIST ripe.atlas.sagan-1.1.11.tar.gz 102136 BLAKE2B 21ca1745daa4073d392a50630355bf793e656efb24bb8c529222a5ce20ae209b886781fc51aff8b25b832e1d804ef10d55f8cb8d504021add93d0d23900a9489 SHA512 4c2ba0774be46cf9dc9eafe5904dd7915f21bfa047fcf5867d6e1a41a4370f70cc837d398368efa2f4b24750f655514287dcd5b97a1b47e725fba3f17f49d477
-EBUILD ripe-atlas-sagan-1.1.11.ebuild 877 BLAKE2B fc316f02d06dc562a563dbb25acdba74e7871bd7fb34083f86ddfafa3ef00658f4f94b8e21a68e9318a2e1f1ceb9b02e860773dec9b5a7d99f4cab61ef3873e8 SHA512 b0d51f9331fcc30e360f307d10016881a0c1caaafeae1b823ad976a7d6cdb6e8ba0b2a3bfc838c3909432e491ec3949685ed81b7a5a53b5e81793b7b4edf9273
+EBUILD ripe-atlas-sagan-1.1.11.ebuild 867 BLAKE2B f148cb50493aac6c973b6b511eddf189dccb2aa6d40bdf0ae439283f2cbf601acfcfca36132be922ac287f8e20441f00b5fb620518c89e86c405ac9d3e829b92 SHA512 54b7100bc17a1222941108ad20b165b229fe879ce09de53fedb8d52d34c5ecc70a4b4e6267d9c27041ab3b58bbf77bb31dd1203e6c823123bab684faa9089e32
 MISC metadata.xml 245 BLAKE2B 8861d59570b93b8a74d1547866a7bc2fe18de2b72b16cac928c367570770a591ba1b288080c32f0d6228628974fe707c80c5f236317b4c8d2681d496625b8897 SHA512 a18c8deae207bd61184671671720a29b821623c050edf253b37cdebb500ea1ee84f219baa503cee046b76fb6a8d5ad1ca18cbf646754490aadb040d9b32bdf96
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
index 71dc20c7c259..1d8425e5b9b2 100644
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
+++ b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 5fe76d24b43d..d711b56ea84f 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
 DIST sofia-sip-1.12.11.tar.gz 2927808 BLAKE2B 2723aef491b5f85c047cc54a191fdd2ae63b23445f24b6ee9910af88e2daa684eded6e44cee50c3a52bec2901b5310f34c09e7cf4efce714210755046ceaecd7 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c
-EBUILD sofia-sip-1.12.11.ebuild 862 BLAKE2B 2c40f326263b5109677ebe0e9e3e939454383f597d0499a7c121a70896e4f78ec58deb2b79c99edae3b94579ec9f55deb459297947a7135b17178440ddd5f6cd SHA512 706bbdbb5d2d9c82879463bac3af47f9442af081808b6c6908eaa8c31c2f9c6345cf055b55f3ad265d887ace620299adb1c61e95180531c8551001a1d1374ca3
+EBUILD sofia-sip-1.12.11.ebuild 827 BLAKE2B f5873a2708aad931a3d3077948518e24d6ecf8dbe368b86d6997a14593b6256915605461683b387e98354449f07242967fd550a00a9256e42eb1d157e5991cdd SHA512 3adde3c1ce0f05434cbaa3f29b07929027cb76b2ac6f2a039655aa4595f7f5873b6628e637f871fe2472e7f61a093267f0743298faabc414e7214d681cf1b604
 MISC metadata.xml 332 BLAKE2B 20075415729415694d925419349c24403e4dd8181e0e3e2b6dbdb682d0cd9625dcf6196152ee4983615fa34c7b972e10799d190fcde04f4e4ebd4e41c3fb942f SHA512 cd0911cea94332c8e64908a7537ea78683c562638aac05ab1659873ce5c43d378fedb09f848badb12258078779a172ef87313a2b6fb5001a3f33bd954ce7d420
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index 0cef361a73d1..243bb87cbb21 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="RFC3261 compliant SIP User-Agent library"
 HOMEPAGE="http://sofia-sip.sourceforge.net/"
@@ -10,28 +10,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-IUSE="libressl ssl static-libs"
-
-RDEPEND="dev-libs/glib:2
-	ssl? (
-		!libressl? ( dev-libs/openssl )
-		libressl? ( dev-libs/libressl )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
+IUSE="libressl ssl"
 # tests are broken, see bugs 304607 and 330261
 RESTRICT="test"
 
-DOCS=( AUTHORS ChangeLog README README.developers RELEASE TODO )
+RDEPEND="
+	dev-libs/glib:2
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_with ssl openssl)
 }
 
 src_install() {
 	default
-	rm -f "${ED}"usr/lib*/lib${PN}*.la
+	dodoc RELEASE
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index db5dbf61b9bd..5bc923bcb7b5 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
-EBUILD telepathy-glib-0.24.1-r1.ebuild 1494 BLAKE2B 206d77fdf48eeb46e4024c5ca6b46c8bbbe5ceb4f2201705ea36e0793f9d256a7e48ec66a619dd647aceba96a93b7e941bbd6938cf1af15720ff52cdc419c657 SHA512 30f3c4a0bb3b9109a739ee83a610c89c85193285ca7f850c610a05d04957f8ac40651b0ce787ad18b7481ed695f965426c0aac792532f43b82099b383443ca9d
+EBUILD telepathy-glib-0.24.1-r1.ebuild 1484 BLAKE2B 51409cd00b5bb79efc3147ab65c266bd6a5fc665782c5e7921f70022c7c4ef79013b69520da1a2d9e2bb0ff104b956e5b243066ac568b745e77a0300a0a65afd SHA512 c46ae24155de0d6ebac3a759f65f824c6da0725fc8f58fe91047b1acedc9768bed180ae6606450f950c73cea43cac91d5e15a6daed04d23947fb99b99c7c9848
 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
index 94d8c5de0d58..a1622c2cc1c5 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/net-libs/udns/Manifest b/net-libs/udns/Manifest
index b015cd51f150..1b4f5f7b8798 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 1061 BLAKE2B a9b22b19fce5bda505da153d26ec15bc2a94a057c16002f65773d272d763132a17c29f066d02009322ad37e335b5564caa6445a653c55b97bff36d8572e724e2 SHA512 13ef0e82fd344454d8430c07d6e48aba252a552a8218e8d7f005b22f64e319ef13dab34a6c21170c120dd11d6f0a6b832dbd263efe50ecb9f5539b839fc45ae9
-MISC metadata.xml 401 BLAKE2B 4a02ce216fb82441c4add303cba714bc621299b1fdd944203297925e9464751e683cb64fc2f7ead3df8de41da6b6cccc5e6fb884820fba841320e486a91ed950 SHA512 dea311676ce60848f158807241d561e062fb5b51a37137b732af1014d9ea702e57870c3125067ce90795bf97b1d3a2da8cad242fb4cc4e210ae7509b7f3362dc
+EBUILD udns-0.4.ebuild 893 BLAKE2B 7b67c92518e41801f16b9fe6b7e35e631dd57470ff990dc096c34e78a73561abfd0f8165e32a0f18763c393648f2b74a05a1b402819ec6efa6aeba5a03ef4a9a SHA512 8764faf2b5833b088da391a77d1cc9cb2a333914b4a3a4e301f728a275a7e5c8e9ff80734eb5f70bf8fe5359faa0aee198351dab0c5b2b802564a80355a834fd
+MISC metadata.xml 409 BLAKE2B 6510a2258c168dc9178a2e6a62a744aaab91473efdbdf3edc6363136dd7feb368a57f9c75102da1a18e5aa9dc35b176038084e2df179752d19e3fe420e665f67 SHA512 29624e7be711a2354602a33d810e4411090797caf78826f0df30c07b88914f54fe845b9306073352abfa1a42de7651badd576dc0f46135637df10e8044ff904b
diff --git a/net-libs/udns/metadata.xml b/net-libs/udns/metadata.xml
index f0db182dbd42..63f962261674 100644
--- a/net-libs/udns/metadata.xml
+++ b/net-libs/udns/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="tools">Build and install dnsget, ex-rdns and rblcheck tools</flag>
-</use>
-<longdescription>
-UDNS is a stub DNS resolver library with ability to perform both syncronous and asyncronous DNS queries.
-</longdescription>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="tools">Build and install dnsget, ex-rdns and rblcheck tools</flag>
+	</use>
+	<longdescription>
+		UDNS is a stub DNS resolver library with ability to perform both syncronous and asyncronous DNS queries.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-libs/udns/udns-0.4.ebuild b/net-libs/udns/udns-0.4.ebuild
index f19b2595dc0b..0953628925ed 100644
--- a/net-libs/udns/udns-0.4.ebuild
+++ b/net-libs/udns/udns-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Async-capable DNS stub resolver library"
 HOMEPAGE="http://www.corpit.ru/mjt/udns.html"
@@ -14,26 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="ipv6 static +tools"
 
-# Yes, this doesn't depend on any other library beside "system" set
-DEPEND=""
-RDEPEND=""
-
 src_configure() {
 	# Uses non-standard configure script, econf doesn't work
 	CC=$(tc-getCC) ./configure $(use_enable ipv6) || die "Configure failed"
 }
 
 src_compile() {
-	if use tools; then
-		emake shared
-	else
-		emake sharedlib
-	fi
+	emake $(usex tools shared sharedlib)
 }
 
 src_install() {
 	dolib.so libudns.so.0
-	dosym libudns.so.0 "/usr/$(get_libdir)/libudns.so"
+	dosym libudns.so.0 /usr/$(get_libdir)/libudns.so
 
 	if use tools; then
 		newbin dnsget_s dnsget
@@ -41,12 +33,10 @@ src_install() {
 		newbin rblcheck_s rblcheck
 	fi
 
-	insinto /usr/include
-	doins udns.h
+	doheader udns.h
 
 	doman udns.3
-	if use tools; then
-		doman dnsget.1 rblcheck.1
-	fi
+	use tools && doman dnsget.1 rblcheck.1
+
 	dodoc NEWS NOTES TODO
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 17d18bf83ff4..72dfd681f567 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,7 +5,7 @@ AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e7
 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.3.tar.xz 19331900 BLAKE2B 14c31b0f640b0f859a3c1eeda542f176f6c7981270c5be3225556eb4a1027a2511039cf0f33682faa93846c4ca5ed64158574a9b8a662a4a200b97cad28d5ed0 SHA512 9575c86ab5752c09841878cf55134e7de9a87200e55017859cd02affb1cadd58031a7b6f67a580e87a1dfe4fc830fed9774ba289e7244d3ead9eb9328e76d7c9
-EBUILD webkit-gtk-2.24.4.ebuild 8454 BLAKE2B 10631c75c8b9029abf668d101072c072c99e13a91f6ca5f600f99d99cce28897e652d2f948c888854c36b9e137eadff1254821864ea68ee2f2a0ec008dad11e6 SHA512 57d65303beb76f6230843b38070b6fe12e70cbef59e796995ad76dc5546c48fe545fb5a56dbc987b02fe7610cb6f369dc2b18c3850068f358fd35882f75e29e2
-EBUILD webkit-gtk-2.26.3-r1.ebuild 8811 BLAKE2B f2724bb87055ce62a9e9a1852ddc9a1e374df031f660bc5d89745b08fec8444ef47a0cf9a03217bd95c37c0c07a776ebc01994b6859f78c23a9191098f12652b SHA512 15ceee38524291a9d50e2b5170bd77859cbfc307f2772c8e3decf729ddd0c3ef561dea71de08aae50635d36526c607cb149e100665c2171a109ccd706d829a40
-EBUILD webkit-gtk-2.26.3.ebuild 8809 BLAKE2B 9ce5737250e3ba643c31ef7fe597a9ad02de2940b7c882bf7b85e8ddae8b3e501b2f2ca959a93acccf6f7f05f7acfe187a0565ddc883ae16dd224ffbebfded53 SHA512 04d085b7f72f4510675a372f44451bb1fdefeea889242506de9b9597fac1b357756f5df3ae39bc2ae6eb90f382a16df7e869787f7d9afb84d0d2d41d57984b46
+EBUILD webkit-gtk-2.24.4.ebuild 8450 BLAKE2B aa5c958a3b3961bb8e32ad0571dc18e69ebca19b22ed009e3398ee97ef137e19e1f997e743723491bf7c37a32f1cba69e21fbddb61d193f42b35a0ba48bae16e SHA512 6294d57daa1d3bc6ad1ee775c2bcadd299d6ce9498a77b84b1492704accc5442a2022e1dd52fa715b0668f6ab15e09fad6d5628a2d4ec1eee5cd2720f2e6e723
+EBUILD webkit-gtk-2.26.3-r1.ebuild 8807 BLAKE2B 4e9d8c8f9c12fe0e330d464c7b994cc7478787f046c56c698bd0972312179a7ea7dae9fd4f5a7a62d4f63f8987b9d7e314a926fa933bfd65efb6f1a7361b1448 SHA512 45c96ab14a908208f6b03213d8966043658a202f67b21f1a82d8f62c2195720728559b27831f4b9219a51a109ba3dd5b27dfed8793f68de3485b707642164e86
+EBUILD webkit-gtk-2.26.3.ebuild 8805 BLAKE2B 2affad3cc9fd2df14b5403fdddad7c68c476675be1f967b54f4118490148f4277f76b2485f760e634da8bf87a01ee324d952dfca3d65065049b84ad97faef9b4 SHA512 29c2251a33e36f14f6d8490d94e8f2f72d55576daf684fec5c6606eeaddccdbd227f9fe56971805d541ec3a9b1e8a29ac3fbe7c0d565bf20f90a9dfd26422b96
 MISC metadata.xml 837 BLAKE2B 58680ed3ff0941924b33c03aef91322437b90c88e46951bf780b99507b7dfd599d055c8109a45e8fde18a9d871c19b9e86d21550cd0a01bc3e02db2f075ccfda SHA512 6a8191200dd2e84ac2cfaedeecc753d8a9201d764acedd2b11c707e8ce21ba5b0e91e73c4342efb33c96a46a65c2a67736cb32599f07219acc9bdd38d453203d
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 3300742c1964..47f5da095e91 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
index bc2267a80b9a..859e268912a3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 CMAKE_MIN_VERSION=3.10
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
index d3c8a17109f7..799da223a868 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 CMAKE_MIN_VERSION=3.10
 
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 5b6086ad936c..6516fc61e738 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -3,5 +3,5 @@ DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb
 DIST zeromq-4.3.2.tar.gz 1697442 BLAKE2B 70a1f6da357987c32483050fcf86cb81a1fb0b65a527f6900f54eea8958c6aa6024af04067114663824d42305f507cba67e03c7aaab7e23e4f6332d4368613eb SHA512 b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4
 EBUILD zeromq-2.2.0.ebuild 1230 BLAKE2B 3481bc6a49217938f6fff44ba4a72642ff3abb7dbc18bd911dafba960d698bc61ac88645dfeeca06b570d5730789c4d27344d60c2b75e188b30261b67465f5c1 SHA512 f11d23122d6ff6db52b5c625a5e2a994c0ab9741681e1be2dedd6f6bfdc3be9107141dedf9873a448447e61e1aeb1cab025ca37a2948930bc38ba780d25c612c
 EBUILD zeromq-3.2.5.ebuild 1493 BLAKE2B 44f12a38570540f82df5381908f68759b02a423b9a0e9ff014432c02bf6538f2fd08380eb241a6ef7bad12b50bbff0e53b72a05cea11dfb012dab3b229b7c3c8 SHA512 2b5999497c19de44b8846ee173d8dc96ace8d2e9ff1c9f0e1e1ef8633513ed2bea7a33cdf2947b8c5cfda36911a405132a71114efad45c1e40ca6cfb878a0918
-EBUILD zeromq-4.3.2.ebuild 1437 BLAKE2B a46c410299ad9eb963c8caf1e5f08eed59d2bb90f7e66431ec48be38397f7ef35a6ee8b8b13191e3b87ad025b7d1569868389af88c6e3814125fc8453326af15 SHA512 3b1b7809d09e0f310682f73d1008962f37bcf40638482a833fc6c86e1628db7fa3b825a172f34a386c51c260368687835b160be52cb1a8da1806ce00caa5f038
+EBUILD zeromq-4.3.2.ebuild 1435 BLAKE2B 0d02a1ca2bbc9645e54deaaf1dbd6b0726fdda72cf6bb0e8735e78dc4a5fcb10bbf468a97de5f83ce4d3f50047cc1fd1174439fb6080abb8486693f86b379f41 SHA512 d956edfe303d77fd218b9d2d00b422f51c165f2e07d5dff06f24ea81ca32b44e8a13b89dc48713d434dae747feffcc4fe482b039cb0f945b450e515245201063
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.2.ebuild b/net-libs/zeromq/zeromq-4.3.2.ebuild
index 8535b875a1d0..0874e5a0f299 100644
--- a/net-libs/zeromq/zeromq-4.3.2.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
 	sodium? ( dev-libs/libsodium:= )
-	pgm? ( =net-libs/openpgm-5.2.122 )"
+	pgm? ( ~net-libs/openpgm-5.2.122 )"
 DEPEND="${RDEPEND}
 	!elibc_Darwin? ( sys-apps/util-linux )
 	doc? (
@@ -57,5 +57,5 @@ src_test() {
 
 src_install() {
 	default
-	find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /net-libs
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)