gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /net-libs
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
75 files changed, 592 insertions, 704 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 73c2f7cd2184..3918bf2ba613 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index d505456fdb66..8f82637787ee 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -1,7 +1,5 @@
 AUX cppzmq-disable-static.patch 1063 BLAKE2B 4361fed647857fecb98450a6dac6f46322bc960e624fa4ea85074c3c3d976f96c660697b5e21a465e778df20ef20d9490f04c6b2d66631fb00add199824a1032 SHA512 c5770c4b053b025ec205554b0d780d2f2c26b99c0111920b6990400270c896135391035e815ce14c7bb61e44180ed4242b36b95e42b5617637a2fea5d35e2d4f
 AUX cppzmq-use-system-catch2.patch 784 BLAKE2B 15ad4fe99048651d9b1f00fb43e1da428e484f985f480d13011c75f0a2c9287ee7cc92225d1e2e44d39c21fb182bfd1189dcf7593212aaf988f015333fd0f57f SHA512 fa0ed955260c7902427f57f13781c9048754551b9b84cd77ee43454e1040ecc1dc6aa8f786d23432a81b74f1c7c34681a023998474562533159e8225f316cf43
-DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B 80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3 SHA512 d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe
 DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
-EBUILD cppzmq-0_pre150606.ebuild 664 BLAKE2B a782f9142c209224fde2b68505866e0901e7bed600cd0df3ff572aafd88b31b2aab08c9bc30ad2653d3ca1d61d56dc2b0912a85032370eadb48636b1502ce6d4 SHA512 9cc680f474dd763f3718d2d72d59f58215b8e058b7899fb3be2eb6bba79c05c5255f401407c1e97ac91a5bcb2ba7c7ee9ec5bd056a36b12993588f8f815445cc
-EBUILD cppzmq-4.6.0.ebuild 1025 BLAKE2B 291900a7e79d2317bd252263dfcefc7571bd5034f9a02b7b62f9510868a2c40fdb35839b9b4aef9f735344c7dd721ca510a5ed40b2223ad5708d587f4418e8f0 SHA512 5cbcbc96be8bd9d2113b6743d18a9add2cb1bafcbb7d95fa7e5750ab7510ae55109fdb6ef098dd03b7f2c5b9597491879c0bbc19c00bb364857aa81addb98d1b
+EBUILD cppzmq-4.6.0.ebuild 1024 BLAKE2B fff151f3e590555d86f1875ad80a82111549f8253f68bf7f0e204046e0208a204a45bc0ea54ef9b4a887a09ac3f0680832645eb758dba2b0c6b5ed81ac04fdc2 SHA512 9c31c076f6a8c50aa1cc0c4753569ed013b01e30b60ac7050ec9cd6f5de131347d6cbd177945174b15845d79f4fc6dd577fc9b0779c8140cbd0d5e8e54d7fd5e
 MISC metadata.xml 341 BLAKE2B cebd14f5acb08924cfe8941e5ca4c5ff7894e2d52e5f8dbb9a9d648681b6dc7b68b6949e19497fdf34af84eff780e8b52e282d4b5eb48bc110e18f5538eee84c SHA512 20bc14d462ee04fe3bce142640dacf724ff8970bb23e71f97bad89a2837cd0184d77304f34faa8780436c1824d458433d4b0ad644150234d7b11be094963131b
diff --git a/net-libs/cppzmq/cppzmq-0_pre150606.ebuild b/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
deleted file mode 100644
index 09045e0d47ee..000000000000
--- a/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="High-level CPP Binding for ZeroMQ"
-HOMEPAGE="https://github.com/zeromq/cppzmq"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=net-libs/zeromq-3"
-DEPEND=""
-
-src_install() {
-	doheader zmq.hpp
-	dodoc README
-}
-
-src_test() {
-	$(tc-getCC) -c ./zmq.hpp -L ./.libs/ -I ./include/ -o ./test.o || die "This version of cppzmq is not compatible with the installed version of net-libs/zeromq"
-	rm -f ./test.o
-}
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index d5656c9ebacc..8ac687bd6ab7 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 69607c048382..fa2eee675d59 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,4 +1,6 @@
 AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0b579d77483b9fc0f779bb24e3ba50953c2ca2b2bfc7774861085da3d9709fdf250c450cc77aa312095f816bf67748b5d2b5bed4f43ee SHA512 6f2dc20dbdd27875a964aa806380556f4a3da1d2c0c4f7337e0845fb304319b5b9ad94ba519982a4db75486f673a717e20c294487b2d3e339bf7d144a0f33803
 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
-EBUILD gnutls-3.6.15.ebuild 4294 BLAKE2B 3f7bd20ce57309eb02ba94c615c9e2b45c75a8568027bf85eb364045d8facfa0374487a9a9280ed7143bd69e49042cc98618865c83c2ff6518e742a4c65c0075 SHA512 67a1a1bd6da65dc47be4b4cc5580946ad85c68885c4baf19831617ca2c0f63a1c3c4872048df4e89c23844ff51a14652454c2bddc8b70e75f89a45bcc2c855f1
+DIST gnutls-3.7.0.tar.xz 6129176 BLAKE2B 3b03e7017ac1d715c740f8f09b0690dd1c983dcfd5faef0740cf66ac785c1a84e959f85808aa10a6eebd745d96ca0293681049911ea663aeff85fedfa2567aad SHA512 5cf1025f2d0a0cbf5a83dd7f3b22dafd1769f7c3349096c0272d08573bb5ff87f510e0e69b4bbb47dad1b64476aa5479804b2f4ceb2216cd747bbc53bf42d885
+EBUILD gnutls-3.6.15.ebuild 4315 BLAKE2B c451f75c65ea442bffbf56c29e161946ecf70006edec3c1496feff2eb5585eeade30fda535658a2ec17b5bb751c13c77caf285cded5eb57dcdf188076e86877b SHA512 ab68c63f942f032f093bddec410edeb12d0d553b1572f5fcab4f4205c63a6c0af2c5c65c4eb05bb686ff60dea6574cfef134598b612f25c69fa98e97c5ff5f5a
+EBUILD gnutls-3.7.0.ebuild 4251 BLAKE2B 4190cf568be96a624156a5156568c9f29479e2dc534cdc21d3b67d12a676ff417ca5feeb58678db1a1a48d40e1f9dbc1c1afa9f55d5b64bd4b8922d68ddf2f11 SHA512 edaaf1006d559fa68bec37f5312de542968c34e13950469206b5f2bb8e636abecb12897dd01f11b0ba29d4676ed573919227685718e7f519e800c89b76637709
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.6.15.ebuild
index b0da1cec679a..4103ba431769 100644
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.15.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 inherit libtool multilib-minimal
 
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
 SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
diff --git a/net-libs/gnutls/gnutls-3.7.0.ebuild b/net-libs/gnutls/gnutls-3.7.0.ebuild
new file mode 100644
index 000000000000..48cc53ce4156
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.7.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen:= )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# don't try to use system certificate store on macOS, it is
+	# confusingly ignoring our ca-certificates and more importantly
+	# fails to compile in certain configurations
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	local libconf=()
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	local myeconfargs=(
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable guile)
+		$(multilib_native_use_enable seccomp seccomp-tests)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test-full full-test-suite)
+		$(multilib_native_use_enable tools)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+		$(use_enable cxx)
+		$(use_enable dane libdane)
+		$(use_enable nls)
+		$(use_enable openssl openssl-compatibility)
+		$(use_enable sslv2 ssl2-support)
+		$(use_enable sslv3 ssl3-support)
+		$(use_enable static-libs static)
+		$(use_enable tls-heartbeat heartbeat-support)
+		$(use_with idn)
+		$(use_with pkcs11 p11-kit)
+		--disable-rpath
+		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
+		--without-included-libtasn1
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 5ad6df499e9d..edbc6d112f98 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,4 +1,5 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-1.7.1-r1.ebuild 2742 BLAKE2B de1880e0b2fd045e29d9dff7049f9aa188f7de93fa6b3a46d9ee04ce979c442a13342ddc8ce7c999a19521741aaa72664ec8c0c00e33875e0f18513dae30ebb6 SHA512 7d07ce2d6fb1957533eadf0ed705b2e76128676b88fb48253683b4100b9d2c93bf242164cdf3b5164b3e32c96058ab7ff2c04873cea0ff7265946c4c7b478260
+EBUILD ldns-1.7.1-r2.ebuild 2801 BLAKE2B 6136d842e99b9a6e870855f0e418b2bb55374c608b2f346e620ad1a819d857a733b3e99a7f449981d5abeba49d4b5aa9dd95307abe3f68f54a5f88e40d99d46b SHA512 5a3cd22d59b4707b3d182a625c9c61879a57577409351d857c7e472f633f830deccf443a8ec26f5be5815beeb0ab157a4442d7256f63d4ff269134cc8fcc9f25
 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85
diff --git a/net-libs/ldns/ldns-1.7.1-r2.ebuild b/net-libs/ldns/ldns-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..db38abaf3b40
--- /dev/null
+++ b/net-libs/ldns/ldns-1.7.1-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit eutils multilib-minimal python-single-r1
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
+
+# configure will die if ecdsa is enabled and ssl is not
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ed25519? ( !libressl )
+	ed448? ( !libressl )
+"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	ecdsa? (
+		!libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] )
+	)
+	ed25519? (
+		!libressl? ( >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] )
+	)
+	ed448? (
+		!libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] )
+	)
+	!libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	doc? ( app-doc/doxygen )
+"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/ldns-config
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# >=openssl-1.1.0 required for dane-ta
+	if has_version "<dev-libs/openssl-1.1.0" || use libressl; then
+		local dane_ta_usage="--disable-dane-ta-usage"
+	else
+		local dane_ta_usage=""
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable gost) \
+		$(use_enable ecdsa) \
+		$(use_enable ed25519) \
+		$(use_enable ed448) \
+		$(use_enable dane) \
+		$(multilib_native_use_with python pyldns) \
+		$(multilib_native_use_with python pyldnsx) \
+		--with-ssl="${EPREFIX}"/usr \
+		--enable-sha2 \
+		--without-drill \
+		--without-examples \
+		$dane_ta_usage \
+		--disable-rpath
+}
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	# remove non-existing dependency for target packaging/libldns.pc
+	sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		dohtml -r doc/html/.
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README*
+
+	find "${D}" -name '*.la' -delete || die
+	use python && python_optimize
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins libdns.vim
+	fi
+
+	einfo
+	elog "Install net-dns/ldns-utils if you want drill and examples"
+	einfo
+}
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index c02b05d473d9..ff4dff03e3f6 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -3,5 +3,5 @@ AUX libetpan-1.9.4-CVE-2020-15953.patch 2880 BLAKE2B a31fcc50b16d6644ce091aaf7f3
 AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
-EBUILD libetpan-1.9.4-r1.ebuild 2241 BLAKE2B 5fae2fefb926cb18683a4d25aed22388fcec0ec1984d7e53c1aae5c23a7535ed90e6ccc6ea9f456eabdb808147bb707797bd7a46a327c9137657056665121092 SHA512 392a8ebc34536dd94530e9a63d3591e7a4528e46f0887715f206ebdc549be7e4b7919ceb9f6b3479c0ac6c254040e0c34a447404dfac7f7a15a24829fa77609a
+EBUILD libetpan-1.9.4-r1.ebuild 2248 BLAKE2B c740188ec44619a153def6f10c0391d8a763d038fe2bf58dae2131fcb0b6d6768829afa26299bf3e12aafbd8533ee19c1805df2add1503985510683fbcc7e40e SHA512 132aa5c9ea5b0961b1b803cb8d843f56aa49979832fcfd287a63bc48de6d3965d8365431ea1128b40f3db85087919ed4a8c24fa6f4655c98a21c32dad18d79c9
 MISC metadata.xml 828 BLAKE2B c33cbf260d3d2f9529101c441cf49fcce001deec2b23c22a63715ff2ecc0e105c46a37e0aaf9641449d88e57b148d5fbca534a3b81475ffe795aeb07f5c1441f SHA512 5e13ad73cf38a8e4690506fc56f3482d72675622d3882c4cae335c5146c6cd9a942eca23834d1a010d3edb7deca8325d9f4ff576b59a3879b47966489fd28a65
diff --git a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
index ccf8dbd57368..bea0cf416ce8 100644
--- a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 912f4ecd4d85..650c5995df0a 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,3 +1,5 @@
 DIST libhtp-0.5.35.tar.gz 496852 BLAKE2B 21ee020f94ea351f408eb3d0d2f99b01f054341a390c9cc42c44a1f2237a1fe965e12797ecc04cf9a519e34fcf495fae4b4119bca6c38ef1d1fa0a9d35c243fe SHA512 d88a8b5f93759a348d0cb039dd95c5504b09b6ff577138cebbaaccf06a6e7ab682e8b61d904e005af67ea4887492d949cdb466d1cbbd9b970a94a30e8b26564e
+DIST libhtp-0.5.36.tar.gz 496866 BLAKE2B 216ce8833d32659bb189a0f3592c06e0ef96e06f54eaeee0b0ee1714936fe45879db69c557327f7d2998235531d066bef83f1c6047c7e01fd23c7fa54f362dae SHA512 8243c75d8d397abda14aae9816ee850023c5e3dae32b4ca4479d0a15cf575b6fd5a69a037f03853f5ab0c10ee027bd20119640725332fdb7154b95aa5290c6ee
 EBUILD libhtp-0.5.35.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
+EBUILD libhtp-0.5.36.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
 MISC metadata.xml 314 BLAKE2B e5d844caabcf76837a2fdd5d27d3aeefa56773856d21a49187139a38a0ca445a7647fa72928a239df94f88137e213ef7560020baf4c250ec5257b892bc2f7d24 SHA512 c8738803840e411351a88683e51e1c89b7f4ca635d3c2bf6062abee768ee0571fd4d3ea9cde45698c7427391a2b7e2603114e6455647cb88e40be151d9aff714
diff --git a/net-libs/libhtp/libhtp-0.5.36.ebuild b/net-libs/libhtp/libhtp-0.5.36.ebuild
new file mode 100644
index 000000000000..4c0e8229142d
--- /dev/null
+++ b/net-libs/libhtp/libhtp-0.5.36.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces"
+HOMEPAGE="https://github.com/OISF/libhtp"
+SRC_URI="https://github.com/OISF/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="debug static-libs"
+
+RDEPEND="sys-libs/zlib[static-libs?]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# The debug configure logic is broken.
+	ECONF_SOURCE=${S} \
+	econf \
+		$(usex debug '--enable-debug' '') \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die "Failed to remove .la files"
+	fi
+}
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 6f1519e27a4c..fc68ddacafdc 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -2,6 +2,6 @@ AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047
 DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
 DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1
 EBUILD libhubbub-0.3.6-r2.ebuild 1222 BLAKE2B 44cab1f6dd0d4f8f0dd2146aa39556ce95237ed89059616e7f5e7593941df515daed7f4e0f0f9b9ca9cd32b85cc547b2bd47108a10f90e438a12ca069a5c415e SHA512 2d8fb1530149475142b1f256a4b191b7407609cd107a0aa19c33cf06e7d086e84d17c1d569ad8d4b9dd047eb237d2254c906dbbde62cb44dbf44e0f721d9ee0e
-EBUILD libhubbub-0.3.6.ebuild 1183 BLAKE2B 7dbd73a667caec5118a780cc6a0f2d7a019809062d352d9b9586eaf61c72a5012b6d12c8108aeb3c16ee4900aa23d882b0cc56c8657f28b348c124f4455b7c72 SHA512 03eb4253108cff134ce5a4b5c69219f3d52591b79c898841f469c1186a8f385ef874ae9900248962ab86d852629e26d0168d4108ee721bf8e9f63156afc13364
+EBUILD libhubbub-0.3.6.ebuild 1182 BLAKE2B fec4a8d8b4eebb8f2c9445f481b6a0f636facb5ebc36ec5f2f7224edcccc567d5632440eac5291061293102f01fe49c2223bbd290c6023e607ffdcd1d61bd705 SHA512 bbb83263e9f43c52cd6d7036be91aa9440b781ac9569c9718e8369eb19e7820cc76dc540acf217be621ea118b8f9e39c95644feae832429a2ea1e6bbe82f7d70
 EBUILD libhubbub-0.3.7.ebuild 1222 BLAKE2B 44cab1f6dd0d4f8f0dd2146aa39556ce95237ed89059616e7f5e7593941df515daed7f4e0f0f9b9ca9cd32b85cc547b2bd47108a10f90e438a12ca069a5c415e SHA512 2d8fb1530149475142b1f256a4b191b7407609cd107a0aa19c33cf06e7d086e84d17c1d569ad8d4b9dd047eb237d2254c906dbbde62cb44dbf44e0f721d9ee0e
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.6.ebuild b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
index 0b1536967117..65061d064f25 100644
--- a/net-libs/libhubbub/libhubbub-0.3.6.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~m68k-mint"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86 ~m68k-mint"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index e548d0cc5be7..390ce628953e 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,4 +1,6 @@
 AUX libktorrent-2.2.0-fix-MultiFileCache.patch 905 BLAKE2B a82395415166f2bb3475703e0ba3a7a428cd968e1ae3bb2df401f08db5d3f91518da38a7aba694bb7d56e4f089370c0532def676ace5c502549e718693783950 SHA512 99cd120d2e03bb9a64413d66810f67160afff066d9c15f36da335c838ee7d38f32d88ba9a4c7df1d0bf92c79bf50a080c0ddfc1004973f6c711d5d0aa9200bb8
 DIST libktorrent-2.2.0.tar.xz 357364 BLAKE2B 66a91fc32dc11a680d22755468513896c9cea1cbaef8664c84633860b78efba85e5c9e47684fdaaf7fb6f03f624268f9158ee2b8c6fc3d14b0e70339c1f6903e SHA512 2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a
+DIST libktorrent-20.12.0.tar.xz 604492 BLAKE2B 0a423d9b289806160109acb44d604af0e475aefc847a4c1ad1ac904fc776058db5eb7beb79ff2e573b9aff010ad57e30adeecd2c0c67afe89ba85aeb12eb215a SHA512 3c782b31ab4ed18660b331bcb0e28b61209cd070354d4dfd0c27152090e6baa1d63ad8faf5ffe41f4ec59d0ede98580317a16ee01a47ddf6d1e773ee61f4fcd0
 EBUILD libktorrent-2.2.0-r1.ebuild 1551 BLAKE2B ea1add797a2ef00905b0c4bd7ddf18782e7f0d9f4e1533ce87df1bccb7fa7949a8edcab68891cc2ba0e46c574d5296dcd2aef9d05e3a72dbb231f2ae764f951a SHA512 7b1f88e1a44febb76014ed62e20b00f69910c56ff487d77003079ebf0551a34fa8158f01cc9239f853ff24cea3d0422a4ef93961c74effadcb0aedf46424f351
+EBUILD libktorrent-20.12.0.ebuild 1453 BLAKE2B 7fe6cb4f6ad2247a5227da10cd35ac250468bc6fa39716a681653c206da8b7be5bc0417345e19d9bbd924cbf8f6cc72447eb7578497d74c8a174c7650a666b4f SHA512 636da17301f58b0ecc40a53ed243f3c9a7045377f7eed7f114bad7f5528750f2a1460f72052f69c858cae70c5248e9f5adb4c513df40541fc4b1b43e4ea7a9b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-20.12.0.ebuild b/net-libs/libktorrent/libktorrent-20.12.0.ebuild
new file mode 100644
index 000000000000..4b4281cdef2d
--- /dev/null
+++ b/net-libs/libktorrent/libktorrent-20.12.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="network"
+KDE_RELEASE_SERVICE="true"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="BitTorrent library based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/en/ktorrent https://userbase.kde.org/KTorrent"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="sys-devel/gettext"
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.0:2
+	>=dev-libs/gmp-6.0.0a:0=
+	dev-libs/libgcrypt:0=
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/botan[gmp(-)]
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
+	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
+		CMakeLists.txt || die
+	sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
+		KF5TorrentConfig.cmake.in || die
+}
+
+src_test() {
+	# failing network tests
+	local myctestargs=(
+		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
+	)
+
+	ecm_src_test
+}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 028846615393..e9f7b674e525 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -7,5 +7,5 @@ EBUILD libmicrohttpd-0.9.65.ebuild 1292 BLAKE2B d0be1dcbb538eda2814e853c153df312
 EBUILD libmicrohttpd-0.9.68.ebuild 1279 BLAKE2B 03e4684290e50bf89b3270c7916bdbc72da590b747aac3e7cf6e72f98331c2abeffa61de886b3a87dfc49e941f33ab165e77c24e186a1631d21ff0c3b51a77a4 SHA512 82ab3db6aae947b5aca12ce0c4fb5728f77d95db4bf5b04feab81b0ce89cc58840bb1bcd1c7f7459a8a3db9182442f92b777ba232e890ad0f7620cd022dd98c3
 EBUILD libmicrohttpd-0.9.69.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
 EBUILD libmicrohttpd-0.9.70.ebuild 1277 BLAKE2B 3f5f6a39d2e9208f923b58be1f834fd7eb295d3f94c03551a496f7314fd09443c5d3df131c957162e2c222f9e7ffab9cef54bb79a55edbb56b2af53e0602d251 SHA512 9ec04957a5b5cd23b26f2e345e8c9d1982e52ed3eb6a8d307d225f711bf02c471cd3d872814ba47cb18bfd876d2de5ca3f75833806c20f436f8d806a3a85655a
-EBUILD libmicrohttpd-0.9.71.ebuild 1285 BLAKE2B 57cc4ca3b7701b4a5d84cc671069840e980cdca2918e524a656b89c7bceda0bb36349f7c869fd83076f0541a1079f587c43e491e6750898dad0ef56f593b7de3 SHA512 b576aa126f50138ad3471c1ff90a3f3409f8aae194968064df4b9f198129f43280900d629ce9841f3f30dcf056efa2801d323dbdc76a20b3212fe9ce6a6acc38
+EBUILD libmicrohttpd-0.9.71.ebuild 1292 BLAKE2B 605b86e2828210a06c790870876dac23ff79f2b7bb6a721c037c66b75d5beb595b1376966be5a5430736187e42bdcab5ea97cd9ec9b1f00ebd9751d18555ed6d SHA512 0b3e74600e69099dd8955dba261f8b2997d5a12e3dd606640a1627ce7a266ea780d2b586fc0056994a6131da296f3d9acc5bce06c4ca2c5a591ff44934d7d96b
 MISC metadata.xml 458 BLAKE2B 3b4d5cbe9453997287bdd1ce08b3a23422076d27c5a0fa7d18c936a7a81651cfe109f7531386871cba45f756c6f09dbc98c4987c17f8ec7b151421bbb82ac146 SHA512 2e775d144e0469c6c7467674da543bc72966ee6641fcf4072703d990eeb6f4903c6a4c2368d299b96afa77a1328319f88848b9c12df8b889c3265128d49e3ea9
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
index 63a50da01def..919f28a7b44c 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libnetfilter_acct/Manifest b/net-libs/libnetfilter_acct/Manifest
index 4ec7f65517cc..0aefc89d7bb2 100644
--- a/net-libs/libnetfilter_acct/Manifest
+++ b/net-libs/libnetfilter_acct/Manifest
@@ -1,5 +1,5 @@
 DIST libnetfilter_acct-1.0.2.tar.bz2 292718 BLAKE2B 502261b12c76d24cd67ff79ae72f7aee2ae48f9953df201bc34e7a28ded69501ccf3493ce441b733e4ec5b40b33ccbadf4c0e2cc46971bdb4bf3b9b117683347 SHA512 6bd299d509736ce3335e051137851d7f1a3751eafa380b55e9c73a25afb5d45c904ce9acefd4f934f1d21f2ff85b06faed4b072dc74d74e3a8b93342d59f5cdf
 DIST libnetfilter_acct-1.0.3.tar.bz2 296999 BLAKE2B c696a5830c2445fd8369182c413a8144f4b0d669dd8ef57e59d54bd8ad406e15bec72ede8d2ee0d7bbb61fbc2218380168e03ed62daaef9e026cbe83e79982c2 SHA512 5ca332840663941182343fdc0d5e45116bba71a97a913db0b385ea37ef31a04f8267a2279b7a2862ce338c6eeb093bb3ef9908f57770e64acf5d2b2266d3bfe5
 EBUILD libnetfilter_acct-1.0.2.ebuild 1106 BLAKE2B a828d15fbc4e5cd6efc7bcacf34a239c79aa521ef87b1d82acc51603d847a50011546ef7d5487ec9752bae410009b624ca36f0ccdcc1faf1573e75a75a23c67e SHA512 4da76e74cd60b0821ff890872864dd817deb71e5ffb3267b3480daffbfc1cae30ef5fbe156f9e3cb8c91e05f3e0e505aaf04955e55638fe6d521104b716c40a2
-EBUILD libnetfilter_acct-1.0.3.ebuild 1115 BLAKE2B 88762faa0e079a62602544df5affcf1f3e5f3a954c2cecbf5013d9ed12d9568357eb883e1e595f021e63ce0bc37aa94ebd2319b2413aeb7ab22fd76aad9bb3ad SHA512 01f579c80f02830fb0abc51b30714a0e73f5c42793e6ba3630710ec0f8221f06c528e9f4e963bc8db7d199c996e098c654dda239383bc43337a18a0c392c77d5
+EBUILD libnetfilter_acct-1.0.3.ebuild 1114 BLAKE2B fdc4f85af3023098c7e144caf532e0b09b6ee86eb86b96b806e8c87ec0f45309a2441ae433cde4337d2e7bf3a8c9bc991eac10430a79e38dcfacd8ec74d37037 SHA512 d1d2f0b7edf1776fa11d03d59eacd9eb962e276beaf0f1cdba06c82daf7fa1e02589fa00cacd9c66dfe36de96560d8a31f76248e5ef00d1ed43fd6fcd3fe1504
 MISC metadata.xml 519 BLAKE2B c8eb1d1dbfb4a13be05e1f2b811cad7df8c2a71d49c2406142062da78e7a2fe40dff4c13f92de3c5065daf517e4fd9d637882f1f8456cd40b2ea42966c74620b SHA512 74ed6a2a7992dde7e6061489e378e2aacc5ce4b39fa7b09c31ffb06cdc3b75c75f880d3ee2a5caffbd0523a00c4fc12572f6c3343deddc0be2939a392b893f75
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
index 1d5ac92d8978..846b7d7c3a65 100644
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index af3a16f17ad5..19666e8bbe75 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -2,6 +2,5 @@ AUX libnids-1.24-ldflags.patch 422 BLAKE2B 407953c925cb226aa324e22ee5fa7d6802263
 AUX libnids-1.24-libdir.patch 1614 BLAKE2B 7fd082ee26ba798bdc61049c65b7e7a50118c7eaedc23c5a70a34cf592081ba559e2b03ab4684bef7d6f8bf4c3d640374e516e466721a3e75d7ae540f5e28949 SHA512 de76de95ce3f10e36c15cce31c9743a3caf96445a9d38e7d922710d5d482d9f09e73fccefa75285f200086bd0d2476a4f59a1bbcdfca807ed84873d8726554da
 AUX libnids-1.24-static-libs.patch 1018 BLAKE2B 6e3e691ca350233074e662d04b269d710a6d85d51de138072d021f96319ec7a3853dda117075d0eea07e913bf11280d93541848e592f4e0a34656c0ed917e9f1 SHA512 975354be03729c54f33340c7aa8ddd7d6d4f1eba19ee6096433a7e69b90ed84ab20f654ee28877b6db3b7f07cbdf29a20229784f69f1d7d8a29a81128554179e
 DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
-EBUILD libnids-1.24-r6.ebuild 1106 BLAKE2B 6a94bdda1380505cda1129cbafc79431714a425b962b6ac06fca7661c8f036beb01551deef3aebb48c543b2e74d6d0003f28b54c5e532e446bfdce0ed0514635 SHA512 4adc9b043dcd077cab15ad56997900ddf076b51d1f5519c9022838d5417f0885baa43490986cca202e21a94370b71befde01a488451cd06a134ffe3ce987bd7a
-EBUILD libnids-1.24-r7.ebuild 1159 BLAKE2B f5426afc5e125d8a8387ba0efe89269fd109fb1597960ba1755a8a4d4cdc10e7812bb717fa9def3a2cd025365005ea5754cca4813d8fe222b92b0a34d9dd3473 SHA512 dc395fc7a015c0428a2ef847f939294141560759d03359cbf7a96efe74e2a12f8d11be9111b51098486842d412bf6534fba433db78d45928c101754caaa45f9b
+EBUILD libnids-1.24-r7.ebuild 1157 BLAKE2B d85ff2648f8dcada0a038b80b0fb6d590fc8986188d9caa83a059a2fa83327872ae2e36b3bb33be6592ea1a5d7a6d752c4153feec6a1c21121d19333ff83491d SHA512 964d2666d84d2e1a1d591a3080f00bac8db51a1201e42dbc8926d311f23a1d1ae515351fd997c0b8e565f213fd6834ce6f028116767b04e37426fd872cbdd999
 MISC metadata.xml 688 BLAKE2B 1e9f6acc429a683a0aa1b8e14d0f2d9b03cb004c387b0b8582f8056c767af6511ff480f895d715169ceabb4c0722136e624d853819a2ea48f1fe8a6cb77829db SHA512 c70e24c21ba36ff9acff4d4b4290c8087a56e082ca520a7aabf7f0ffca5f03ee49f1bb5ac093304a2cb744241ad749e39022fce7c1a20c28ef08b65da911791a
diff --git a/net-libs/libnids/libnids-1.24-r6.ebuild b/net-libs/libnids/libnids-1.24-r6.ebuild
deleted file mode 100644
index d4a4fe94a92d..000000000000
--- a/net-libs/libnids/libnids-1.24-r6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://libnids.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="amd64 ppc x86"
-IUSE="+glib +libnet static-libs"
-
-RDEPEND="
-	!net-libs/libnids:1.1
-	glib? ( dev-libs/glib:2 )
-	libnet? ( >=net-libs/libnet-1.1.0-r3 )
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	glib? ( virtual/pkgconfig )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-static-libs.patch"
-}
-
-src_configure() {
-	tc-export AR
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--enable-shared \
-		$(usex glib '' --disable-libglib) \
-		$(use_enable libnet)
-}
-
-src_compile() {
-	emake shared $(usex static-libs static '')
-}
-
-src_install() {
-	local tgt
-	for tgt in _installshared $(usex static-libs _install ''); do
-		emake install_prefix="${D}" ${tgt}
-	done
-
-	dodoc CHANGES CREDITS MISC README doc/*
-}
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild b/net-libs/libnids/libnids-1.24-r7.ebuild
index 2e9dbb9cef34..aec872f32866 100644
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ b/net-libs/libnids/libnids-1.24-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+glib +libnet static-libs"
 
 RDEPEND="
diff --git a/net-libs/libosmo-abis/Manifest b/net-libs/libosmo-abis/Manifest
deleted file mode 100644
index b609387b5a92..000000000000
--- a/net-libs/libosmo-abis/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD libosmo-abis-9999.ebuild 470 BLAKE2B f67deca8e992f0701d5d3bd34a57bb56783e3ce2e6bd52fa2a38cb210a46ea70b351c17ff525e97c447edb79a6b059f1693ed87d95a41b2ef73e3dd3fff9de8a SHA512 bf886f9acfd03e63f197a21ba83e36cbd51f40fdf7a4e5147a7e42494c2856cff9c8d863b0c77b5ee01aaf1c6100baf1a0323ffa2bf95f3e51ce8d9add8488c6
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild b/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
deleted file mode 100644
index 3574747f1b9d..000000000000
--- a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools git-r3
-
-DESCRIPTION="Osmocom library for A-bis interface"
-HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/libosmo-abis"
-EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="net-libs/ortp
-	>=net-libs/libosmocore-0.11.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-libs/libosmo-abis/metadata.xml b/net-libs/libosmo-abis/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-libs/libosmo-abis/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-libs/libosmo-netif/Manifest b/net-libs/libosmo-netif/Manifest
deleted file mode 100644
index 10f5d9a6c117..000000000000
--- a/net-libs/libosmo-netif/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD libosmo-netif-9999.ebuild 469 BLAKE2B befc32dd75b81387007d294f9933cfb1022e7589191972691c0a7d92898930464ac76b59528c22840d5379aa5e5c2014d4f9b83feb9ad412e3edee143829b4a1 SHA512 12d0842931ce28a00531889f6d2e2c08b15bf4182603ce5c19c00d56b5855cfc50d2851f62105b916223d97dc32af8236d9ab7c0614bca1f215da410614b08d0
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild b/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
deleted file mode 100644
index d2b2772d8afa..000000000000
--- a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils git-r3
-
-DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
-HOMEPAGE="http://bb.osmocom.org/trac/wiki/"
-EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-KEYWORDS=""
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-libs/libosmocore net-libs/libosmo-abis"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/net-libs/libosmo-netif/metadata.xml b/net-libs/libosmo-netif/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-libs/libosmo-netif/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index 8134078f6d58..6a6ba156493c 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,3 +1,3 @@
 DIST libotr-4.1.1.tar.gz 655791 BLAKE2B 51be68277b56dab96a68fb744e467dc13d966038849ccc0b98b1d0082bcf3b4a0b7fcaeb3f050b0798851723bcdf11bc7ef6681a94999105656dec2fe919659b SHA512 c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0
-EBUILD libotr-4.1.1.ebuild 689 BLAKE2B 66d6c4247410f0cf7985853afdd3641262bd4a0cfce200a30a4088aa17f158b8f7be602feba8b0dba1b730f69d4bc3492296952f58567083d33624ef0adf7c7d SHA512 8e73a79e5c2929c2965b9415e341c28aed3ab597de6c2edc18c834616ff16ff7fa53dfe24de583886504b8cffac50d8f5a260cccb5a013fcf55ae9fda5c02143
+EBUILD libotr-4.1.1.ebuild 696 BLAKE2B a558578d70721fa371252616b051cf2ef60f288ee2c6e49ce291bb299d240bb15d02f423a454a2b94f3428be1a6b2e92c77e602fdec4f38f82e5a8898794feeb SHA512 29071f71be25d8e1e8f1384c225f8753db39708bc5e7d0241aea52d9efda7b9d824cdd0655fec8db7d639aad6fe693a3553d67728dfe646112d016c49cfd09a8
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index 44814f953afc..0d4492fc6ff4 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index e07c79e831d9..b73e78a36092 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -6,6 +6,6 @@ AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684
 DIST libpcap-1.10.0-bp.tar.gz 911001 BLAKE2B bbcb1f48c5cbe8bfc46003cbf7c691e0b3a2051e319aa3ec761de045ac11bbacafe1a06b52c4cd332eb85e598a0a1ff5403ae7c3a611cc0cdd2eeab859587487 SHA512 c3d6047192ab1521687d856f2a954a38bfd8d42aedb853559a698ed3c24bfe5698efb6f81c0280b696229165c1088a58471e8d62f071343fcb14b1464f65fe3f
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
 EBUILD libpcap-1.10.0_pre.ebuild 1964 BLAKE2B 3bc100b209597d14e241590612975d9f90e51d9d4992fac6f4909183ec4d6e47ca493c17d644ed0b3d99919ec64d4ddbff18a0376244bf30e4bfc1e0ea06379a SHA512 2b71c759029a5d0e32c82cd2ae9e25c04870783ea880f00231a9e2cf84ca13417be6d72fade91ee6bc0d60314afa57b33254b2b8af36490b3d7c9cca4dc0758e
-EBUILD libpcap-1.9.1-r3.ebuild 1907 BLAKE2B 1c8ea4b16953e06956421db2ea00e5fbc76c7fa0490bb2409bbe687531e5db8fe632cb9e2ae26855dbd81ab20189e094d6f0dab37416ba5c13261712b4f03ff6 SHA512 d0fd1cc018ca36711ec7555ed494be63d20862bf2273d408aebe4bffc6eb2eb8e85e8ca2d213335c2d186c3e6021dd6382ce3fd0e275804162157cd5e6f03916
+EBUILD libpcap-1.9.1-r3.ebuild 1906 BLAKE2B 2c815523ec9e4ee7c67b751636ad1ae86ea99248346d8f12494cd9f7fe3223b284a5b8f89f5bba46f2f0945ca4aa2bbef2c8115b38f4e4764e5bf8b28d9fa7b9 SHA512 76be149d9b2826e56adf09f1a6857141950fc0238d7f64f9d629531819f503fb5a73e9445b34c032736e3351a65c18667902dbab17a12ce7318f1fa26e23f9c7
 EBUILD libpcap-9999.ebuild 1722 BLAKE2B 23bf6d429b4010ef74e9db6be8512a9ae5b7cd013836ceefcdf88ad6d680a8000a39953b0d259679a826e99bc2af7d04a1e87db06d30aa10d6c06e1c99fe8a8a SHA512 b3f929fc29f5d2f96fffe31554d65ecdee1523b7bf4fb8b4bc911999223816bdc376254a208cf142c1e8d9ba36177a4a19909c18e95ca7bb72b93652d0c96b3d
 MISC metadata.xml 918 BLAKE2B de742c2edb2a5fd038af02915ca47d8ff7596072eae68a9945a0d68acfe95fb01eb4c36659d5be1412323db841c7aa64f61eefa8e246e9b7376c72b374dbe025 SHA512 6e8e268de4c7c6280052cb4841e4d496a8ccd9b7c29f992d5afd5492cf84f3bf5a259d3036557015a1c6fe5445bb8f92a7b63d72412d52850aec02c59d8e62b7
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index b6903a431f01..d4e1a7d59bc3 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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc 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/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest
index 7e769501692c..7e29210dc33e 100644
--- a/net-libs/libpcapnav/Manifest
+++ b/net-libs/libpcapnav/Manifest
@@ -1,6 +1,5 @@
 AUX libpcapnav-0.8-includes.patch 395 BLAKE2B 6904addab4a42d233780616364a4603bf691133313614d3f3b36a4b736aa1acbe77d07f0f7751e7069fbadc1e1c87bcf6086b1cde574731dabf0a9a4cfe243d9 SHA512 04570a0f0b5c33565e79922e878171bb98640d2961cc9378c64e17a7144636960fe099bcca4c043d8a4532b98fe7960fdfa24af8145df5c8682af4dcc5d9b99c
 AUX libpcapnav-0.8-noinst_test.patch 609 BLAKE2B 191f9d223334160d8c3d904fe2540f44edbc65f83c263e8f90659ab9b92cc42a7f6addf60914d20bc77d13dda9e9cf500fa2bb03876ec8b9989af8682d22c19c SHA512 f3797711b665d0d094e1c814fcca5c761a51628bf0c807a6caa1a76e6cb06f06b74c741c010e05b84f1f39e61672a886519c81ceb2875101c5e28187633a67fe
 DIST libpcapnav-0.8.tar.gz 387476 BLAKE2B f3027f17307a76fe6baad6fc79ce054726def17c834b814a07c628f8420fe481e661d72e72d7b3dde494ca17b2e36abba3a27d02f68924f88c2a89d57fae8b44 SHA512 bc0357d17228c157de5b480532df37a62459882d5a4fb8d2285fe4e86c1dca301e7cc505f2917bb3421d926bed263d93b2c587311431d9c3a5b02f04c93fdf18
-EBUILD libpcapnav-0.8-r1.ebuild 928 BLAKE2B 86c066397db0ee43b8066edba7358dfa30437cde98131ba0868ec842fdd775899f0e3f226c55862b8416b309e7217fa7832f890efd409ad7c14dae874eb4f3df SHA512 5c7004f0afe4dea863509dc060d2bae387f95b1a7c92f394513d9fb4a054e7e9e9514817e6c56bb0b981b71f96eb9fff3b3b99633b7df54dd6b0e21e4d26834d
-EBUILD libpcapnav-0.8.ebuild 815 BLAKE2B 1b7df5b4e754936e84f01d8850a5b70dc8762a26290bb217ffbb319aab02a8c3d359095879308d723dc840dd16d8c79771528dcb97a0c893888fa2bef095ea12 SHA512 f39d670d58f9d0072a35a600f950323d13523b7291fa57d97f534342987483743d7d05152cbc7baf64fef52cc916b17e5bcb5dbcd891bb7f7e3c0ff3b98068c3
+EBUILD libpcapnav-0.8-r1.ebuild 927 BLAKE2B 846f975caa8ce1271a29f9dfa356695be0f06611a84dd8ee529b028174316ae81ee449b11e4b95505fa85dba8951d9da696a6414c14717737de7117fbf7980c2 SHA512 0e4fb9fe4ee1ed22df20ce3e38f5db3015b5ec61bcf0dcc59fe358c655726050ff7a78679fa5fc7f982bcf680eb36b58091813a723b356ffd7722dfb819692d1
 MISC metadata.xml 357 BLAKE2B ddcf544a7ae28909b7fb7810c0a6bb368099397e2bf7d6e68a2475c5d701d7589aacf0a15f76f00f68b623a7b37c46d60a5faa3c92f1ac73eb2d99fa29b48ccc SHA512 9cf449d26b416d995b8371fe2e6aed6964080b8b84bf0ceace749ceebd4ddbcc8b3d7d9c1d8c2a07a4c7cb880492ffc8b34ad31b4602a646e004f3aaf52f3ae8
diff --git a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
index a7d6c94bbf77..bfa3f2123330 100644
--- a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="net-libs/libpcap"
diff --git a/net-libs/libpcapnav/libpcapnav-0.8.ebuild b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
deleted file mode 100644
index 6e3be2c60800..000000000000
--- a/net-libs/libpcapnav/libpcapnav-0.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils ltprune
-
-DESCRIPTION="Libpcap wrapper library to navigate to arbitrary packets in a tcpdump trace file"
-HOMEPAGE="http://netdude.sourceforge.net/"
-SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="doc static-libs"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-includes.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake SUBDIRS="src docs"
-}
-
-src_install() {
-	default
-	rm -fr "${D}"/usr/share/gtk-doc
-	use doc && dohtml -r docs/*.css docs/html/*.html docs/images
-	prune_libtool_files
-}
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 3e9724fbbcb1..982bd4138576 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -17,5 +17,5 @@ EBUILD librsync-2.0.2.ebuild 608 BLAKE2B 4d452311f2727375b3e4934b6abbddf83c09a13
 EBUILD librsync-2.1.0.ebuild 611 BLAKE2B c7a769d9d594417d1218f13be7aacf42da098a22f2563f19b437d96058c742cc45aca890fc156bd1532f3f722eafae6861e0248eee4f6a96044c1f3a2647a238 SHA512 54155f0e126bea498763f15aa2dc747d1edaba0d84ce6045e386c3acde3306e6d094e16f55e2afee0e97e90330d3ac829e313db0c9ad7214194e6abd2af17347
 EBUILD librsync-2.2.1.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
 EBUILD librsync-2.3.0.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
-EBUILD librsync-2.3.1.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
+EBUILD librsync-2.3.1.ebuild 605 BLAKE2B cdc704e97ea268cd0ff287bf0f24b4792960d97285e2e83f631df79195d38d8b53cb32d8d40e7f72e2b75df4ebcb399d51b818dab911cfab652dc8cfcf8c0dad SHA512 3722e5b97fedd7ae6e1c7bbfb833ff6d09f53cb8519daff78cf00a26a5cc1d5836476f12d2adf1a72c168d2bbd12be929deb92b7b3971a1d795a55634482edaa
 MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
diff --git a/net-libs/librsync/librsync-2.3.1.ebuild b/net-libs/librsync/librsync-2.3.1.ebuild
index 4a6965cbd509..abd5fbe1e3cd 100644
--- a/net-libs/librsync/librsync-2.3.1.ebuild
+++ b/net-libs/librsync/librsync-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	dev-libs/popt
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index 12f381a11c1d..8a552e7d1fb4 100644
--- a/net-libs/libsignal-protocol-c/Manifest
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -1,6 +1,6 @@
 DIST libsignal-protocol-c-2.3.2.tar.gz 271930 BLAKE2B 43e1e384f9f3a81f582445e5f1f10875948b33607aa7feaf98f4b6cc41f5fd30ca9fb7c8426ef66f93cd46a662eb4a57002f5937d68f6fd2fcf0b30b33c60997 SHA512 7c63c42b9a590ed1a60a6f0094668d9948aa04e5965d052c22ae22b176df7c5582b8ec5c0e6c01ad582dfe2b04067380b9734ad08c64785242e90abcdabdfb8d
 DIST libsignal-protocol-c-2.3.3.tar.gz 272073 BLAKE2B 86f31ed8a18bfc1ea80c45ffaf983611d353616d418f308711665aae287ff86697f7586f20f2c52ac028f9e5ad8b6d39c80876b263654c620a541812917b4f44 SHA512 19d892e13fac32022658de5eaf1db8cec3226f5f3f37a4c1c33bfa9653126ecbc6350a1ab5624025f909803c2277b86321dbea7f64e9932883cae57b65f58112
 EBUILD libsignal-protocol-c-2.3.2.ebuild 344 BLAKE2B e35cd34f3dcc70bd0d785614f3e90513983c1a84c3c06025a5e207f5a58a8ea8b560cf7bfec4a26b39d1a9a47cd8df6f769ef517c83ae8b6f0cbc6033b22d15d SHA512 34c3fff52a30eb6d6131088fbc2761543718a6cc57abeb75815e9f83ee119a51754eade44c78e1828749b98e3c0942dd17276963951ce72c31246c7902145662
-EBUILD libsignal-protocol-c-2.3.3.ebuild 343 BLAKE2B c061e176adf6b54160bd616dfb2055625cd311fec54240c841601a2853e11b05b36fa1642eb51c4d7cfde8faa5d2425a23fd76c08e3726bb232210917c014cd1 SHA512 8df4113347aa032c912a6e7516f1cbb316b1418c65c57b382593060dbd93efb82957b7354a6cd9a78303a4bbdaf40d233d8dac29c570846c59e33ca1991cc3d2
+EBUILD libsignal-protocol-c-2.3.3.ebuild 347 BLAKE2B 0250233af0b592d0bce5c57c53fb5b450fc4a4f5322ed00883af48b6fdeb40a2ba0f55b6d623dafcb4dbe7a01b2ae1fa10832c975fc5417255a4fdd474dc679a SHA512 ee8549d9c21439e65b4a08458be166fac4893ca4be98cf1d77f2d483429f4d9c4ebac7da04a63a80ed11f2d301a944ae592c3d2311ec2d9ef867fb1904b32fff
 EBUILD libsignal-protocol-c-9999.ebuild 311 BLAKE2B 17b9baf64a60146c55a2b525493a265eb5070a20a31b4a0dffe24c86e8a720f60a47c06f09e4473dcb2585c0a6f612d2b4df4b47944e927afe84e8ce29ab668f SHA512 6443aef8035cdb162e1681e0547411a1a1e157fb994b89e3e06cc61ed8f01c62419e02a3108e38044688de604342ff48e59a779b3b163cd9984ce3bc3c594659
 MISC metadata.xml 740 BLAKE2B a55ff6046cc360d761f3df397be99bb31c8b8ce41f947cd1ed18c8d96e8474fe4aed9718bb0c7b2541cec2bad46e2caf0448585afea85ca8376b4cfd9053a01c SHA512 92abe5f5a1b810e92d06099d8f59d248ec69c44ea4ec8dfbec8e637a0f58e272d32b6f1024492c010418d796991232b561131cc50a6fbf46f39b55e4c7b6f32b
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
index 5503aeff7f1e..8d67dfca9e35 100644
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 DESCRIPTION="Signal Protocol C Library"
 HOMEPAGE="https://www.whispersystems.org/"
 SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 x86"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index de81814db3a0..d31b850f3880 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,5 +1,7 @@
 AUX libslirp-4.3.1-bug-756910-check-pkt_len.patch 1404 BLAKE2B 6e9d046f5f25bbdb574534cdd26ab69c708a56893336a09a7e146d654c4e74af338ad178c0067662e696453930f627117f386f8d99d20a555b28452e309884b4 SHA512 2ebf8293aed6c09c1a03123e5b3acca602ad1fd293653f093e1c69d691e2d4db15c1f9d10262fc0e5019771f81e1812788b6e5234a602f13b3b73172d6f6419f
 DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
+DIST libslirp-4.4.0.tar.gz 128453 BLAKE2B da747071c22522649627dd8b2e1cd621129a6898b2391d0da2a8f032068f129d11de3dc0e0f94ac38b36c79e2cc0c9508a3bd3e9a07beca914219146c82faec0 SHA512 27f5d41730a3070df4ead1af4ec42fdff141289e5072ec93053b9236d9197bc3f1a3a804c85eef08458ab47a0d4921457df57ece5aae42cab9f068ccda31f3ee
 EBUILD libslirp-4.3.1-r1.ebuild 943 BLAKE2B 07f2a7fd3c2f8f7e006d20753ff857d76e9660b42ffe415493bd49f798288de514f21e8b318a21bb2a35b9efa2f4e3a455b7d49f3137ed26688081716510ed01 SHA512 cdc7cec91c6b67abed1f8c6437eb18853241e950cd097898fd169b1092b9d5f3e977dab033a0b8071dc4132012c1083cf68546d932064ccd442d0a0a07c1602b
 EBUILD libslirp-4.3.1.ebuild 865 BLAKE2B cf25ff2e27f4220eba664b17cf08f300ee0e83c27a5c314944d0dde730d3dac8ddc8e4a2fa0f20cb90a635d262411f186ddd38b951c148ac54257f7ef2199ac8 SHA512 1e8701efac9726e608f6a42db0420a05be3e9654ac0c44610d6df6be74a1146d65cd32be97af2afba959482995d7fcb2cbd15012e009167fa17eb7282ba66a7a
+EBUILD libslirp-4.4.0.ebuild 869 BLAKE2B 211ef5a2ca98a996575cea4f5296844147dbeb785680fddd5439e137f55fe675f17300dd3c76eeddddfb8686fa675ecd0f5dbbb90586c9225aea6f7df40a08cb SHA512 f5fb6db7c131f0207f30a0aec51ff240eb3a10cde2f901d395ff71418c914a737e35caee43ce16789e9c9d60398eeb013fd5f2cdb58d0cd5f4e8ee3bf614a997
 MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/libslirp-4.4.0.ebuild b/net-libs/libslirp/libslirp-4.4.0.ebuild
new file mode 100644
index 000000000000..013229b4fd9c
--- /dev/null
+++ b/net-libs/libslirp/libslirp-4.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+MY_P="${PN}-v${PV}"
+SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
+HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/glib:="
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	echo "${PV}" > .tarball-version || die
+	echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 95f989875491..0db340b79cf3 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -2,5 +2,5 @@ AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c88632
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
 EBUILD libsmi-0.4.8-r1.ebuild 989 BLAKE2B c0e313ce7f28a9f4bd7154a65ca5a595b8ecb22bd90e4c8e13661813acc257fee594fb737aabed99b1b3cf231e5172177ef4b3e6f487aa8413adcf54f2cadbc8 SHA512 dc7aa0631fb98736d7bc2e9931780584843d4739a1a45aa293ca8c9afddaa2619f46301e127133d48387b787d354fc947368d92e64f25c8d770a936beb60b66e
-EBUILD libsmi-0.5.0-r1.ebuild 905 BLAKE2B 2cd8359a14b69a6573d95a8682e40285e0bd748f111a1b39292681023f33fa0c59599da4e6d9ab91fdba75a38c15809ee4e42a076d13471f96b148b8b4371818 SHA512 9172f6d7ba549fa75cfc241ca7f075f908bb83a9b6b5952efe94bdd0e7ac92f547e76a204d3fe345483fceb9efe204cdb7aefda14b110d76d010109b54e32ebc
+EBUILD libsmi-0.5.0-r1.ebuild 899 BLAKE2B f66a0085abb97bf1f087d0ed1cd3a5253d707d2ec13393da363a6ebd82e5024afa6bc2cf8d36915228855670a028248e5a5c941467227584a33f6f36f53ab811 SHA512 8a07b75a6023c47651b16dc97dc7df80c39387e54e19052d8c608a087825f0b0ddf62edacb666c922c9f6e6714208cc48e8e68ad3649eac7c049ad4da9d85c59
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index b7fd8832d139..6b0294947d29 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 509003981ba9..2a93259e0e63 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,8 +1,6 @@
-AUX libtirpc-1.2.5-avoid-multiple-definition.patch 1041 BLAKE2B 2fd918dad5c759b49f07335685d01bef8bd1c0127647e097a5fbd58f9ddcfbe1179bedd306917755ce39428fcb4c130f9b628f60233dc2464da96c748fcf96ae SHA512 dd72fdc6fd457d89780c4784772c372eb493df3deac928a7c06709cd3517be5586584751a2a9324fc90157838a6fe594ffe91b4f8baebd6115482d76e94985ca
-AUX libtirpc-1.2.5-endian.h.patch 754 BLAKE2B 7ccb2c99a77757f02b7633246431a104e326cafc4261f4ca214ca4c5f0a6c3426502b6b31888e99f5c1e9cad9ffae2fd189a5b6970b8f7f0bb01d449aef68df4 SHA512 c91cb5b516d97b5349aee4ee3ddcd2cef7283adb7316a731c7c86332baa79e8c5e5d60d045360023886b75e2f55d72b0a778a595a363f5757df3781c1aa27c4b
-DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002
 DIST libtirpc-1.2.6.tar.bz2 513150 BLAKE2B 81ca8d1897b84897b31bd81c17e446213b798e00de80f03736f73eaf6b2e9e436b1569243bf9a8c5ad22de7da51339432decd2a8d3f1b8135151fd7e0f703e54 SHA512 bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a
+DIST libtirpc-1.3.1.tar.bz2 513399 BLAKE2B 8cc42292cdbde55a0095669bd9ccb3666b9e33d6ec9880ac79d034d42155d1b585f4181ff92f8290d7b5cce01bace2629d1ddfe0d61813f00851216f2be5ed0d SHA512 131f746800ac7280cc3900597018fc8dbc8da50c14e29dbaccf36a6d110eded117351108c6b069eaac90d77cfec17014b08e9afddcf153fda2d780ba64260cbc
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.2.5.ebuild 1645 BLAKE2B de2dec6ee157550e17fe25cf3e45fd3837c956753f7ec6c19d562ccaf014411959c3e7706582383d63fbe970c6e41e6cdde06fe687193681f0930853c7e3cd69 SHA512 c8cbe135c3ed50e0e77b59a6a7c93019fabccbc0105d941abe42c75e3313c47f990d64d83167603c8c4fdab7bf989bf1868ed9aa312c12bbd14f77ec98f5aac5
 EBUILD libtirpc-1.2.6.ebuild 1493 BLAKE2B 66e243917d5d90dbc525e8db028ac5975cfacd43e32b66ddd188f2fe946cb63e2f6f1c21f70ca1b1585839649dded33a1e21720103d44566c8a48064963f9036 SHA512 73fbee0d4359bbbed64e965b64bdf80e027119dcd7b103775fb08c86738e1b2730c587e58c5547ac01694b6e3754ab11f636b9d674a4e113cbda53301748c5bf
+EBUILD libtirpc-1.3.1.ebuild 1502 BLAKE2B 9753af0afa16b59eae8ab760084398a43d08ca23bf0fd2ff9b238fcd5f47079de41878e014d3cff2642dd24f557df4350da0c92ad1abf9a798d7205dca7b5741 SHA512 353ad95d991a705bd37c759dfc253aad64bb5f461c80473c129f34dbc877155d1280ee4c9f65e0bc67f3acde992376f5a906f68e61d5142f85767871ce85b6d9
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
deleted file mode 100644
index a5fecc54ced3..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 69682de06816de9b9014441d23bda1918ee2e2fb Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 19 Jan 2020 16:57:45 -0500
-Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common
-
-GCC 10 enables -fno-common by default.
-
-Bug: https://bugs.gentoo.org/705896
----
- src/rpc_com.h | 3 +--
- src/svc.c     | 3 +++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/rpc_com.h b/src/rpc_com.h
-index 10bec79..76badef 100644
---- a/src/rpc_com.h
-+++ b/src/rpc_com.h
-@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *);
- void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *);
- 
- 
--SVCXPRT **__svc_xports;
--int __svc_maxrec;
-+extern int __svc_maxrec;
- 
- #ifdef __cplusplus
- }
-diff --git a/src/svc.c b/src/svc.c
-index b59467b..6db164b 100644
---- a/src/svc.c
-+++ b/src/svc.c
-@@ -57,6 +57,9 @@
- 
- #define max(a, b) (a > b ? a : b)
- 
-+static SVCXPRT **__svc_xports;
-+int __svc_maxrec;
-+
- /*
-  * The services list
-  * Each entry represents a set of procedures (an rpc program).
--- 
-2.25.0
-
diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch
deleted file mode 100644
index 8245d022bde6..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Tue, 21 Jan 2020 11:51:16 -0500
-Subject: [PATCH] xdr_float: do not include bits/endian.h
-
-bits/endian.h is an internal header. endian.h should be included.
-
-Fixes compilation with recent musl.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- src/xdr_float.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xdr_float.c b/src/xdr_float.c
-index 26bc865..349d48f 100644
---- a/src/xdr_float.c
-+++ b/src/xdr_float.c
-@@ -83,7 +83,7 @@ static struct sgl_limits {
- };
- #else
- 
--#include <bits/endian.h>
-+#include <endian.h>
- #define IEEEFP
- 
- #endif /* vax */
--- 
-1.8.3.1
-
diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.3.1.ebuild
index 632193139a10..b10ca76d3ce2 100644
--- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal toolchain-funcs usr-ldscript
+inherit multilib-minimal toolchain-funcs usr-ldscript
 
 DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
 HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
@@ -24,12 +24,7 @@ BDEPEND="
 
 src_prepare() {
 	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
-	local PATCHES=(
-		"${FILESDIR}"/libtirpc-1.2.5-avoid-multiple-definition.patch
-		"${FILESDIR}"/libtirpc-1.2.5-endian.h.patch
-	)
 	default
-	eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index d0225badfddd..813697c35b8f 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,8 +1,10 @@
 DIST libupnpp-0.17.0.tar.gz 475725 BLAKE2B 568ead87791db1a41a4e5f93280cc8560336516cf676e1b64c35d0835579501ba61b75ee41e1dd1e58024d771f6f077c3c85515929be1c059a51ca314756fbfb SHA512 da7ef2453a8fad1e226c6252a84d76bf874128d306d4f9ca53e77e64734d113f3ad6dcd79549b2fe2a3cfab22243b5dceb1b7bd1fffeb512ed996b8fc680667e
 DIST libupnpp-0.19.4.tar.gz 469296 BLAKE2B e1240446bdd48329138183015445778f89abc575ade64a15c8564d2d3a6992b73c8fe7d0e9e99370f37ea851e65fef0a6b52e0fd274d064a5cdbc65ab2129c2d SHA512 4fda8ef9046d18b39cde4c5c6cfca4284f1f6ad76689cdab5a0d584b9fae17adbfe225542b81b88c62e62b65584dab38211a0606ac02ffd0f12abd13246c040f
 DIST libupnpp-0.20.0.tar.gz 476361 BLAKE2B 23c319e506a073b769437a842db6cd03709d834cb91b9c7626fdd3ff0573c8a654b8de91f180d152885570e42c53fa58e7f1602f932511a89b532340958329b4 SHA512 18b3026e65b3f1ae0b8d61154325e7f89c808fe2281d7d514358298a29152a4b5903f5cad9d8bbe9db34c5f57efe98989efd9d99c0b512197eb4554b3a4ff3cc
+DIST libupnpp-0.20.1.tar.gz 476369 BLAKE2B 8ba72486524c28789564db46e64804289f12b4fa4f249fe4f54830488d80f04f519005ad2f5fd8c3a9626c602a4673d7655177a11586fb43b9bd81644cf7fb3b SHA512 17ad11b2898abbdc57ed96280c298a6c94943f3e79101163cf7cace06a4d36058c0d54f0eaeb5da9b9cbb40a23f0597a6a9658060aefeb714723c9c53404db80
 EBUILD libupnpp-0.17.0.ebuild 458 BLAKE2B 56faef6ac3d1faac63ff7aa4a9605e0e760c94b8b86c1b78976067d992bacc017acf79579631aa9a699ea714e5db1debb5fc884d5780b02033af0aa185844319 SHA512 498f497ab2ef02b4c6a69780d6b74a180b510948ec4ec5f9dbc4dab16a04b18c09667d09f093a4b1fc637f89f449ba7fc38f4d873d14c2f3e950740efd2c85ca
 EBUILD libupnpp-0.19.4.ebuild 453 BLAKE2B b752e9674976be636fb56a05d438c0eaf8540586a93b9e0b808e9eeac1af3ed7b6840d24e9ab1ed8241c5661f0ca61a7cb7215e45cc7945d04f5e3d9cee1a808 SHA512 68f364f11638b206dc7506397f1138a0e46fcad20f742d189b21dbe63c3a90489b9efaec465c4c8dd406647c81ede8afd3e8440a24307a982c58905e9ace1aaa
 EBUILD libupnpp-0.20.0-r1.ebuild 470 BLAKE2B b7e0b16eff0611bed40f78bd11b2a97af1c7744e8219b042bb17ea60e790fec786b4f9b9830bc2a0e1207e24da7642fd203962c52810c33a4ed64439280ab452 SHA512 77363de1d8cbd273db9fdcf67403eb991336854617019b80bdd29bf0c67896e754ae57088ab13594dadda3ba45c4135339a79d5347a6dc96a7da55b9f80c7f8e
 EBUILD libupnpp-0.20.0.ebuild 453 BLAKE2B b752e9674976be636fb56a05d438c0eaf8540586a93b9e0b808e9eeac1af3ed7b6840d24e9ab1ed8241c5661f0ca61a7cb7215e45cc7945d04f5e3d9cee1a808 SHA512 68f364f11638b206dc7506397f1138a0e46fcad20f742d189b21dbe63c3a90489b9efaec465c4c8dd406647c81ede8afd3e8440a24307a982c58905e9ace1aaa
+EBUILD libupnpp-0.20.1.ebuild 470 BLAKE2B b7e0b16eff0611bed40f78bd11b2a97af1c7744e8219b042bb17ea60e790fec786b4f9b9830bc2a0e1207e24da7642fd203962c52810c33a4ed64439280ab452 SHA512 77363de1d8cbd273db9fdcf67403eb991336854617019b80bdd29bf0c67896e754ae57088ab13594dadda3ba45c4135339a79d5347a6dc96a7da55b9f80c7f8e
 MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/net-libs/libupnpp/libupnpp-0.20.1.ebuild b/net-libs/libupnpp/libupnpp-0.20.1.ebuild
new file mode 100644
index 000000000000..2ffca9d9e1bf
--- /dev/null
+++ b/net-libs/libupnpp/libupnpp-0.20.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/expat
+	>=net-libs/libnpupnp-4.0.14-r1
+	net-misc/curl
+"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index c52a67a0d64c..982d6a9c4738 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,9 +1,7 @@
 AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a441c389ff57b5d1814174c90f2e3aea8f269a08c84035fd6853283a47a5eb48dae36ac2c7adc1dfbb85b985a62b2158c87c43c24acf2170 SHA512 79977a3e9142ea4c295a2b3a35f9e902d36fa032ff3ae1f13e6980eb9fa260239205f1b9b5998379a4b56f53e25af72e07c9973d1c67da2cadb254296f964fc4
 AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b54633f4f1c855b0d72ec11763af5b6a550708491a837542978b0a3b2607027c2c5f85375c71ed92f4f3726e10732010bf04565feea5ce765d89cb36ef SHA512 375a5ae24f3399406628fb604ac84670e1a2fb4ae08a4525da721a589e7e06f1265c1d906a037e0e20bca5d88785125f3d831eb853b79e286495ec0e32a22e9d
-DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
-DIST libwebsockets-4.0.20.tar.gz 12342036 BLAKE2B 983190f7f63eb9db09b688ae056c6fdee32ac6d57f4afe3fb42cd662202c290c21a28e9c107d61cd3b2ddb25478f93b56008dc939ced28cd1c5abd6314fb1b32 SHA512 b2ab19623557b67abf157aed0317fb2305304e72c7e40c202c0bc855a499bbef64978e9187adcfdd2ef251497144db4a9fbaebaf37a320c7190720e9d194b67a
 DIST libwebsockets-4.1.4.tar.gz 12698800 BLAKE2B 78cb9587af7a5cc368c3c4ce7b8c8cba7d25961595ae8853f52d374b73404e5fbd99ff9b552dc9d6370fd425d6bd28fc69b71be37f2f045817f2cb8f5354dcbc SHA512 4da84f612ad427465c4eea0bdd0db59c21c9e42bb21eb46b904f544dc4078af2c9a957e61430f3569b87cfc96b3addee50ac7a7c77777dcf16350fe441dd8854
-EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
-EBUILD libwebsockets-4.0.20.ebuild 2519 BLAKE2B 88c178b4a7ab0704bdb0660274d59488ed14d7e365c92a991f90963789cb4ea6409f3774e710617ae254f3e1a525d255dc66d21b8c30200bf714fe67be422b4d SHA512 d1ec85cf9704f300ec40186226960fde1474a7654b93665025a4b8ee37b17147d95ff7179e276763b3d23f83b6eab7cfbe52c532475023ec8a5af2e838632f91
-EBUILD libwebsockets-4.1.4.ebuild 2368 BLAKE2B 978ddf6ddc319cc93fcc5a22be81475e5dc329d8ea78f103b7a739bab55fab92522205be1da6783cb5142f650b79d7a099ebdcf52345e4960293afe56ca62138 SHA512 48e48e32e3f971dbab4d896121e180c87457b2e41cf483b130eb0b09e699655875d75d38bf42b25f5b085dc3fd702395c2dfb2fa5c49e505a2fa1e14f1718344
+DIST libwebsockets-4.1.6.tar.gz 12912895 BLAKE2B d6b8c96b8da4c177e7c730acb13bbba63996b1817bc0e0df36923c7ad3aabb6823f852c84bef865e85ed7eac1855273527ff6e92e413bbed8576388ce2ec7e3f SHA512 b83059b5405fe5c8bbfb6ef4cdfb66ce8b3fa2a660c013e64fa579f3ae09c70a6e3807d37ad4cff1d37b0c797959ba4e9c527be7e31520b3853161cfd6224a54
+EBUILD libwebsockets-4.1.4.ebuild 2363 BLAKE2B 10670a87356ce46c0702a8d3979d95b17846ba4e00c02215ca8b8464f4b261826fe130f1702c3b06a52b48f869f47d48b7aab1e1e0439efc00a5d80fbdf0b36c SHA512 3d5dce9a505f19224a0feffa6bf41789c5a1421d86db95ab2502131ffe671a4a4d3aabc983ee248b8288cc00cdb61bf9c407527f1be49c78808d49baa37b8614
+EBUILD libwebsockets-4.1.6.ebuild 2368 BLAKE2B 978ddf6ddc319cc93fcc5a22be81475e5dc329d8ea78f103b7a739bab55fab92522205be1da6783cb5142f650b79d7a099ebdcf52345e4960293afe56ca62138 SHA512 48e48e32e3f971dbab4d896121e180c87457b2e41cf483b130eb0b09e699655875d75d38bf42b25f5b085dc3fd702395c2dfb2fa5c49e505a2fa1e14f1718344
 MISC metadata.xml 1662 BLAKE2B ba4299d39ac10860ea908bf83ccf687af48d3e5764b9823a9d1e727390dc53c569d1e824587fb7e586e211e4366c799b1e91efb817fe6495ed0e6ea643e94147 SHA512 722b59c06d1d1810b21852cac65fd6a7a929f280cbdcdfd0ea97285e8bcbf17ad84d00c7d41308deb2d91905ce3d5f3f0cdc8f5f975a4eb7c0b7fefa431becfe
diff --git a/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild b/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
deleted file mode 100644
index 57ab8eb8aed2..000000000000
--- a/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A flexible pure-C library for implementing network protocols"
-HOMEPAGE="https://libwebsockets.org/"
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/15" # libwebsockets.so.15
-KEYWORDS="amd64 arm x86"
-IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
-	+lejp libev libevent libressl libuv peer-limits server-status smtp socks5
-	sqlite3 ssl static-libs threads zip"
-
-REQUIRED_USE="
-	generic-sessions? ( smtp sqlite3 )
-	http-proxy? ( client )
-	smtp? ( libuv )
-	?? ( libev libevent )
-"
-
-RDEPEND="
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	http-proxy? ( net-libs/libhubbub )
-	libev? ( dev-libs/libev )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	sqlite3? ( dev-db/sqlite:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl?  ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
-	"${FILESDIR}/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-		-DLWS_HAVE_LIBCAP=$(usex caps)
-		-DLWS_IPV6=$(usex ipv6)
-		-DLWS_ROLE_DBUS=$(usex dbus)
-		-DLWS_WITHOUT_CLIENT=$(usex !client)
-		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
-		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
-		-DLWS_WITH_CGI=$(usex cgi)
-		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
-		-DLWS_WITH_HTTP2=$(usex http2)
-		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
-		-DLWS_WITH_HUBBUB=$(usex http-proxy)
-		-DLWS_WITH_LEJP=$(usex lejp)
-		-DLWS_WITH_LIBEV=$(usex libev)
-		-DLWS_WITH_LIBEVENT=$(usex libevent)
-		-DLWS_WITH_LIBUV=$(usex libuv)
-		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
-		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
-		-DLWS_WITH_SMTP=$(usex smtp)
-		-DLWS_WITH_SOCKS5=$(usex socks5)
-		-DLWS_WITH_SQLITE3=$(usex sqlite3)
-		-DLWS_WITH_SSL=$(usex ssl)
-		-DLWS_WITH_STATIC=$(usex static-libs)
-		-DLWS_WITH_THREADPOOL=$(usex threads)
-		-DLWS_WITH_ZIP_FOPS=$(usex zip)
-		-DLWS_WITHOUT_TESTAPPS=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
index 30dbd55c5f2f..67609f666097 100644
--- a/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/17" # libwebsockets.so.17
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
index 134f80a69943..30dbd55c5f2f 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic
+inherit cmake
 
 DESCRIPTION="A flexible pure-C library for implementing network protocols"
 HOMEPAGE="https://libwebsockets.org/"
 SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/16" # libwebsockets.so.16
-KEYWORDS="amd64 arm arm64 x86"
+SLOT="0/17" # libwebsockets.so.17
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
@@ -44,16 +44,13 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
-)
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
 
 src_configure() {
-	append-cflags -Wno-error
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DDISABLE_WERROR=ON
 		-DLWS_HAVE_LIBCAP=$(usex caps)
 		-DLWS_IPV6=$(usex ipv6)
 		-DLWS_ROLE_DBUS=$(usex dbus)
@@ -83,7 +80,5 @@ src_configure() {
 		-DLWS_WITHOUT_TESTAPPS=ON
 	)
 
-	use dbus && mycmakeargs+=( -DLWS_DBUS_INCLUDE2="/usr/$(get_libdir)/dbus-1.0/include" )
-
 	cmake_src_configure
 }
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
new file mode 100644
index 000000000000..11c32bab9066
--- /dev/null
+++ b/net-libs/libyang/Manifest
@@ -0,0 +1,3 @@
+DIST libyang-1.0.184.tar.gz 1659420 BLAKE2B 55b54e5440fb08437a91df2c218e4add37740c0416b26e9ac3b5949a4a5ba25ded8c4c7668e0bf20c8ffcfbae95f7c4699673998285ce37c17604f121429fd4f SHA512 bb1c396b6048d848ea844cc462f1ee9f14b0dad848c7618ec0f9bd239d28db8a94f94550c5439ca07e01824a910a748ec6be699c58150b34072c2f9b76acd95c
+EBUILD libyang-1.0.184.ebuild 745 BLAKE2B c113c0bf038e829c09c4da4320eed0867d1ff53a645dfb4f642e3411d2fb859e3fdebe9338d8c3e11e51b5e59af599567e08fe661d816b284c70e42611a3afef SHA512 8be276b8622918fe54b91e82164dcbf5b24187f04eb374e9feb21d2c0a3ac2cecb51061730835edb3d487602772da7a90212b06419476fd55cc2287cb50f8293
+MISC metadata.xml 326 BLAKE2B 45b056740b8b584e8b4e559a006238f1ffab67c325b7a23916bd642d3e9fee1503e165dc3477aa7b51ad1555e8e2c4e1c74b7d1b868b22c6ea96e286f4787a11 SHA512 00e03ea5ff75266886efc60fb13079cd2c0983ab0707f2002c44e7e3cbb984778f5d6341838ad7fb7ae1679fcacabfc949b9d733a4a88bc2ecb503352afe2eed
diff --git a/net-libs/libyang/libyang-1.0.184.ebuild b/net-libs/libyang/libyang-1.0.184.ebuild
new file mode 100644
index 000000000000..5c9ff1be96a1
--- /dev/null
+++ b/net-libs/libyang/libyang-1.0.184.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="YANG data modeling language library"
+HOMEPAGE="https://github.com/CESNET/libyang"
+SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+RDEPEND="dev-libs/libpcre"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( app-doc/doxygen[dot] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_LYD_PRIV=yes
+		-DGEN_LANGUAGE_BINDINGS=no
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r "${S}"/doc/*
+}
diff --git a/net-libs/libyang/metadata.xml b/net-libs/libyang/metadata.xml
new file mode 100644
index 000000000000..06418dac289b
--- /dev/null
+++ b/net-libs/libyang/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">CESNET/libyang</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 5e78c3bd55b1..79a92a76134c 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -4,5 +4,5 @@ DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb
 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
 EBUILD loudmouth-1.5.3-r1.ebuild 1170 BLAKE2B 796ee7350f10ddf6f962dffc0b0514da80650e8b515208230f960353a3e8346c599f498f012e4dadac5e849ebad52a5d1addb736ffc51ec825a48ee5e8f956d2 SHA512 ebce5d4cb91189e8451f371720579ae803d21c387f5d94e0a3ca8d7406e5a7a13072ea8331eb2b42e73122a20c50e1563bc86732cb22fa5091d419162576ccc4
 EBUILD loudmouth-1.5.3-r2.ebuild 1198 BLAKE2B c9937e44c3d032a6a68e4fce361a308609a6d287f498d45b69a870ae44ea7e84703ca761af65e610e065dc7ec41571b1b649fecb87a4bb45f1f6e13a9cc7bcbe SHA512 7598c1fe67f16f5bf37c30f00da4a2ba2eb42efb4826295a3980f72a0036783c3ac4ff4ce0963e06a28e0be28c9d25e36228edf2328515da96b890df7ea8e6cb
-EBUILD loudmouth-1.5.3-r3.ebuild 1074 BLAKE2B d4423f6290a6758854eff9aed1f3301afa45bec3096d8790cc77b7e7a6eb9bf4800077d84adfea08841126c18b94b65ecb505a811508274496e38f41fb4f7bb1 SHA512 bcb978c82eeb5e03fbc03ce485041674cadf59f724524086a7ed4de63c15f3ada7c29a5cbb11207a6c1104b8b1f0cc01b4e6432eba17a6d17c9d8e13bd83c76a
+EBUILD loudmouth-1.5.3-r3.ebuild 1081 BLAKE2B 432f2a710d14400adbbaa55b2c973d9e8022dedf57f8a9af4513c77647b2f281cf9d9fc7ed21f1d2c3b915e8b96beb18e109a680596e706d86beddb946a8e3ff SHA512 b18bcf635a5c63d1c91ec0a0d8c4b7bf7991ea81ac38b6afdcea969275b899b21221d496a7b0826160c05803973d246d06506132c9a7cc6c7ad20ed62b8625a5
 MISC metadata.xml 563 BLAKE2B 11e3e68d92736cc1dc95df692d61420d487434c24d7ffa665ef7453fb0dde039b6006ce3edcae8ac0401dc15f99468133b3a4eb73c48b6ef20570558b33a90cf SHA512 b2847486aaf03b8bcd02ea006247c735da3dddac5e60f746f21d32985ef78585c347eae6cfcc8723175166455cd758014e19ccea79bdd77ede74bd36faf31c09
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
index c1581eabfdf5..4a48f8ae0e73 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 68cb54d0b576..50bade2c8dcc 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,5 +1,5 @@
 DIST mbedtls-2.16.8.tar.gz 2662927 BLAKE2B 80dabffe644c792ce8a317629950bee71a2376be8f84de29d5cb92047ee433347e7e91be513d638b2954c0c7b2393eaef81b7d449753efffab25694b8a8b52d5 SHA512 645d58d42594a2b547b904634acc1e7e8583465e075c190183e1179638f05e1f8f5c56561ab172fed8dcec4a1742429663abdfdc25d607410ea64a35fbb22168
 DIST mbedtls-2.24.0.tar.gz 3912697 BLAKE2B 4355fb4db90e3d72e73adcd8ee96c7db2809154c08a00c1a3a8a8f8d6360689f17317a6dd3564c85e1fadece1a49f1ce30561ad21faf48a5bab78e223f2cd070 SHA512 5437ea57eb8b8af9446a796876aa2bfe3c59c88f926b1638c7e8a021a8bef9f4bc6cb1b254e7387e2afe095bd27c518060719726bbaf5478582a56c34315cfb8
 EBUILD mbedtls-2.16.8.ebuild 2498 BLAKE2B 3bc8c2d29f0b7c6c1e053d9a9580c2f20328308a70cc9e2f3028937de615c3d08f617597133296a006707093829d19c28a613d1e8d57f18d91ef5e4e8d068542 SHA512 36107a890ef9ebb8dde5596bd3d8fd0a660149adca8f8fcea8a0eb733e0422305ad38bdb35afd2e4ae6ec489a1885a37c3e2bf5b11e2de879c50a337d0a6338f
-EBUILD mbedtls-2.24.0.ebuild 2498 BLAKE2B 2e536e115ce4d55d5dd2e7561d7e1c742ae7a085872bad0a26267f1fda01f00d09ba34abf0bde576d516313ec0f8f8af96618610c45adefbb1a059873a8936c1 SHA512 46a61cb276f8fe028d5a7ee341f0063d5d721f1737f8807953586438572678fd83c1cedfb792343d5b648f61a29ed8c38446397d627fd1c89b80ff1f453652fe
+EBUILD mbedtls-2.24.0.ebuild 2558 BLAKE2B 3c800e117bdf590f4b2b36ed8cfe1100bdd3e5a7f30f1c0b75d8a87df0564b9d48ac54a4004a9aa106ddac89e1d0d38889d1a12f15cdfe8dd73044431bfbeb80 SHA512 efd6824356a5fc621fcf8b6f7c0937721fe8c044a5c49bbf965ee09f339aa0cbe8b38efa2cf65e87ba7d6f8f89188a45a6df95a8a08abfe024a55ce879b87ad7
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.24.0.ebuild b/net-libs/mbedtls/mbedtls-2.24.0.ebuild
index d8a0317d15fe..c7e0dce91059 100644
--- a/net-libs/mbedtls/mbedtls-2.24.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.24.0.ebuild
@@ -53,6 +53,7 @@ multilib_src_configure() {
 		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
 		-DINSTALL_MBEDTLS_HEADERS=ON
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
 	)
 
 	cmake_src_configure
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index caf4317e272a..d34d0d4d1e3d 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,5 +1,5 @@
-DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9
 DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9
-EBUILD nativebiginteger-0.9.45.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
+DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
 EBUILD nativebiginteger-0.9.47.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
+EBUILD nativebiginteger-0.9.48.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
 MISC metadata.xml 367 BLAKE2B e6ae176d14b1c47214343a27d2fe27d22f354879bbe3e27d01fd9fb06944ad57ca6791765dec8246e6a1583e9f66cfc72867b0f85a66f4d0752a64344d9fb5bc SHA512 a568f5918a48ac57cebe1bc19c22f8e7ee2f2e1e9710b088ae7411ae1435bc170a7e81307da909bea3781e2e3217f8791623e3b0f4a50658232af9b000bf4f2e
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.45.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild
index e0d376b7aa6d..e0d376b7aa6d 100644
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.45.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.48.ebuild
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 7cf083006144..503da93ac282 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,6 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
 DIST nghttp2-1.42.0.tar.xz 3973284 BLAKE2B 39431619bd3c9a66eb217065bb29ceba8f3fda376343687b4774ed5e73c634f51142b407f9515ae5ad4363af5cf57c0199f9bfddf5bc08dc587419ec03cf5b45 SHA512 1d93e6262c5538e26fbf36567230b4a239dbdfee26198b1e1d5862bf4459ae435679674c047407f5c604ddff91d7717d8515532e00bcdb2aa75f27ff97dce60c
 EBUILD nghttp2-1.41.0.ebuild 2009 BLAKE2B 4a7a37c6b445be8f5e84a5fba2a5982c33037ad04de4cca1bdd869d600f7416945277510803ad9fe657edf94bf6fee914d75ab4a5bcaa92dfcc223ac36a7ba32 SHA512 5e5dfb11026419e9dfa6101dbd5617ac77dbd3c2fd1877bbf73bf8a88b545aa29c7dbdd7551d54fdb2b07d0ea0d6c6342f0ec67be096f3fbb2766548c4aa3d94
-EBUILD nghttp2-1.42.0.ebuild 1998 BLAKE2B d5db11f1afac81618eae5d83c81bff6d9d4e2fb9006cdb6d5abd17caefbf18b6c025437ebb17dac40568fbe3b63ea5189622dbae25d0fc1331c6338c4c3b4575 SHA512 4ba3fb08741e219b646afda506ebe958248cdbddb3c7b3878182e3961078882ae8d6e231172ff3c0809c7932331aaff2d147b4195a976fae26ea9f8c1065c2fc
-EBUILD nghttp2-9999.ebuild 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
+EBUILD nghttp2-1.42.0.ebuild 2052 BLAKE2B 064f1b52e42bd47777834317daf76b21d3a0c205940ff4fc1cb19349f6006d828631d408ac61edc6fb299e125300b51c19a0c00f8889b95c0baeb782e947f54f SHA512 0a998771304c01f2651fbe3f9435eb09feda3e363d8a8bb85ca075bb6301cf9925d551ff59aaa66cf2be47a61aaae8dc68076142c1e38509b85f3aaa3aae2d5a
+EBUILD nghttp2-9999.ebuild 2039 BLAKE2B 2df9cdf73d906d32ef462276456121786f8454c4c82890ec1a70a7fac3d6874d8be2c101027b1c85c4ff207c8597dd7afcb531bbc6c33e0af8da21f57da93f50 SHA512 7ae20b6d99f71462166dd2a15c5f408496714af33cd5644e3c73dea8757554b455f684b6ce8b412b4ecaefdd928b085a602f64626524fa2d70af9dd1680e6303
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.42.0.ebuild b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
index ee4707056e7a..b868914d4119 100644
--- a/net-libs/nghttp2/nghttp2-1.42.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index b43a0d325068..6159ee00f9b6 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/rtrlib/Manifest b/net-libs/rtrlib/Manifest
new file mode 100644
index 000000000000..d97fc414e292
--- /dev/null
+++ b/net-libs/rtrlib/Manifest
@@ -0,0 +1,3 @@
+DIST rtrlib-0.7.0.tar.gz 260699 BLAKE2B ea8b70b1ca1fb7cacc2943228e398e16f61de6264702f87e6bc5dc011dbb77e760a4e317f109e13b882efd9c080847e6e86c9c47afdc4518db5de210621181fc SHA512 e1c78ce92d066308c1c4fbb6575c2f0dc0f6840c16be90e27bd0da184cab7d0fa4dd1cff3677eda5f1720184756e02765e5abd267b0da0d183082721fee2ffd8
+EBUILD rtrlib-0.7.0.ebuild 1075 BLAKE2B d211d72d91976606568afaea0aa6e1eecef015b7be066feb070881fdabf03b028d908aec5ad79e514214e9db03b9ffd858f07050882f6a5fadb1fdcaccab7da3 SHA512 cbc26cdf5371cfcbe2f7cc1618c4e29dd94f54ae65bd04cf51333fd9cb1ed1d2c7ff4d7f2d1c94d308a33646399b5ab5aaf9301a2493ef2614f0449d967a6cb8
+MISC metadata.xml 314 BLAKE2B 2c542346560c4c3fb2aac071c7b1e86c77c44bf84e2bb0cf0adc494befe7287193c9188d74cdca9a6a13b28e19a892750877fccc36b8416cabfb37cb99b7e01c SHA512 d6847c79918cf25ec8e8071f1a1653c207834441a146e600b64609ce533694885ebea1bf3d1d73f3b71606d94924d3249197a5ad4b4086985b45e2653fc7f9ef
diff --git a/net-libs/rtrlib/metadata.xml b/net-libs/rtrlib/metadata.xml
new file mode 100644
index 000000000000..e65601273129
--- /dev/null
+++ b/net-libs/rtrlib/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<use>
+		<flag name="ssh">
+			Enable SSH support
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-libs/rtrlib/rtrlib-0.7.0.ebuild b/net-libs/rtrlib/rtrlib-0.7.0.ebuild
new file mode 100644
index 000000000000..58f1a21763ec
--- /dev/null
+++ b/net-libs/rtrlib/rtrlib-0.7.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="An open-source C implementation of the RPKI/Router Protocol client"
+HOMEPAGE="https://rtrlib.realmv6.org/"
+SRC_URI="https://github.com/rtrlib/rtrlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc ssh"
+
+RDEPEND="ssh? ( net-libs/libssh:0= )"
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+"
+
+src_prepare() {
+	# Fix checks for libssh version
+	sed -i \
+		-e 's:/libssh/libssh.h:/libssh/libssh_version.h:g' \
+		cmake/modules/FindLibSSH.cmake || die
+	# Fix automagic dependency on doxygen, fix path for installing docs
+	if use doc; then
+		sed -i -e "s:share/doc/rtrlib:share/doc/${PF}:" CMakeLists.txt || die
+	else
+		sed -i -e '/find_package(Doxygen)/d' CMakeLists.txt || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DRTRLIB_TRANSPORT_SSH=$(usex ssh)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index 94bb25810435..2b433a0fa59e 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -5,5 +5,5 @@ AUX signon-oauth2-0.25-pkgconfig-libdir.patch 455 BLAKE2B 787c03ead028ff9e7980de
 DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
 DIST signon-oauth2-0.25.tar.gz 41090 BLAKE2B d14cde073cf834427e337f94345b719ad1af38a285587f987f6ed42f96e8aecfcf63720e42b7f86f2018565c198e1f31b7b75da74c86db3e8a15680da70d3f9e SHA512 721cd514ee0a1175e3b1bbaa78dc1a87fd382327bcbee8356de040f04455f7cc80ed173e3f33a6acf4c0d679847063a25282e9d5c9a9be99f730bec41be96451
 EBUILD signon-oauth2-0.24.ebuild 1131 BLAKE2B 2b2e88b2ef23769ca79cd86427e365e10108dccc1a313f6c6e7fdd07db2c4a2bd23381f5a2c68a9483937c0c726239fc5ba0988991b1f296f02ce950f701bfb4 SHA512 ddfb2cdfc778813d176b8fb31346626b5140eefe22b55bbd4a61ffab6fa33d9e9b0603f8a33aa49c3daf2e899e354f58f5a3cee6aa2edc3d6ac61b2e37d37461
-EBUILD signon-oauth2-0.25.ebuild 1140 BLAKE2B b1848c19a4d79c90c7864b326807a365da1644efa493e1a67867fc2d45b934f570b3e593593db0905d6f88c306a0e9ef056bf6fe7638b228e03dcea15c31eb46 SHA512 dde4de232b385877d59cbcb98ebdc2cfd098ad26baeda7bac55c96b5901272e0fd70b15668a9f23fb5b4ed6ccb5c0803abb96d33300cb38227dcb3a9a911f153
+EBUILD signon-oauth2-0.25.ebuild 1139 BLAKE2B 511171e2f8734cac3bebfb4cb261146e0b0f3c2c7a71b7f3e321bc663a6cd79c010704c1cbb7af5927ad6b23b7f0a7d9cf722ae1e568e63e1aacf1e31d0f6f27 SHA512 27badd72d141bdd279915ef4ef635617b88c2c11330a29af74d92601710525dd57a9eddb7df1742cd18f9863762176ee9f8807ad62158cb92d9b7efe404f89ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
index 76e60e083a28..90aad7e670c0 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7e026f4f880e..b99d60d2e016 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,8 +4,6 @@ AUX 2.28.4-non-jumbo-fix2.patch 1196 BLAKE2B 735a58a9ccfc9fa61a7d8e649262404d3a1
 AUX 2.30.3-fix-noGL-build.patch 1005 BLAKE2B 644b114779d34f644168e3cd1e4fcb5827bd39afe3c0f6a615c7ac9ff36b74d9a4ed34b7d91ff9400fd5acaa4d9321c22662d8625a7510a2c6ae411d6bd4c593 SHA512 15cc427a6db3fb32f1951d1dbb39b5d869601be916179d17dec244e80cda16814598271667e2cee75d367e596c470bb8c837abc7651e65ab19305c9b9fbf0002
 AUX 2.30.3-icu68.patch 8277 BLAKE2B 7bb5a2d15a1006b7248a6a6fbde0a2e71df1aa4c02046e9c91fcb44ba218fc2e6d6655d53f478eeef3a3d77f4bfe35728155c524332841c2692ac165af48524a SHA512 02000d2759a599596946912e45978334eba0827c691ab4dfd313a7cd5fd71e148a59fd4cf61d9bf9a102a1a5922da5b4e473f03f46930f9e7dd6dcc36dc7dc95
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
-DIST webkitgtk-2.28.4.tar.xz 21424908 BLAKE2B 5ca9206c3c7d0a00bc76487ae8fe79e6c5b94a86f23300f196b3edbd5e3f1ea68768ef4465b32fa694a7b6a4a2b274dfb9dba4a20b8329f9138970f1a82eb7e6 SHA512 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1
 DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
-EBUILD webkit-gtk-2.28.4.ebuild 8914 BLAKE2B 63f6e796093c76450cef123857e6e65205bd66e5161d380d7ac577322eccf280066484be31c47196762065c5285911e678b1d5a39ae5eec7e839a13cc19208b2 SHA512 ad5521cbb22a5efe8cb055d5e966bc155d290cc1c8a0edf66e569025d0c1c4ad04c5b88f33b54662bfd587e3e6c412ca955f0c4d09fe1d6e0f66fe545892f76f
-EBUILD webkit-gtk-2.30.3.ebuild 9211 BLAKE2B 4f124fd6a434aa644fef3b6ee27b261e43630fc051f4e5f809f1b434cda9584ced3ea7cc808460beffbfe3d730beb62689c812912ac10c6dc3ddd16d4da08c18 SHA512 e8d324a49fe5ff6d71f43429fdf3490e754d4fdafed872d027617b3456862e82ac0a7ac904a86f7d0576522dd97ff2074966c9936e532779ff09930808f7e515
+EBUILD webkit-gtk-2.30.3.ebuild 9208 BLAKE2B 4927d235902d74747e3f41e22ceb0aaa5034bf10e662f719fe2d8ee46324a8c2b5255f539671e27453a97ff11030c3f1f1a13e8d5b3f80742cc93276a3de642c SHA512 be9eed6324bb1770fa1e686bd607276b64a15598b952039bb185234fb8c145c745e939ea01eca5765616ab2421fa9559c14b857a93fae44c74d42517d5bc3bd1
 MISC metadata.xml 575 BLAKE2B cfd9e50e79d0627b50f7eb968d0590a88afe55ee5ebccbd81bd5337fd2ea06355a34db909c18f53a388bd3c1d09d82c805284f7db43b71549f29124a5e0cfe39 SHA512 d7b45d4ac89607bfda20a30070194ebffce990784ad376739687680a08e203f570d5636224c37807bfbdca03ab9a3c745c7c41f4e632678acfa2cf60b4eecd30
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
deleted file mode 100644
index 1a0c147ba35d..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python3_{6..8} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
-
-IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.3.0:1.0
-	>=gui-libs/wpebackend-fdo-1.3.1:1.0
-"
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-"
-unset wpe_depend
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
-	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	WK_USE_CCACHE=NO cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
index 42baa21fdab9..9472a0f8c266 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /net-libs
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)