gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /net-libs
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
183 files changed, 2395 insertions, 3083 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9b852e6dbc17..5b102f0ac27e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 4fac38b6bfbf..1a3fd1f191c5 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,3 +1,3 @@
-DIST aqbanking-6.0.1.tar.gz 2551617 BLAKE2B 0f18e63f6fc695b4fb3c5b831d324cf039f02ce740655953bacbcb6fa805e441ac989fa1ef7504cf3417b366acc9dc5562b13788af72faedfd27778bd3097769 SHA512 57a4f1416efddff4ce0a7b1cd5f1035df95a01001fff3b43b0febbb62b322839b1d0e8be2c765863da6de3e30c85726a8866529d9b16162b18d5c204e7eb8081
-EBUILD aqbanking-6.0.1.ebuild 1408 BLAKE2B 053dd82a49aa370b45d0698b84b64f3e0441400947e578056a6718b39271c69e3c6cd41bdb58cc9d8263912154ca67264030aa60ca65e6d3c5dac757c7138c37 SHA512 76742499d90a0a9fd8c2097dc43cd4c5da919c66ae91da739aadc457308965cf760442494d766964c75096c6fe8b1f86db567bce6e05204a9b2c7ea50407cb32
+DIST aqbanking-6.2.5.tar.gz 2611057 BLAKE2B 05ba9b652f60ae79bc8446f65714ec72396669886d34e57ad09a21b4e5a563bc3f9fbb14431be076b9c05171fe6eac17b128d4bcd7af5250fd5c63d8d93e3e65 SHA512 aec71c16d8f0b3bdac1bba32f83fb22d5b4d2272b41845e7f63e770323a622fcabe1d2e1a9fc98977a38c467ab7cc0f934746216c2107363b81f51b90e65c88c
+EBUILD aqbanking-6.2.5.ebuild 1401 BLAKE2B 4881a0b9c74f648d89f2f86467606d7f8275a7308717954cd1a5315f9dc35b58d0f96a3f48b2ff61bccedef6425a3cbb82d77af91635cc02b1eb8cdfcb36c9f4 SHA512 653d56ce804ec1153f855b3ef174b6fa7a5e60165ccd768adeda59e7bf047259848235416435707c79b07af7fe8e4410c1741acacde27aa77aaa9b42979da408
 MISC metadata.xml 293 BLAKE2B d7d3b8ac438d348201f1ed95a571b9a6caa6d0790b5cb10b0517e1bc0b4c0865f95c9405921c8591cb9919042c6d187ba907961db76608cdd7639bc83db6a3cf SHA512 acb2e6fd914b139a5ac76ee86b966fdcca5a51df6e343b47180937321d0d5bf2269cf6acf515596e7e88297af54a7dd09c5274c8c3468d96f916d53ae25cbc00
diff --git a/net-libs/aqbanking/aqbanking-6.0.1.ebuild b/net-libs/aqbanking/aqbanking-6.2.5.ebuild
index f2a3e161f63d..f0c61657451c 100644
--- a/net-libs/aqbanking/aqbanking-6.0.1.ebuild
+++ b/net-libs/aqbanking/aqbanking-6.2.5.ebuild
@@ -7,7 +7,7 @@ MY_P="${P/_beta/beta}"
 
 DESCRIPTION="Generic Online Banking Interface"
 HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
-SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/238/${MY_P}.tar.gz"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/342/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,9 +22,9 @@ BDEPEND="
 DEPEND="
 	app-misc/ktoblzcheck
 	dev-libs/gmp:0=
-	>=sys-libs/gwenhywfar-5.1.1:=
+	>=sys-libs/gwenhywfar-5.4.1:=
 	virtual/libintl
-	ebics? ( dev-libs/xmlsec[gcrypt,gnutls] )
+	ebics? ( dev-libs/xmlsec[gcrypt] )
 	ofx? ( >=dev-libs/libofx-0.9.5 )
 "
 RDEPEND="${DEPEND}"
diff --git a/net-libs/balde-markdown/Manifest b/net-libs/balde-markdown/Manifest
index 9779b0a23e58..935dcce24bc0 100644
--- a/net-libs/balde-markdown/Manifest
+++ b/net-libs/balde-markdown/Manifest
@@ -1,3 +1,3 @@
 DIST balde-markdown-0.1.tar.bz2 260429 BLAKE2B 4306a02e363a271c77d9ab3f08261ab9410d6ac8c258bc74dec3b1cabd8728927d12bd0d0b2941f5dbd90256e11ef8e30b5c952c2d7711bf6ae2896068822862 SHA512 ba0a952d1f8480f6173a8af6eb662741ac04db4e39d65158afac97606c2faaaff973dce384b2bc1d42aabbdd345cd451fc5624f1c6d2f941f2630b2e76a01d10
-EBUILD balde-markdown-0.1.ebuild 772 BLAKE2B 13a4dc060c3498e47c50c289178a9c1b777f7c0d3a6ae8aebbd8e207590b494e2fda453ae4df513694af909a268bb827f573d282fb9c481ceaaf403646ba7150 SHA512 778bbda2229c50b9922c424e8103cb2e9f03e7e4e20bdb637ef1c9199fd9592936ba924b3b5380d0625106e308050520ce38672621ecca8eecf96c58b089a6ec
+EBUILD balde-markdown-0.1.ebuild 863 BLAKE2B 534e8c756f9104966e8102baf9cfe452c97f7b39c6d1b7ccb7f82733ae1eae6cd7b4c3c885c3c9dbe36ebbbe750bb56a5bcf541357d5ea94d1d1ee55f9b4dafc SHA512 b6cabbd0ad10f274cf1c3acbdcfeda7f8d9fb6be95abc7cea4ac45267055acd24fa3deeb286106de1f4958be0a8d6881991f1b875d02065e189ffe2242e9bedb
 MISC metadata.xml 521 BLAKE2B 6afb26701f579fd511ef204d5c9da2cb22b8aac65a72932603fda2cca522afb2584f2a36cb6908d303e42953a677653fb0946d0f3de613d745271be7dfc17c72 SHA512 0abb67c78d16507170e686c71c08adf4749e19549c7c7a02fc391f8df69fa3973a98aa805c3436a3beb97e4b7f37e353f548e19027115b41542b255384e7873f
diff --git a/net-libs/balde-markdown/balde-markdown-0.1.ebuild b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
index 50308fafc019..fc2f27bf4c3b 100644
--- a/net-libs/balde-markdown/balde-markdown-0.1.ebuild
+++ b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,5 +36,11 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--without-valgrind
+		--without-valgrind \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index d4c272672b73..aa39d8b3bca9 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -4,5 +4,5 @@ DIST courier-authlib-0.70.0.tar.bz2 2183323 BLAKE2B ebf58f8c4e7b58766edc684ced59
 DIST courier-authlib-0.71.0.tar.bz2 2207895 BLAKE2B 8eb92b2c07acfb662b34a2234759a80f3a1b5a96c9e537cd6215bd9a9a607ed8995461dd599e4fe2698e70510f11815ad13a0511446303ae5e26ff616f05d92f SHA512 7a9700c472fd9d6942bd15dfd8db474a738817608bcd8106b6211b24cdc0631fd69f99e7a5c9e9f6088c16b53a9304ec429c031b16621f8ef52581af8a4256ec
 EBUILD courier-authlib-0.69.0-r1.ebuild 4511 BLAKE2B 2dd9250efd5570d1b7daccf670648bff90301c57df511503058dec0585601a954cb8ed5a58121ac32dd4c0410854148e25ce45f871ce47333595ada90aa878fe SHA512 76786b563120a896110e987b86587a80211cb49f84af86861bfafa301134d13f16997d7411da6caad0466a63ecddcccfaff5cd6e71110766413128f808098180
 EBUILD courier-authlib-0.70.0.ebuild 4520 BLAKE2B ba78dad0a14640b96ced9c2c96285fc2186047cc3c190aa07ae50ecbae5e4630af04588735aa09545f26a9b8d40c1b4b122c44930de57ea26df9bc87021e8b30 SHA512 97dd3146d345d2b41c18391afd3861de59712eccf9f2412439b8ffbcb08df2ad922d113e5f29a73f45c41e160afa1387f2e898932a2c88de47062a6066487878
-EBUILD courier-authlib-0.71.0.ebuild 4520 BLAKE2B ba78dad0a14640b96ced9c2c96285fc2186047cc3c190aa07ae50ecbae5e4630af04588735aa09545f26a9b8d40c1b4b122c44930de57ea26df9bc87021e8b30 SHA512 97dd3146d345d2b41c18391afd3861de59712eccf9f2412439b8ffbcb08df2ad922d113e5f29a73f45c41e160afa1387f2e898932a2c88de47062a6066487878
+EBUILD courier-authlib-0.71.0.ebuild 4512 BLAKE2B 56e372434a4c745776ed0a95a94c153f486b975455d91bb8438c5e2e0af7bf2560841584d1875cb96e68827b9ce5439b949da2b4eb0a2415f0f64b46cb93d856 SHA512 556c8594b9e689caef5b196d15688d7e86962450af7bb94010b4cb85e2d43a2c45368b5e0389a7c668021b52fe3f8f2820ed659cd2f5f53af266184dd6f11fa0
 MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
index b76a874e6b5b..be6b3354a070 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index f446e42aae62..dbd3c7250b6a 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1,4 +1,4 @@
 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
-EBUILD courier-unicode-2.1-r1.ebuild 531 BLAKE2B ed1d91d72c3f3250d915c81815ef41c2a20230cf3f864883e4f040dcb01c59f6e2ad2cab0120eb128f5ae6b17706606a84ff3287709888c65136005e984bbb80 SHA512 5f2c5d1bf5ba7cd72848274d9c25888e84effe36660351b3509fb8b4cb0d3e963584746eab443e81e05febaa80d2990f2725664315e073fd803d567bd7d6f4f7
+EBUILD courier-unicode-2.1-r1.ebuild 523 BLAKE2B 0a5ce7fcdf36958ae4afd09130257d37309524e3363f670be5c4d32d6f1b152980e0d7a8c5e88135e671faef175e9966d820bcbb844c8552e7c161296564b619 SHA512 6e4f24532522e80972bfe3e95d2f996b63bc9fa9cc921f18c1f01cf4e95cd5539200a2a8d081a31130888b832ea4e2c720aa2adb733bcc433a17a20b30b26466
 EBUILD courier-unicode-2.1.ebuild 477 BLAKE2B f5fbf470d191e1eb07c8ac5c237b2db221eca2f616e1bdbaa7576dab6eb9252f5a2ad32ab6aca8c3f853960afcb54579ef86a6310cc3c64bf15fe0bce8516273 SHA512 61e3262dc8e9414fd6d1b8623505e3fb3f32290d327fe64d27bc33766e528d89362e3f24cee9a9a93a4bd54f5a64b36ce06a0468710056ee38de157bde1cfb99
 MISC metadata.xml 293 BLAKE2B 85c442aa45e6a97917305b7e9326f8445f5911a3a3913d3540250b83361a16bc07810b8288a692082d9a2203bd696ba87d8fa1b6ba47c046f6d96577d07400af SHA512 39ee602134069ac766933c31bacbab2de9f40aa8bab6450660ce5319a95e285f4d4c463df41f22d7fd7e1c8584634a4b3ada8962941143fe8d4120cbb11515f0
diff --git a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
index c1fa20228287..bab50bd7818f 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 src_configure() {
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index a200beae20ce..daeca25cdfd1 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -1,5 +1,3 @@
-DIST davix-0.7.5.tar 4343329 BLAKE2B dfb71e0524e47a2378cd8a49fa4c7d209b8b658e8515f4f0750c9c98cb03073e2ff82a5fbdb2f7fb563f31671789cd7e9cb1656a16dfd0811934730961695db4 SHA512 4be448d6d28f315c0d098d9cf2ddf95bbd818659821935571d83dad1b2724b8f90b87be298ca8a7984cb57a88b18b0253e23f6e8cb192cd1792472993da36bcc
 DIST davix-0.7.6.tar 4338692 BLAKE2B 72a918f52993ea358f243df671823a4624ac5650753e06c8f70f75a800f10adfe7f6c63d9c8fdcefb94874e3c60c3909e7aa96969af1210347ea941a42f4b9df SHA512 3e379acc763e72e2e1684121e2688da6c617b2c1f52ffd7a2a2559998a64aba957f09f7b138c57f8f4d7a26caff4fef09952cca48585bb4f6aea1f071aa9a7b7
-EBUILD davix-0.7.5.ebuild 1580 BLAKE2B cb2581cc8b04095fc76a03b9353a8c20692c784c5d4b45b35451d8be4d134b293d11712e9459f744ca74777475201c14eeb5584d88a373cca58cace474233e51 SHA512 17b939f136d9741c6a08c581a0bbbe19622280e04ab92a46cee411365fccdb4e92416bcf24ccb2eedfbbe588be396c26046f916f4980f9e6798fab4c13dbff14
-EBUILD davix-0.7.6.ebuild 1683 BLAKE2B 2dfb7c4c887337082f8d3a7065629c99b073812ade32299fe43555aa5f8cfd4db328b11ffb422ee912912ac6ec94955c4e021f4c4201468263637cf8a54c553f SHA512 4c3db9f7ac923237eb7df6da59081f08163c8497bd97338d346063b2005013cf5b48809f1b9e0cb5f97e51364e278668cfd32439e09e59fa094da1cadb0727c4
+EBUILD davix-0.7.6.ebuild 1645 BLAKE2B 86eeeb7039b7332070eceba7481e4d1ad94e0c14983db54df24639f824906ab549ae2fcde362a679dff8f47d563e95e31e1159109c5c8d05214b5b13096a9339 SHA512 48ebcf0ed78e6a1a4ecb68bc0a56b03e6832a6cb9994ced07d2dcd372c4192093813c62bbe77e7166a3db5800965a2b82f387f1fa2a79388d64d8b4ad2073b74
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.7.5.ebuild b/net-libs/davix/davix-0.7.5.ebuild
deleted file mode 100644
index 3d61be504eec..000000000000
--- a/net-libs/davix/davix-0.7.5.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-utils
-
-DESCRIPTION="High-performance file management over WebDAV/HTTP"
-HOMEPAGE="https://dmc.web.cern.ch/projects/davix"
-SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN}/${PV}/${P}.tar.gz -> ${P}.tar"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 kernel_linux test tools"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-		kernel_linux? ( sys-apps/util-linux )
-"
-
-DEPEND="${CDEPEND}
-		doc? (
-			app-doc/doxygen[dot]
-			dev-python/sphinx
-		)
-		virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="test? ( tools )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	for x in doc test; do
-		if ! use $x; then
-			sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt
-		fi
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DENABLE_HTML_DOCS=$(usex doc)
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_TOOLS=$(usex tools)
-		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
-		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
-		-DSTATIC_LIBRARY=OFF
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile doc
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use tools; then
-		rm -rf "${ED}/usr/share/man/man1"
-	fi
-
-	if use test; then
-		rm -rf "${ED}/usr/bin/davix-unit-tests"
-	fi
-}
diff --git a/net-libs/davix/davix-0.7.6.ebuild b/net-libs/davix/davix-0.7.6.ebuild
index d667decd21ad..cd414ce3d7eb 100644
--- a/net-libs/davix/davix-0.7.6.ebuild
+++ b/net-libs/davix/davix-0.7.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="High-performance file management over WebDAV/HTTP"
 HOMEPAGE="https://dmc.web.cern.ch/projects/davix"
@@ -11,7 +11,7 @@ SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 kernel_linux test tools"
 RESTRICT="!test? ( test )"
 
@@ -35,7 +35,7 @@ RDEPEND="${CDEPEND}"
 REQUIRED_USE="test? ( tools )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	for x in doc test; do
 		if ! use $x; then
@@ -58,18 +58,18 @@ src_configure() {
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
 		-DBUILD_TESTING=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
-		cmake-utils_src_compile doc
+		cmake_src_compile doc
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if ! use tools; then
 		rm -rf "${ED}/usr/share/man/man1"
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
index bff5db1ef9b0..4ef423792ab7 100644
--- a/net-libs/dleyna-renderer/Manifest
+++ b/net-libs/dleyna-renderer/Manifest
@@ -1,4 +1,4 @@
-AUX 0.6.0-gupnp-1.2.patch 27528 BLAKE2B c9c872faac1fb257aad958d167627b38557455cd2fd1e284f2b234cb7f73026bcfbdf79843c78a5611b6c4d4d79380304dd64e8f4fe07f6f9e370cc8d82d029a SHA512 5eb8148a1416f6420167097b51eca77be432cfaa7f2d86a1d9255cbb41b99dda0338a01e433974b9bbbfa68e2ec6ca16a4c79523b2e184e1ffaf0f65dbc52fc1
+DIST dleyna-renderer-0.6.0-gupnp-1.2.patch 27528 BLAKE2B c9c872faac1fb257aad958d167627b38557455cd2fd1e284f2b234cb7f73026bcfbdf79843c78a5611b6c4d4d79380304dd64e8f4fe07f6f9e370cc8d82d029a SHA512 5eb8148a1416f6420167097b51eca77be432cfaa7f2d86a1d9255cbb41b99dda0338a01e433974b9bbbfa68e2ec6ca16a4c79523b2e184e1ffaf0f65dbc52fc1
 DIST dleyna-renderer-0.6.0.tar.gz 65566 BLAKE2B cfd2b5a08b2e5c6e15006e722c4878281bf7f4b6d8a9bd317ec5b27fc1568a2ca891af2ac2fc3c230f65e9920bd524b4fbaf43631192b079b2aea051783d2b8a SHA512 f4cb6c658bfaf620962eb6b84ab6b41be1bb8455ac1ff358db7fcf3db7f5c4e2130bb7b0e5201005c738e892aabf25b3cf2a3e1cc1f4a9ef9d834789b87c0183
-EBUILD dleyna-renderer-0.6.0.ebuild 875 BLAKE2B 371fd80bffb2c8c939716c2923509d7b37e593676d48057706807b523f5fc8d0cbb03521546f41142f384dcf5c997fd7913342bef40729975b17bc3c3c0f12e1 SHA512 163e8fd9f330902f44ccd9b817b686368a39b4f6eb112f0d88e02fbde088a2757b51eea24e787ef3c40fed5350a92ebe8512be897351e93806c8b36c62481bae
+EBUILD dleyna-renderer-0.6.0.ebuild 919 BLAKE2B d41197d57e99b2459840a2b058c9af4f78930865f69e365e415fa20f0442b446f0e45008104846f8df6a531552a0bd8e229e85ac93f31b782b02268f831348c8 SHA512 34778c5a97e7e8a751d5dad2fec6719ae50ab7df65926f16ed39d3afceea976834f6119a7467b8dfed2f53d5bcd759063dacf3d9238f73f71120155ffd8ed4c0
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
index 57b99c96aed7..148878341d27 100644
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.6.0.ebuild
@@ -5,9 +5,10 @@ EAPI=7
 
 inherit autotools
 
-DESCRIPTION="library implementing services that allow clients to discover and manipulate DLNA renderers"
+DESCRIPTION="A library to discover and manipulate DLNA renderers"
 HOMEPAGE="https://01.org/dleyna/"
-SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/dleyna-renderer-0.6.0-gupnp-1.2.patch"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -31,7 +32,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-gupnp-1.2.patch
+	"${DISTDIR}"/${P}-gupnp-1.2.patch
 )
 
 src_prepare() {
diff --git a/net-libs/dleyna-renderer/files/0.6.0-gupnp-1.2.patch b/net-libs/dleyna-renderer/files/0.6.0-gupnp-1.2.patch
deleted file mode 100644
index 2fddca199444..000000000000
--- a/net-libs/dleyna-renderer/files/0.6.0-gupnp-1.2.patch
+++ /dev/null
@@ -1,944 +0,0 @@
-https://github.com/intel/dleyna-renderer/pull/167
-
-From 594015eac2757f629a32d043c9a9b10ff6c5f95f Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Mon, 5 Nov 2018 22:07:09 +0100
-Subject: [PATCH 1/4] Use english for logging
-
----
- libdleyna/renderer/device.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c
-index 7acef89..032d394 100644
---- a/libdleyna/renderer/device.c
-+++ b/libdleyna/renderer/device.c
-@@ -1201,7 +1201,7 @@ static void prv_add_actions(dlr_device_t *device,
- 				continue;
- 			}
- 
--			DLEYNA_LOG_DEBUG("DLNA version ≥ 1.50 pour %s",
-+			DLEYNA_LOG_DEBUG("DLNA version ≥ 1.50 for %s",
- 					 device->path);
- 			timeseek_missing = TRUE;
- 			g_free(dlna_device_class);
-
-From a588dd11e4c6d2ff6a7c1789fad913ab9c2519b5 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 21 Sep 2019 20:36:04 +0200
-Subject: [PATCH 2/4] Do service introspection on device creation
-
-Fixes #104
-Fixes #164
----
- libdleyna/renderer/Makefile.am   |   2 +
- libdleyna/renderer/device.c      | 411 ++++++++++++++++---------------
- libdleyna/renderer/gasync-task.c | 135 ++++++++++
- libdleyna/renderer/gasync-task.h |  57 +++++
- libdleyna/renderer/manager.c     |   1 -
- libdleyna/renderer/upnp.c        |  14 +-
- 6 files changed, 419 insertions(+), 201 deletions(-)
- create mode 100644 libdleyna/renderer/gasync-task.c
- create mode 100644 libdleyna/renderer/gasync-task.h
-
-diff --git a/libdleyna/renderer/Makefile.am b/libdleyna/renderer/Makefile.am
-index ca601c7..ce4dc41 100644
---- a/libdleyna/renderer/Makefile.am
-+++ b/libdleyna/renderer/Makefile.am
-@@ -22,6 +22,7 @@ libdleyna_renderer_1_0_la_LDFLAGS =	-version-info $(DLEYNA_RENDERER_VERSION) \
- libdleyna_renderer_1_0_la_SOURCES =	$(libdleyna_rendererinc_HEADERS) \
- 					async.c				 \
- 					device.c	 		 \
-+					gasync-task.c			 \
- 					host-service.c			 \
- 					manager.c			 \
- 					server.c			 \
-@@ -53,6 +54,7 @@ sysconf_DATA = dleyna-renderer-service.conf
- EXTRA_DIST = 	$(sysconf_DATA)			\
- 		async.h				\
- 		device.h			\
-+		gasync-task.h			 \
- 		host-service.h			\
- 		prop-defs.h			\
- 		manager.h			\
-diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c
-index 032d394..73b3dd3 100644
---- a/libdleyna/renderer/device.c
-+++ b/libdleyna/renderer/device.c
-@@ -26,15 +26,16 @@
- 
- #include <libsoup/soup.h>
- #include <libgupnp/gupnp-control-point.h>
-+#include <libgupnp/gupnp-service-proxy.h>
- #include <libgupnp-av/gupnp-av.h>
- 
- #include <libdleyna/core/core.h>
- #include <libdleyna/core/error.h>
- #include <libdleyna/core/log.h>
--#include <libdleyna/core/service-task.h>
- 
- #include "async.h"
- #include "device.h"
-+#include "gasync-task.h"
- #include "prop-defs.h"
- #include "server.h"
- 
-@@ -675,21 +676,30 @@ static void prv_process_protocol_info(dlr_device_t *device,
- 	DLEYNA_LOG_DEBUG("Exit");
- }
- 
--static void prv_get_protocol_info_cb(GUPnPServiceProxy *proxy,
--				     GUPnPServiceProxyAction *action,
-+static void prv_get_protocol_info_cb(GObject *target,
-+                                     GAsyncResult *res,
- 				     gpointer user_data)
- {
- 	gchar *result = NULL;
- 	gboolean end;
- 	GError *error = NULL;
- 	prv_new_device_ct_t *priv_t = (prv_new_device_ct_t *)user_data;
-+	GUPnPServiceProxyAction *action;
- 
- 	DLEYNA_LOG_DEBUG("Enter");
- 
- 	priv_t->dev->construct_step++;
- 
--	end = gupnp_service_proxy_end_action(proxy, action, &error, "Sink",
--					     G_TYPE_STRING, &result, NULL);
-+	action = gupnp_service_proxy_call_action_finish(GUPNP_SERVICE_PROXY(target), res, &error);
-+
-+	if (action == NULL || (error != NULL)) {
-+		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
-+				   ((error != NULL) ? error->message
-+						    : "Invalid result"));
-+		goto on_error;
-+	}
-+
-+	end = gupnp_service_proxy_action_get_result (action, &error, "Sink", G_TYPE_STRING, &result, NULL);
- 	if (!end || (result == NULL)) {
- 		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
- 				   ((error != NULL) ? error->message
-@@ -701,6 +711,10 @@ static void prv_get_protocol_info_cb(GUPnPServiceProxy *proxy,
- 
- on_error:
- 
-+	if (action) {
-+		gupnp_service_proxy_action_unref(action);
-+	}
-+
- 	if (error)
- 		g_error_free(error);
- 
-@@ -709,53 +723,193 @@ static void prv_get_protocol_info_cb(GUPnPServiceProxy *proxy,
- 	DLEYNA_LOG_DEBUG("Exit");
- }
- 
--static GUPnPServiceProxyAction *prv_get_protocol_info(
--						dleyna_service_task_t *task,
--						GUPnPServiceProxy *proxy,
--						gboolean *failed)
-+static void prv_introspection_wrap_cb (GUPnPServiceInfo *info,
-+				  GUPnPServiceIntrospection *introspection,
-+				  const GError *error,
-+				  gpointer user_data)
-+{
-+	if (error != NULL) {
-+		g_task_return_error (G_TASK (user_data),
-+				g_error_copy (error));
-+	} else {
-+		g_task_return_pointer (G_TASK (user_data),
-+				introspection,
-+				g_object_unref);
-+	}
-+
-+	g_object_unref (G_OBJECT (user_data));
-+}
-+
-+void prv_introspect_async (GUPnPServiceInfo    *info,
-+			   GCancellable        *cancellable,
-+			   GAsyncReadyCallback  callback,
-+			   gpointer             user_data)
-+{
-+	GTask *task = g_task_new (info, cancellable, callback, user_data);
-+
-+	gupnp_service_info_get_introspection_async_full (info,
-+			prv_introspection_wrap_cb,
-+			cancellable,
-+			task);
-+}
-+
-+static GUPnPServiceIntrospection *prv_introspect_finish
-+		(GUPnPServiceInfo   *info,
-+		 GAsyncResult       *res,
-+		 GError            **error)
-+{
-+	g_return_val_if_fail (g_task_is_valid (res, info), NULL);
-+
-+	return g_task_propagate_pointer (G_TASK (res), error);
-+}
-+
-+static gint compare_speeds(gconstpointer a, gconstpointer b);
-+
-+static void prv_introspect_av_cb (GObject *target,
-+				  GAsyncResult *res,
-+				  gpointer user_data)
-+{
-+	prv_new_device_ct_t *priv_t = (prv_new_device_ct_t *)user_data;
-+	GError *error = NULL;
-+	GUPnPServiceIntrospection *introspection;
-+	const GUPnPServiceStateVariableInfo *svi;
-+	GList *allowed_values;
-+	GVariant *speeds = NULL;
-+	const GUPnPServiceActionInfo *sai;
-+
-+	DLEYNA_LOG_DEBUG("Enter");
-+
-+	priv_t->dev->construct_step++;
-+
-+	introspection = prv_introspect_finish (GUPNP_SERVICE_INFO (target), res, &error);
-+
-+	if (introspection == NULL || (error != NULL)) {
-+		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
-+				   ((error != NULL) ? error->message
-+						    : "Invalid result"));
-+		goto on_error;
-+	}
-+
-+	svi = gupnp_service_introspection_get_state_variable(
-+							introspection,
-+							"TransportPlaySpeed");
-+
-+	if (svi && svi->allowed_values) {
-+		allowed_values = svi->allowed_values;
-+
-+		allowed_values = g_list_sort(allowed_values, compare_speeds);
-+
-+		prv_get_rates_values(allowed_values, &speeds,
-+				     &priv_t->dev->transport_play_speeds,
-+				     &priv_t->dev->min_rate,
-+				     &priv_t->dev->max_rate);
-+
-+		priv_t->dev->mpris_transport_play_speeds = g_variant_ref_sink(speeds);
-+	}
-+
-+	sai = gupnp_service_introspection_get_action(
-+						introspection,
-+						"X_DLNA_GetBytePositionInfo");
-+
-+	priv_t->dev->can_get_byte_position = (sai != NULL);
-+
-+on_error:
-+	g_clear_object(&introspection);
-+
-+	g_clear_error(&error);
-+
-+	DLEYNA_LOG_DEBUG("Exit");
-+}
-+
-+static void prv_introspect_rc_cb (GObject *target,
-+				  GAsyncResult *res,
-+				  gpointer user_data)
-+{
-+	prv_new_device_ct_t *priv_t = (prv_new_device_ct_t *)user_data;
-+	GError *error = NULL;
-+	GUPnPServiceIntrospection *introspection;
-+	const GUPnPServiceStateVariableInfo *svi;
-+
-+	DLEYNA_LOG_DEBUG("Enter");
-+
-+	priv_t->dev->construct_step++;
-+
-+	introspection = prv_introspect_finish (GUPNP_SERVICE_INFO (target), res, &error);
-+
-+	if (introspection == NULL || (error != NULL)) {
-+		DLEYNA_LOG_WARNING("GetProtocolInfo operation failed: %s",
-+				   ((error != NULL) ? error->message
-+						    : "Invalid result"));
-+		goto on_error;
-+	}
-+
-+	svi = gupnp_service_introspection_get_state_variable(introspection,
-+							     "Volume");
-+	if (svi != NULL)
-+		priv_t->dev->max_volume = g_value_get_uint(&svi->maximum);
-+
-+on_error:
-+	g_clear_object(&introspection);
-+
-+	g_clear_error(&error);
-+
-+	DLEYNA_LOG_DEBUG("Exit");
-+}
-+
-+static gboolean prv_get_protocol_info(
-+				dleyna_gasync_task_t *task,
-+                        GObject *target)
- {
--	*failed = FALSE;
-+    GUPnPServiceProxyAction *action;
- 
--	return gupnp_service_proxy_begin_action(
--					proxy, "GetProtocolInfo",
--					dleyna_service_task_begin_action_cb,
--					task, NULL);
-+    action = gupnp_service_proxy_action_new("GetProtocolInfo", NULL);
-+
-+    gupnp_service_proxy_call_action_async(GUPNP_SERVICE_PROXY (target), action,
-+            dleyna_gasync_task_get_cancellable (task),
-+            dleyna_gasync_task_ready_cb,
-+            task);
-+
-+    return FALSE;
-+}
-+
-+static gboolean prv_introspect(dleyna_gasync_task_t *task, GObject *target)
-+{
-+	prv_introspect_async (GUPNP_SERVICE_INFO (target),
-+			      dleyna_gasync_task_get_cancellable (task),
-+			      dleyna_gasync_task_ready_cb,
-+			      task);
-+
-+	return FALSE;
- }
- 
--static GUPnPServiceProxyAction *prv_subscribe(dleyna_service_task_t *task,
--					      GUPnPServiceProxy *proxy,
--					      gboolean *failed)
-+static gboolean prv_subscribe(dleyna_gasync_task_t *task, GObject *target)
- {
- 	dlr_device_t *device;
- 
- 	DLEYNA_LOG_DEBUG("Enter");
- 
--	device = (dlr_device_t *)dleyna_service_task_get_user_data(task);
-+	device = (dlr_device_t *)dleyna_gasync_task_get_user_data(task);
- 
- 	device->construct_step++;
- 	prv_device_subscribe_context(device);
- 
--	*failed = FALSE;
--
- 	DLEYNA_LOG_DEBUG("Exit");
- 
--	return NULL;
-+	return FALSE;
- }
- 
--static GUPnPServiceProxyAction *prv_declare(dleyna_service_task_t *task,
--					    GUPnPServiceProxy *proxy,
--					    gboolean *failed)
-+static gboolean prv_declare(dleyna_gasync_task_t *task,
-+					    GObject *target)
- {
- 	unsigned int i;
- 	dlr_device_t *device;
- 	prv_new_device_ct_t *priv_t;
- 	const dleyna_connector_dispatch_cb_t *table;
-+    gboolean result = FALSE;
- 
- 	DLEYNA_LOG_DEBUG("Enter");
- 
--	*failed = FALSE;
--
--	priv_t = (prv_new_device_ct_t *)dleyna_service_task_get_user_data(task);
-+	priv_t = (prv_new_device_ct_t *)dleyna_gasync_task_get_user_data(task);
- 	device = priv_t->dev;
- 	device->construct_step++;
- 
-@@ -770,16 +924,16 @@ static GUPnPServiceProxyAction *prv_declare(dleyna_service_task_t *task,
- 				table + i);
- 
- 		if (!device->ids[i]) {
--			*failed = TRUE;
-+			result = TRUE;
- 			goto on_error;
- 		}
- 	}
- 
- on_error:
- 
--DLEYNA_LOG_DEBUG("Exit");
-+	DLEYNA_LOG_DEBUG("Exit");
- 
--	return NULL;
-+	return result;
- }
- 
- static void prv_free_rc_event(gpointer user_data)
-@@ -800,6 +954,9 @@ void dlr_device_construct(
- {
- 	prv_new_device_ct_t *priv_t;
- 	GUPnPServiceProxy *s_proxy;
-+	GUPnPServiceProxy *av_proxy;
-+	GUPnPServiceProxy *rc_proxy;
-+	GCancellable *cancellable;
- 
- 	DLEYNA_LOG_DEBUG("Current step: %d", dev->construct_step);
- 
-@@ -809,19 +966,42 @@ void dlr_device_construct(
- 	priv_t->dispatch_table = dispatch_table;
- 
- 	s_proxy = context->service_proxies.cm_proxy;
-+	cancellable = g_cancellable_new ();
- 
- 	if (dev->construct_step < 1)
--		dleyna_service_task_add(queue_id, prv_get_protocol_info,
--					s_proxy, prv_get_protocol_info_cb,
--					NULL, priv_t);
-+		dleyna_gasync_task_add(queue_id,
-+				       prv_get_protocol_info,
-+				       G_OBJECT(s_proxy),
-+				       prv_get_protocol_info_cb,
-+				       cancellable,
-+				       NULL, priv_t);
-+
-+	av_proxy = context->service_proxies.av_proxy;
-+	if (dev->construct_step < 2)
-+		dleyna_gasync_task_add(queue_id,
-+				       prv_introspect,
-+				       G_OBJECT(av_proxy),
-+				       prv_introspect_av_cb,
-+				       cancellable,
-+				       NULL, priv_t);
-+
-+	rc_proxy = context->service_proxies.rc_proxy;
-+	if (dev->construct_step < 3)
-+		dleyna_gasync_task_add(queue_id,
-+				       prv_introspect,
-+				       G_OBJECT(rc_proxy),
-+				       prv_introspect_rc_cb,
-+				       cancellable,
-+				       NULL, priv_t);
-+
- 
- 	/* The following task should always be completed */
--	dleyna_service_task_add(queue_id, prv_subscribe, s_proxy,
--				NULL, NULL, dev);
-+	dleyna_gasync_task_add(queue_id, prv_subscribe, G_OBJECT(s_proxy),
-+				NULL, NULL, NULL, dev);
- 
--	if (dev->construct_step < 3)
--		dleyna_service_task_add(queue_id, prv_declare, s_proxy,
--					NULL, g_free, priv_t);
-+	if (dev->construct_step < 5)
-+		dleyna_gasync_task_add(queue_id, prv_declare, G_OBJECT(s_proxy),
-+					NULL, NULL, g_free, priv_t);
- 
- 	dleyna_task_queue_start(queue_id);
- 
-@@ -2121,133 +2301,6 @@ static void prv_get_rates_values(GList *allowed_tp_speeds,
- 	return;
- }
- 
--static gboolean prv_get_av_service_states_values(GUPnPServiceProxy *av_proxy,
--						 GVariant **mpris_tp_speeds,
--						 GPtrArray **upnp_tp_speeds,
--						 double *min_rate,
--						 double *max_rate,
--						 gboolean *can_get_byte_pos)
--{
--	const GUPnPServiceStateVariableInfo *svi;
--	const GUPnPServiceActionInfo *sai;
--	GUPnPServiceIntrospection *introspection;
--	GError *error = NULL;
--	GVariant *speeds = NULL;
--	GList *allowed_values;
--	gpointer weak_ref = NULL;
--	gboolean  device_alive = TRUE;
--
--	/* TODO: this weak_ref hack is needed as
--	   gupnp_service_info_get_introspection iterates the main loop.
--	   This can result in our device getting deleted before this
--	   function returns.  Ultimately, this code needs to be re-written
--	   to use gupnp_service_info_get_introspection_async but this cannot
--	   really be done until GUPnP provides a way to cancel this function. */
--
--	weak_ref = av_proxy;
--	g_object_add_weak_pointer(G_OBJECT(av_proxy), &weak_ref);
--
--	introspection = gupnp_service_info_get_introspection(
--		GUPNP_SERVICE_INFO(av_proxy),
--		&error);
--
--	if (!weak_ref) {
--		DLEYNA_LOG_WARNING("Lost device during introspection call");
--		device_alive = FALSE;
--		goto exit;
--	}
--
--	g_object_remove_weak_pointer(G_OBJECT(av_proxy), &weak_ref);
--
--	if (error != NULL) {
--		DLEYNA_LOG_DEBUG(
--			"failed to fetch AV service introspection file");
--
--		g_error_free(error);
--
--		goto exit;
--	}
--
--	svi = gupnp_service_introspection_get_state_variable(
--							introspection,
--							"TransportPlaySpeed");
--
--	if (svi && svi->allowed_values) {
--		allowed_values = svi->allowed_values;
--
--		allowed_values = g_list_sort(allowed_values, compare_speeds);
--
--		prv_get_rates_values(allowed_values, &speeds, upnp_tp_speeds,
--				     min_rate, max_rate);
--
--		*mpris_tp_speeds = g_variant_ref_sink(speeds);
--	}
--
--	sai = gupnp_service_introspection_get_action(
--						introspection,
--						"X_DLNA_GetBytePositionInfo");
--
--	*can_get_byte_pos = (sai != NULL);
--
--	g_object_unref(introspection);
--
--exit:
--
--	return device_alive;
--}
--
--static gboolean prv_get_rc_service_states_values(GUPnPServiceProxy *rc_proxy,
--						 guint *max_volume)
--{
--	const GUPnPServiceStateVariableInfo *svi;
--	GUPnPServiceIntrospection *introspection;
--	GError *error = NULL;
--	gpointer weak_ref = NULL;
--	gboolean device_alive = TRUE;
--
--	/* TODO: this weak_ref hack is needed as
--	   gupnp_service_info_get_introspection iterates the main loop.
--	   This can result in our device getting deleted before this
--	   function returns.  Ultimately, this code needs to be re-written
--	   to use gupnp_service_info_get_introspection_async but this cannot
--	   really be done until GUPnP provides a way to cancel this function. */
--
--	weak_ref = rc_proxy;
--	g_object_add_weak_pointer(G_OBJECT(rc_proxy), &weak_ref);
--
--	introspection = gupnp_service_info_get_introspection(
--		GUPNP_SERVICE_INFO(rc_proxy),
--		&error);
--
--	if (!weak_ref) {
--		DLEYNA_LOG_WARNING("Lost device during introspection call");
--		device_alive = FALSE;
--		goto exit;
--	}
--
--	g_object_remove_weak_pointer(G_OBJECT(rc_proxy), &weak_ref);
--
--	if (error != NULL) {
--		DLEYNA_LOG_DEBUG(
--			"failed to fetch RC service introspection file");
--
--		g_error_free(error);
--
--		goto exit;
--	}
--
--	svi = gupnp_service_introspection_get_state_variable(introspection,
--							     "Volume");
--	if (svi != NULL)
--		*max_volume = g_value_get_uint(&svi->maximum);
--
--	g_object_unref(introspection);
--
--exit:
--
--	return device_alive;
--}
--
- static void prv_update_device_props(GUPnPDeviceInfo *proxy, GHashTable *props)
- {
- 	GVariant *val;
-@@ -2378,34 +2431,6 @@ static gboolean prv_props_update(dlr_device_t *device, dlr_task_t *task)
- 
- 	service_proxies = &context->service_proxies;
- 
--	/* TODO: We should not retrieve these values here.  They should be
--	   retrieved during device construction. */
--
--	if (service_proxies->av_proxy)
--		if (!prv_get_av_service_states_values(
--			    service_proxies->av_proxy,
--			    &device->mpris_transport_play_speeds,
--			    &device->transport_play_speeds,
--			    &device->min_rate,
--			    &device->max_rate,
--			    &device->can_get_byte_position)) {
--			DLEYNA_LOG_DEBUG("Lost Device AV");
--
--			device_alive = FALSE;
--			goto on_lost_device;
--		}
--
--	/* TODO: We should not retrieve these values here.  They should be
--	   retrieved during device construction. */
--
--	if (service_proxies->rc_proxy)
--		if (!prv_get_rc_service_states_values(service_proxies->rc_proxy,
--						      &device->max_volume)) {
--			DLEYNA_LOG_DEBUG("Lost Device RC");
--			device_alive = FALSE;
--			goto on_lost_device;
--		}
--
- 	changed_props_vb = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
- 
- 	prv_add_player_speed_props(device->props.player_props,
-diff --git a/libdleyna/renderer/gasync-task.c b/libdleyna/renderer/gasync-task.c
-new file mode 100644
-index 0000000..47a0ad5
---- /dev/null
-+++ b/libdleyna/renderer/gasync-task.c
-@@ -0,0 +1,135 @@
-+/*
-+ * dLeyna
-+ *
-+ * Copyright (c) 2019 Jens Georg <mail@jensge.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU Lesser General Public License,
-+ * version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ */
-+
-+#include "gasync-task.h"
-+#include <libdleyna/core/task-processor.h>
-+
-+struct dleyna_gasync_task_t_ {
-+	dleyna_task_atom_t base;
-+	dleyna_gasync_task_action action;
-+	GObject *target;
-+	GAsyncReadyCallback callback;
-+	GCancellable *cancellable;
-+	GDestroyNotify free_func;
-+	gpointer cb_user_data;
-+};
-+
-+const char *dleyna_gasync_task_create_source(void)
-+{
-+	static unsigned int cpt = 1;
-+	static char source[27];
-+
-+	g_snprintf(source, 27, "gasync-source-%d", cpt);
-+	cpt++;
-+
-+	return source;
-+}
-+
-+void dleyna_gasync_task_add(const dleyna_task_queue_key_t *queue_id,
-+		dleyna_gasync_task_action action,
-+		GObject *target,
-+		GAsyncReadyCallback callback,
-+		GCancellable *cancellable,
-+		GDestroyNotify free_func,
-+		gpointer cb_user_data)
-+{
-+	dleyna_gasync_task_t *task;
-+
-+	task = g_new0(dleyna_gasync_task_t, 1);
-+
-+	task->action = action;
-+	task->callback = callback;
-+	task->cancellable = cancellable;
-+	task->free_func = free_func;
-+	task->cb_user_data = cb_user_data;
-+	task->target = target;
-+
-+	if (target != NULL) {
-+		g_object_add_weak_pointer (target, (gpointer *)(&task->target));
-+	}
-+
-+	dleyna_task_queue_add_task(queue_id, &task->base);
-+}
-+
-+void dleyna_gasync_task_ready_cb(GObject *source, GAsyncResult *res, gpointer user_data)
-+{
-+	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)user_data;
-+
-+	task->callback(source, res, task->cb_user_data);
-+
-+	dleyna_task_queue_task_completed(task->base.queue_id);
-+}
-+
-+void dleyna_gasync_task_process_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data)
-+{
-+	gboolean failed = FALSE;
-+
-+	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)atom;
-+
-+	failed = task->action(task, task->target);
-+
-+	if (failed) {
-+		dleyna_task_processor_cancel_queue(task->base.queue_id);
-+		dleyna_task_queue_task_completed(task->base.queue_id);
-+	}
-+
-+	if (task->callback == NULL) {
-+		dleyna_task_queue_task_completed(task->base.queue_id);
-+	}
-+}
-+
-+void dleyna_gasync_task_cancel_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data)
-+{
-+	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)atom;
-+
-+	if (task->cancellable) {
-+		g_cancellable_cancel (task->cancellable);
-+		task->cancellable = NULL;
-+
-+		dleyna_task_queue_task_completed(task->base.queue_id);
-+	}
-+}
-+
-+void dleyna_gasync_task_delete_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data)
-+{
-+	dleyna_gasync_task_t *task = (dleyna_gasync_task_t *)atom;
-+
-+	if (task->free_func != NULL)
-+		task->free_func(task->cb_user_data);
-+
-+	if (task->target != NULL) {
-+		g_object_remove_weak_pointer(task->target, (gpointer *)&task->target);
-+	}
-+
-+	g_free(task);
-+}
-+
-+gpointer dleyna_gasync_task_get_user_data(dleyna_gasync_task_t *task)
-+{
-+	return task->cb_user_data;
-+}
-+
-+GCancellable *dleyna_gasync_task_get_cancellable(dleyna_gasync_task_t *task)
-+{
-+	return task->cancellable;
-+}
-diff --git a/libdleyna/renderer/gasync-task.h b/libdleyna/renderer/gasync-task.h
-new file mode 100644
-index 0000000..629e48c
---- /dev/null
-+++ b/libdleyna/renderer/gasync-task.h
-@@ -0,0 +1,57 @@
-+/*
-+ * dLeyna
-+ *
-+ * Copyright (c) 2019 Jens Georg <mail@jensge.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU Lesser General Public License,
-+ * version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ */
-+
-+#pragma once
-+
-+#include <libdleyna/core/task-atom.h>
-+
-+#include <glib.h>
-+#include <gio/gio.h>
-+
-+typedef struct dleyna_gasync_task_t_ dleyna_gasync_task_t;
-+
-+typedef gboolean (*dleyna_gasync_task_action)
-+	(dleyna_gasync_task_t *task,
-+	 GObject *target);
-+
-+const char *dleyna_gasync_task_create_source(void);
-+
-+void dleyna_gasync_task_add(const dleyna_task_queue_key_t *queue_id,
-+		dleyna_gasync_task_action action,
-+		GObject *target,
-+		GAsyncReadyCallback callback,
-+		GCancellable *cancellable,
-+		GDestroyNotify free_func,
-+		gpointer cb_user_data);
-+
-+void dleyna_gasync_task_ready_cb(GObject *source, GAsyncResult *res, gpointer user_data);
-+
-+void dleyna_gasync_task_process_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data);
-+
-+void dleyna_gasync_task_cancel_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data);
-+
-+void dleyna_gasync_task_delete_cb(dleyna_task_atom_t *atom,
-+		gpointer user_data);
-+
-+gpointer dleyna_gasync_task_get_user_data(dleyna_gasync_task_t *task);
-+
-+GCancellable *dleyna_gasync_task_get_cancellable(dleyna_gasync_task_t *task);
-diff --git a/libdleyna/renderer/manager.c b/libdleyna/renderer/manager.c
-index 74052f5..bea9935 100644
---- a/libdleyna/renderer/manager.c
-+++ b/libdleyna/renderer/manager.c
-@@ -25,7 +25,6 @@
- 
- #include <libdleyna/core/error.h>
- #include <libdleyna/core/log.h>
--#include <libdleyna/core/service-task.h>
- #include <libdleyna/core/white-list.h>
- 
- #include "async.h"
-diff --git a/libdleyna/renderer/upnp.c b/libdleyna/renderer/upnp.c
-index 17cbda7..0e9d483 100644
---- a/libdleyna/renderer/upnp.c
-+++ b/libdleyna/renderer/upnp.c
-@@ -28,10 +28,10 @@
- 
- #include <libdleyna/core/error.h>
- #include <libdleyna/core/log.h>
--#include <libdleyna/core/service-task.h>
- 
- #include "async.h"
- #include "device.h"
-+#include "gasync-task.h"
- #include "host-service.h"
- #include "prop-defs.h"
- #include "upnp.h"
-@@ -116,12 +116,12 @@ static const dleyna_task_queue_key_t *prv_create_device_queue(
- 
- 	queue_id = dleyna_task_processor_add_queue(
- 			dlr_renderer_service_get_task_processor(),
--			dleyna_service_task_create_source(),
-+			dleyna_gasync_task_create_source(),
- 			DLR_RENDERER_SINK,
- 			DLEYNA_TASK_QUEUE_FLAG_AUTO_REMOVE,
--			dleyna_service_task_process_cb,
--			dleyna_service_task_cancel_cb,
--			dleyna_service_task_delete_cb);
-+			dleyna_gasync_task_process_cb,
-+			dleyna_gasync_task_cancel_cb,
-+			dleyna_gasync_task_delete_cb);
- 	dleyna_task_queue_set_finally(queue_id, prv_device_chain_end);
- 	dleyna_task_queue_set_user_data(queue_id, *priv_t);
- 
-@@ -243,8 +243,8 @@ static void prv_server_unavailable_cb(GUPnPControlPoint *cp,
- 
- 	udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy);
- 
--	ip_address = gupnp_context_get_host_ip(
--		gupnp_control_point_get_context(cp));
-+	ip_address = gssdp_client_get_host_ip(
-+		GSSDP_CLIENT(gupnp_control_point_get_context(cp)));
- 
- 	if (!udn || !ip_address)
- 		goto on_error;
-
-From 79593067cf40ed58a3bd95311c7fa108feafcb46 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 21 Sep 2019 20:37:33 +0200
-Subject: [PATCH 3/4] Move to GUPnP 1.2
-
-Fixes #166
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 271ee92..364659d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,8 +38,8 @@ LT_LANG([C])
- PKG_PROG_PKG_CONFIG(0.16)
- PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
- PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
--PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2])
--PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5])
-+PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 1.2.0])
-+PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0])
- PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5])
- PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4])
- PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2])
-
-From 66e755a89cdcd7f10a535131a340c3f3ab371194 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Mon, 23 Sep 2019 00:08:38 +0200
-Subject: [PATCH 4/4] Protect introspection calls against missing proxies
-
----
- libdleyna/renderer/device.c | 38 +++++++++++++++++++++++--------------
- 1 file changed, 24 insertions(+), 14 deletions(-)
-
-diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c
-index 73b3dd3..525a23d 100644
---- a/libdleyna/renderer/device.c
-+++ b/libdleyna/renderer/device.c
-@@ -977,22 +977,32 @@ void dlr_device_construct(
- 				       NULL, priv_t);
- 
- 	av_proxy = context->service_proxies.av_proxy;
--	if (dev->construct_step < 2)
--		dleyna_gasync_task_add(queue_id,
--				       prv_introspect,
--				       G_OBJECT(av_proxy),
--				       prv_introspect_av_cb,
--				       cancellable,
--				       NULL, priv_t);
-+	if (dev->construct_step < 2) {
-+		if (av_proxy == NULL) {
-+			dev->construct_step++;
-+		} else {
-+			dleyna_gasync_task_add(queue_id,
-+					       prv_introspect,
-+					       G_OBJECT(av_proxy),
-+					       prv_introspect_av_cb,
-+					       cancellable,
-+					       NULL, priv_t);
-+		}
-+	}
- 
- 	rc_proxy = context->service_proxies.rc_proxy;
--	if (dev->construct_step < 3)
--		dleyna_gasync_task_add(queue_id,
--				       prv_introspect,
--				       G_OBJECT(rc_proxy),
--				       prv_introspect_rc_cb,
--				       cancellable,
--				       NULL, priv_t);
-+	if (dev->construct_step < 3) {
-+		if (rc_proxy == NULL) {
-+			dev->construct_step++;
-+		} else {
-+			dleyna_gasync_task_add(queue_id,
-+					       prv_introspect,
-+					       G_OBJECT(rc_proxy),
-+					       prv_introspect_rc_cb,
-+					       cancellable,
-+					       NULL, priv_t);
-+		}
-+	}
- 
- 
- 	/* The following task should always be completed */
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index bc87301a3042..7fc673da578b 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,5 +1,7 @@
 DIST enet-1.2.2.tar.gz 413454 BLAKE2B 3d13ae43a3ce361cf19d7b79c8ec92f76b7c1066659bf4e531a3144b03aac4e7b3738c102eff12bc0748a4a798e7be77473a6b386d29bb416998057f71ffe9d9 SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d
 DIST enet-1.3.13.tar.gz 669090 BLAKE2B 3041e9b2fe431dda2eae3464417d79b80664ff2c303222607991db28328e8eca2357fbf66248f40344bf93a26e0d1ffdad4698f9fe58939224b830700acee501 SHA512 82501c0248330a3a6bcac907907760e59b18cb662ebb42fe2c91e1557f1bc8ab452bf3fe7477dc01fa7a6e3b6124e1eb8eac46382d5bbebb2394879f9568b5df
-EBUILD enet-1.2.2-r1.ebuild 432 BLAKE2B 0ecff244e19cf28f3d10ccda1dffaa128de330313e8926dd53a0fd0bf2832da3738d4e74b5ad6925ded4fdd52aa09b24a8d6dec7dc6819de25c814255ee0f8eb SHA512 5d8df97625fa840418aeb15a9a804042ca714cf4bcbb0b2d68d7c8b3c5da9747e1b4859cd549f23ae979cf974316ad72ba7e347951b9486d181a4dd74f7fa819
-EBUILD enet-1.3.13.ebuild 545 BLAKE2B 7430ea25eb67c8a54555fc53ce0359648599c57ea5f9f30755c84a3de70a2f589308a383fff1fc2c3feb825526db09c9ec3f3d0173b364b91eea8142e2a0b024 SHA512 81cb8b631b1ac0f3970ee3579ecda67be7a57bdd8111a5344e0527a1c24c597d3e7533c3f8b934589cd3aae5b70f5598f3a09c761a310e2df508beae4fe03c62
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST enet-1.3.16.tar.gz 703461 BLAKE2B 30046a50a00eb3ccdb24e69a7f315555b1b395f42e30efff55c09bab28f4f2404c5183da2bce166f719956a9286ebfbc91d184cb146c252351909eb04ac1b345 SHA512 79761749d0f127c30b3c7186ca3c73795532d2e96ac1c152cd1fb5ca422b020f75e0c08ef9c9744e16866f8e5261dc24985e0421be56bcb0a4b072411af425ae
+EBUILD enet-1.2.2-r1.ebuild 499 BLAKE2B 05ec1dc7aaecfb189a06dfdba15f4770491062f334830e6f9eb1ea5a3729f3ebd39951f6d5008902ba66f84640aca16c74473fc7705e00c6eeeb7b257bbc2a3b SHA512 1700ffc1e2129992d9f1bd4fac27a033a948e237349b38ac75cae19ccd479f1b8b2b1bcee114db196c8b8e24ba58a4fcb3e17cbcd194a32b63925302799cf3ec
+EBUILD enet-1.3.13.ebuild 543 BLAKE2B 77646d41979e890867c803d1e7056b17b63ffb76ec70d6ad5fe9eed99603634946a783e86dba66a957cf90609227e5c4d7d32fcafaf991df89e79eb864498002 SHA512 437dcd55c7d87514cde3c4a0a821cb7615349cdeacfab1be8759a0a9b318881d50f0c1dfbf4f097c9ec1426c63ea47b437d93b1f664ec7246aa4c1ca157017a7
+EBUILD enet-1.3.16.ebuild 579 BLAKE2B 56d7f9aa4a91a58d15f73442f00ab6c4933e83eb609957ac08ac158898ef8a8ae580b976574d391725c60ce27fcb5e2f6574f092916237182707727906cbe173 SHA512 518d5fc298c1bb0460f7d6a18157057a49ea0183fcb6d5c7cb26f35cd146abc8dcd601efae18b1662a5368b37187861db08c47f9e44cbc3f898582fb5969e7a3
+MISC metadata.xml 325 BLAKE2B 7cd79c3bb3092d60d0e02dddddcfd62c4a3992b1701f4092b234efaebc5010a3ed0755b7be879f59adb0d36b53d8ba5e39dde647080e45b2799985401f81ca8a SHA512 2f3908ab3033a97cad879679339bc29743107baa299dae476d3cbc728a7b5267b215467a6908996da25832cc6045b7b1aa67bf23b728fb74656a69988d5a026c
diff --git a/net-libs/enet/enet-1.2.2-r1.ebuild b/net-libs/enet/enet-1.2.2-r1.ebuild
index b38533678dda..a0ddb70b8e30 100644
--- a/net-libs/enet/enet-1.2.2-r1.ebuild
+++ b/net-libs/enet/enet-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
+DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP"
 HOMEPAGE="http://enet.bespin.org/"
 SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
 
@@ -15,3 +15,8 @@ IUSE="static-libs"
 src_configure() {
 	econf $(use_enable static-libs static)
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/enet/enet-1.3.13.ebuild b/net-libs/enet/enet-1.3.13.ebuild
index 55c0fcdcfa0b..0e307002387a 100644
--- a/net-libs/enet/enet-1.3.13.ebuild
+++ b/net-libs/enet/enet-1.3.13.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
 
-DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
+DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP"
 HOMEPAGE="http://enet.bespin.org/"
 SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
 
@@ -21,5 +20,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/enet/enet-1.3.16.ebuild b/net-libs/enet/enet-1.3.16.ebuild
new file mode 100644
index 000000000000..89a85f45470f
--- /dev/null
+++ b/net-libs/enet/enet-1.3.16.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP"
+HOMEPAGE="http://enet.bespin.org/ https://github.com/lsalzman/enet/"
+SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.3/7"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="!${CATEGORY}/${PN}:0"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/enet/metadata.xml b/net-libs/enet/metadata.xml
index 6f49eba8f496..5b861b1b37a3 100644
--- a/net-libs/enet/metadata.xml
+++ b/net-libs/enet/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<changelog>https://github.com/lsalzman/enet/blob/master/ChangeLog</changelog>
+		<remote-id type="github">lsalzman/enet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 9eff62550a28..a610667f0b90 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,7 @@
 DIST glib-networking-2.62.4.tar.xz 186004 BLAKE2B 0fbf41cc916a76d23382eb6ae84316e5328c682c4e440f304a978be897f81778e96a201a19dfdc4bd912c144d4013b4cb6344a2a0031fc2898f4af31ef0b43fa SHA512 cd233eeed7ffb8458f4e0316a08927713899e64ce2654aa34f267ccf09d2516e7dee79012dd9e1488d3e8c0e1795c3525523bf8dc5f82a71c1b202942c38363a
 DIST glib-networking-2.64.3.tar.xz 189760 BLAKE2B 5f067aacd0d7724367eabf961d81fba9d77a7057cc60ffc7bada0f55a7eff0bcc2388e8298792636c77252b9494a6a7d36bcfd227bdfbbf66e5d45cf77dfc1bb SHA512 01251f7f95d1c331e883d5ee7857bad0c0d6308991e437ff54ed63e718bb30a12e872755e0611e2bf6ccb2a01c52ba865fe0d94ac69dbab37d74afe063a0590d
+DIST glib-networking-2.66.0.tar.xz 193920 BLAKE2B bba3c74a3676c15fbe3b9cb97aafb3c9320ebb6f7be1479a66cefd233aa5a548a605be74156445e6a54e8cdb307a09e2916f6d8736640ee38fce9ca289de195f SHA512 697798864746b40542873257a789290cacee425467e32c0eb096c87e124b37510753a990ef5d350f1db85c24da88e448bca9d8d8b4308123a74feac299176de5
 EBUILD glib-networking-2.62.4.ebuild 1740 BLAKE2B ac40d8d2c90eb77fda52322bdf85449b5329f65bbac4f87330e1370eceb03bc0418a810deb32b86b816d3c31f32dab1a09f1d9521edfa4c74202d9dc4ee19deb SHA512 a7f8feaf0c269a4f4093da2d51f866199aad8ec5487ce6eb4b340674d26f7aaaf2db737faa7635e343a2e253b2b22f63b641e2505d603c784d8780df3fab9d44
-EBUILD glib-networking-2.64.3.ebuild 1742 BLAKE2B 0b882825f79cdb2dbf018b7af7180bafab84c47202d18fb79ee1dd4a7ab5d0f5d62487f9d94a55991fe108d3d0bc28876dd2092492cff798764c51fadcd5475b SHA512 755ddaa5650d1d557a2e0144637aec3e937247e840aaecb44236a357f475fb9b47fe8af7a741aeb1776887b065c77c431bdfe2d5d4c1dcfe7b18fc924978dba8
+EBUILD glib-networking-2.64.3.ebuild 1741 BLAKE2B 82c520670b49c38edfad295baea8cf5fe613dfee17a71c1b0e1954dbd7f40219ea79b37efb41a0fd50bdafb7456bdc299ca41261ab78d9c26c36c005bad60c6d SHA512 1f9a6424f8869096d01148ea4145ac2fb0c31b22f03c6d076009f6dd5f16bf406676d9b83d35eb37637c07c8a28923892d98cb25e304e5e1b7a9d40bf58784c8
+EBUILD glib-networking-2.66.0.ebuild 1749 BLAKE2B 1d4bd3b903527d8e6037faa1f3d1bfdc9d2b7a03e0e5752e3c13edadb70399b02c5a4bd4d66cd737704a5fb3cce87f7e80fb05d16321879389f1266cf8b8e4eb SHA512 ff8885a83761acb80e6089af3c85b29b5dcdd5c9dca0b1e5a7c8c71d7298c6d67d3aa772ab80eeae4f3bb2b0a57a90aa892f367e9a215831c2e04a7ac751f649
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.64.3.ebuild b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
index aa91a71dc296..aa771c91c918 100644
--- a/net-libs/glib-networking/glib-networking-2.64.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.66.0.ebuild b/net-libs/glib-networking/glib-networking-2.66.0.ebuild
new file mode 100644
index 000000000000..133f9d9bc174
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.66.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib-minimal xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gnome +libproxy +ssl test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.6.5:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgnutls=enabled
+		-Dopenssl=disabled
+		$(meson_feature libproxy)
+		$(meson_feature gnome gnome_proxy)
+		-Dinstalled_tests=false
+		-Dstatic_modules=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 5d64eb306df1..5e0d9730a736 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,3 +1,7 @@
+AUX gloox-1.0.24-Makefile.patch 664 BLAKE2B cf2e193f4378f8bea9798053f61044037ae69710328836970f3f56770fb07504c901fa083e81b227d3ccf1b43434cf51ba86cd602a3d7929c7017614ac9be987 SHA512 e54676464e08e9ee4fe7a5e19fd5abfad8333ebafbabb31a99b326e7725733f6ee18ae65329461a4b5fe89b398a10415d518780da685a1bc728a76ef45b2c2e1
+AUX gloox-1.0.24-musl.patch 339 BLAKE2B e3cb58c64057fb991050544b4886827031b574ba95eea10eaffc8d49e741f69499aefa197995ce9525554f9079ce54ff4bf72634810bb1823133585198cd4b9d SHA512 d19dbd9f4e2db63b6b05a514357c6165900c4557de180a87691e815cf72f2a116b806854eef1060b08b30ffda0679956fd8d374f87a714be48b95bb32c388f68
 DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
+DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
 EBUILD gloox-1.0.22.ebuild 1124 BLAKE2B 5dd191732bd7ee3c09bbb262189a5ad2d6fe73a4f6fa8834f804072771a5e3624f4504a1678b02fa8c3957502d7187a7832dfcabc878409a9c6f6f15dec6f65d SHA512 a12832ab6146e042f88bedab8c53ad683c46379fde248f61da2d103b90e06977d27ad32fded46eeb32fca873e156ad5b794c0e126110e76cc3bad594dbdcf2c6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD gloox-1.0.24.ebuild 1327 BLAKE2B c0ea949018b1ea4cc27d7f71dd63160f6f85bd51b1e8e2be1547ebacabc21bf56cf5569e2879097f354a4f354e1f07fed1f72c10fcf2d996632921838c4ad4f5 SHA512 d0e22822f288c91e0f938b4b41ceb06fc944700777bbbe73e8ff8ef18e432db1130abcfba8ae90ba3b9ec8f4f83436533c19997c484966eb2a34eafd3a781a1a
+MISC metadata.xml 253 BLAKE2B d71cef1027d455987adc9c6421216c7c2c1db2615b0e7beeb8e8ea22fb64f1d6da1067363164f9d4d970af759d9a71be31eb55890a6bba420efb09efbe917c66 SHA512 4a632f8fe7d7808076ecc07be60de72762423ecea35ef546a6e2b0a15eb90c018e1ab06c5169b1b5613451049965bd8d3a4ad6cf898845f6a871b46135f8d186
diff --git a/net-libs/gloox/files/gloox-1.0.24-Makefile.patch b/net-libs/gloox/files/gloox-1.0.24-Makefile.patch
new file mode 100644
index 000000000000..40fed6900f0d
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-Makefile.patch
@@ -0,0 +1,36 @@
+Call make with the current instance if possible.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,12 +17,12 @@ apidox:
+ check: test
+ 
+ test:
+-	make -C src test
++	$(MAKE) -C src test
+ 
+ leakcheck: leaktest
+ 
+ leaktest:
+-	make -C src leaktest
++	$(MAKE) -C src leaktest
+ 
+ includetest:
+-	make -C src includetest
++	$(MAKE) -C src includetest
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -117,12 +117,12 @@ noinst_HEADERS = config.h prep.h dns.h nonsaslauth.h mucmessagesession.h stanzae
+ EXTRA_DIST = version.rc
+ 
+ test:
+-	make -C tests test
++	$(MAKE) -C tests test
+ 
+ check: test
+ 
+ leaktest:
+-	make -C tests leaktest
++	$(MAKE) -C tests leaktest
+ 
+ leakcheck: leaktest
+ 
diff --git a/net-libs/gloox/files/gloox-1.0.24-musl.patch b/net-libs/gloox/files/gloox-1.0.24-musl.patch
new file mode 100644
index 000000000000..041841ef345e
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-musl.patch
@@ -0,0 +1,13 @@
+https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/gloox/patches/gloox-musl.patch
+https://bugs.gentoo.org/713224
+--- a/src/connectiontcpserver.cpp
++++ b/src/connectiontcpserver.cpp
+@@ -51,7 +51,7 @@
+ #endif
+ 
+ #include <cstdlib>
+-#include <string>
++#include <string.h>
+ 
+ #ifndef _WIN32_WCE
+ # include <sys/types.h>
diff --git a/net-libs/gloox/gloox-1.0.24.ebuild b/net-libs/gloox/gloox-1.0.24.ebuild
new file mode 100644
index 000000000000..e7a34c9e3dc3
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.24.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
+HOMEPAGE="https://camaya.net/gloox/"
+SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+# Check upstream changelog: https://camaya.net/gloox/changelog/
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnutls idn libressl ssl static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	idn? ( net-dns/libidn:= )
+	gnutls? ( net-libs/gnutls:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.24-musl.patch"
+	"${FILESDIR}/${PN}-1.0.24-Makefile.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Examples are not installed anyway, so - why should we build them?
+	local myeconfargs=(
+		--without-examples
+		$(usex debug "--enable-debug" '')
+		$(use_enable static-libs static)
+		$(use_with idn libidn)
+		$(use_with gnutls)
+		$(use_with ssl openssl)
+		$(use_with test tests)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/gloox/metadata.xml b/net-libs/gloox/metadata.xml
index 6f49eba8f496..f9695bd1f37a 100644
--- a/net-libs/gloox/metadata.xml
+++ b/net-libs/gloox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<changelog>https://camaya.net/gloox/changelog/</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 064844c5f74b..a81a1b26e745 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-online-accounts-3.34.1.tar.xz 856288 BLAKE2B 99a6c242dd57acf009a2b4451287fff5bbc61b0aeb0396b13368b179d1b1604b413ff9dcb56bf4415c990cb4f2cb434a0fcf17b9381dcb5055a99985249af5d4 SHA512 233f1b15d4a7bdbee4ed85ba252ea0d9af2ac15a2edd3ce2b40d76434285fd093f07375313a599fa191f8df1551eb37f48c4784e389fcbaec0565bb3aba28426
 DIST gnome-online-accounts-3.36.0.tar.xz 860472 BLAKE2B 921f2f5ed9ac3db07046507723d814fc41579aee76cd2437673cdc3612db1077627ab47586e719b56a5bce25afe75b8028477f69745791eeb774c82bf854863d SHA512 2d04ea016c1bace9a2cb6ef7a6539c7f878cfa9b309394b18ed692ef1b9b73bf5f93a3f9edcb74170f1be4823a5c9ac6cde3b4e7245906e1b4e130d33eeb1c81
-EBUILD gnome-online-accounts-3.34.1.ebuild 2047 BLAKE2B 793d38be2462edcac5bee0d9476cd21950a55a84feb681ebaf24ae9dedf1e886f42062a67eab7658abe74c9cca47f572b5df381ed8f90cf80f4367441f827524 SHA512 c8e1dd15ab4ee65accea210745fe2142ff3e23c2eba5c01988fd3d6f581e06b7eb89d14c393e88d053595d30b1c735cc3ec29c8a59044c18cca14d3af2dd130d
 EBUILD gnome-online-accounts-3.36.0.ebuild 2000 BLAKE2B 6fa042b85c7bdbe0f80a52dfd62473cf15829c2f95bf14fc94f003ea000d33991f52426c63149221722fc73ae0ed408927acaaf848c751e9814ab57cc7881b46 SHA512 d1b8d5c98688831f218f4076bcf7cace567f712e56cd0a9f30ecc8482f81bdc7b020708c31d6efb69509ae1631188ec798a2c652c4f6e1c9f488f0332082881a
 MISC metadata.xml 379 BLAKE2B 36ab13a2c6483f81247083c86d6424d66e0780ac4e16c485588bbceb8ce8174de38796de29af933831ec3075dacef135d2c06d18b22d601e28a1f5fe5f7661dc SHA512 fbd620273932175e14f89a7c155819d7733309eabdb0a82113f9a88d8e33aae3c2b35bdfe5f0883c133e94d4eccf456ba496c419d15e98fd0cf79b685f7a8c69
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
deleted file mode 100644
index 531d37f5595c..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
-
-IUSE="debug gnome +introspection kerberos +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	>=net-libs/webkit-gtk-2.12.0:4
-	>=x11-libs/gtk+-3.19.12:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=[gtk]
-		app-crypt/mit-krb5 )
-"
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-windows-live \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable kerberos) \
-		$(use_enable kerberos fedora) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index c683ca0a6922..0ac49e9e61a4 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,5 +1,4 @@
 AUX 0.2.5-gupnp-1.2.patch 3485 BLAKE2B 83de24ae98ed70d6e92fec605b17772ea3d86d90fc4f34376f8f5ea2eeeec239159baf0f7364b0be54406cab6833cf47129a08274704d231aa93e00460486238 SHA512 d1577e146b9274fa5e1e9652995c188b9c58d48ef6cd7ea82e08a966e31cbc5f36d27988628645d195c44601d2dc3861c5030dbc4fc4626955e709d74881ed3f
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
 EBUILD gupnp-igd-0.2.5-r10.ebuild 1430 BLAKE2B e8ae3e32363644ce7c8f4988ec44b2b9d1aee5df419c344cc00b4c8e6a9611d4db105d59a8cd1598d87451bbf5271e4d419da9d82dfdf76dee0785d0d91acab1 SHA512 f74bda750feb5939a6175c96f689a6baea353ca1c2c16d719835569c2314e0a05c9390ba19cffad973cad1dac2ea9e5fd1ccec6b03bf41965f09dbcf9e58cf6e
-EBUILD gupnp-igd-0.2.5.ebuild 1168 BLAKE2B e7dc68304f082cb2502639cdc38b8bf9ffb2b2cf33dc762e1944be76b38af60fc6d659b030998a174120803755f8a566de9f8847a607c37438d4250bb9d1013e SHA512 f2e0b0f2b630b1a5e1356dd0a1291921e9d4c475e206ad547dc66a67c0713a644b72554286e55c6618326101da204e4a949177721e2b145120d09bfadada8f43
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
deleted file mode 100644
index c8dee50645bb..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune gnome.org multilib-minimal xdg-utils
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-0.14.7:0/3[${MULTILIB_USEDEP}]
-	>=net-libs/gupnp-0.20.10:0/4[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-multilib_src_configure() {
-	xdg_environment_reset
-
-	# python is old-style bindings; use introspection and pygobject instead
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-gtk-doc \
-		--disable-python \
-		$(multilib_native_use_enable introspection)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 1199efcab11b..f49d95f5f7d7 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,10 +1,3 @@
-AUX 1.2.2-build-manpage.patch 1447 BLAKE2B b876a44ac3930f087e3c00530d0b5cba2d2836b9b968c4cc34500e6a11a5b04b432c5e8dac1addff6cea85feeab5bf3fe2027b3d87fe2e861a4b9aec2e3e349b SHA512 e232ee5bdb2ae1fcd9b44c63942d1bef9d610e90135ec4fa3224716ca632d513f099638eea58fa67f39d7d80a507db1f7788af5712749417d2c576c8868521ab
-DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
-DIST gupnp-1.2.2.tar.xz 136556 BLAKE2B f38018c76972f1b60b8274353a60d4bb1e4687ead6fd3fb084e050c070e5da4cbb7118807f65d47787c50af3174e7c2b87ff0b920cdcf13e7c5be17f8b156588 SHA512 08a715b06f30b9d9d11b914136f89b0c53d6b07b09dddf622619073fc6f144fc8d711eec28ede80fd14fc71a6addfe88de15740d0748302522ce71555fd18d2a
-DIST gupnp-1.2.3.tar.xz 138428 BLAKE2B 23f7f677ee9d58c43ba69d6e707e26b17efa5b510f4b14b41006b332f196037fcb103b64e6b1f91260383232ad6d19872b1e8d856878b103c5c2612d3bafae63 SHA512 85caa68a4c6f4b1ccf21d910048a59b6db2b21e8bd728404b28eb0f00b588a1ab55f3ff3227e76199a20554b0708128680379e7ffa5fe162cccb4a1e3e322101
 DIST gupnp-1.2.4.tar.xz 139832 BLAKE2B a4d49ea8a3739a2233c9dd4a258a7d0d355ff651b0de85c5b7151f0ffca93b50248a303dd040c2d7e9fb215a0edb0627fa3a8a16835b55d90459c623faaad62b SHA512 cb787264b5a1bcb4f547f7a9d7a5e4e712f91ecbb593f12b2c51aed0607abd6fbfd43e5c42e261eb853d09358685637e172c78e3e9a6059bccdeb1176e6e4ef7
-EBUILD gupnp-1.0.4.ebuild 1936 BLAKE2B 0bd2a5783fe11eb5948b39ab91eae9b8055227add4186eb39f2c25291bb8979d807765d521e617d2cf1eed5621dea26eecd79f8b262b482efba6bd30eea0ee84 SHA512 4d5ca071142bcac84c1c907894d4f8b5c67d7a77c1ad58801ecbac4a4104711eda25cdc19394d51c10ace1d75bc18b3a2f68b35dd96b5c3452217a7d5b85338b
-EBUILD gupnp-1.2.2.ebuild 2382 BLAKE2B e0c3a459602fd8eda64aba8116369a3abb9db1f13c5b367ed4ecd2464f6cd3416a6c54696de17fc6c942c988704aca199c80087def6a5753b2e79f32445d87a4 SHA512 d33f989487371960f7e419d3f8bdd3b14687286aae6741238ae93dbacd14cef28e993c237a380ce7f39ed8d2c013a70f230b7a22c4e40fbc7d58eac78bb9112b
-EBUILD gupnp-1.2.3.ebuild 2272 BLAKE2B 51cdfcd0af4bcc7881d4b3485dbe6abcef5f824991f808722f69561a13d1e788193275536be99ca38a1a8e40a687ea3f772f3fdf43105c4f03881818e594a15d SHA512 3b6e400499d2ef3f026210d2d83a853a1b070237d86abece3d91af5c751913e8a06d4d97d0dcd1f84a455b51161d09b7adc3d5eb92ec2a0a706033124d31f705
-EBUILD gupnp-1.2.4.ebuild 2273 BLAKE2B c60fbb6ae278049efe4d2094ab11b950ed2cf650fc8dc4c932724854a4b3ebfa5d8934222bbcba8e3d401c3538188101c1caf979cd39e8346562df8d37e61828 SHA512 db480d84eb26533be29d07552381d48956c8c77062244a4010aea37f65cb75c1d9b15e812f18f5b07e134fbb27ed15f3474f39f3db3f96e97b4154271f0110bf
+EBUILD gupnp-1.2.4.ebuild 2272 BLAKE2B 51cdfcd0af4bcc7881d4b3485dbe6abcef5f824991f808722f69561a13d1e788193275536be99ca38a1a8e40a687ea3f772f3fdf43105c4f03881818e594a15d SHA512 3b6e400499d2ef3f026210d2d83a853a1b070237d86abece3d91af5c751913e8a06d4d97d0dcd1f84a455b51161d09b7adc3d5eb92ec2a0a706033124d31f705
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/files/1.2.2-build-manpage.patch b/net-libs/gupnp/files/1.2.2-build-manpage.patch
deleted file mode 100644
index ce03a171b88d..000000000000
--- a/net-libs/gupnp/files/1.2.2-build-manpage.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 23f54c2a1e8718e836224d68dafded091604a677 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 20 Feb 2020 12:15:33 +0200
-Subject: [PATCH] build: Always build gupnp-binding-tool manpage
-
-manpage generation shouldn't be dependent on gtk_doc option
----
- doc/meson.build | 2 ++
- meson.build     | 5 +----
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/doc/meson.build b/doc/meson.build
-index 478650b..b71b657 100644
---- a/doc/meson.build
-+++ b/doc/meson.build
-@@ -4,6 +4,7 @@ version_xml = configure_file(input: 'version.xml.in',
-                output: 'version.xml', configuration:
-                entities)
- 
-+if get_option('gtk_doc')
- gnome.gtkdoc('gupnp',
-              main_xml : 'gupnp-docs.xml',
-              src_dir : [join_paths(meson.source_root(), 'libgupnp'),
-@@ -26,6 +27,7 @@ gnome.gtkdoc('gupnp',
-                  'gupnp-types-private.h'
-              ],
-              install : true)
-+endif
- 
- xsltproc = find_program('xsltproc', required: false)
- if xsltproc.found()
-diff --git a/meson.build b/meson.build
-index e0dce33..eb3c82d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -31,15 +31,12 @@ dependencies = [
- subdir('libgupnp')
- subdir('tests')
- subdir('tools')
-+subdir('doc')
- 
- if get_option('vapi') and get_option('introspection')
-     subdir('vala')
- endif
- 
--if get_option('gtk_doc')
--    subdir('doc')
--endif
--
- if get_option('examples')
-     subdir('examples')
- endif
--- 
-2.20.1
-
diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild
deleted file mode 100644
index 21d5109ef959..000000000000
--- a/net-libs/gupnp/gupnp-1.0.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_6,3_7} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 multilib-minimal python-single-r1 vala
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-
-IUSE="connman +introspection kernel_linux networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=net-libs/gssdp-0.14.15:0/3[introspection?,${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	introspection? (
-			>=dev-libs/gobject-introspection-1.36:=
-			$(vala_depend) )
-	connman? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	networkmanager? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	!net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local backend=unix
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		--disable-static \
-		--with-context-manager=${backend}
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool
-}
diff --git a/net-libs/gupnp/gupnp-1.2.2.ebuild b/net-libs/gupnp/gupnp-1.2.2.ebuild
deleted file mode 100644
index b73234a91a5a..000000000000
--- a/net-libs/gupnp/gupnp-1.2.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org meson multilib-minimal python-single-r1 vala xdg
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-
-IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-1.1.3:0=[introspection?,${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.2 )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	virtual/pkgconfig
-	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
-	vala? ( $(vala_depend)
-		>=net-libs/gssdp-1.1.3:0[vala]
-		net-libs/libsoup:2.4[vala]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-build-manpage.patch # https://gitlab.gnome.org/GNOME/gupnp/merge_requests/5
-)
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	xdg_src_prepare
-}
-
-multilib_src_configure() {
-	local backend=system
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	local emesonargs=(
-		-Dcontext_manager=${backend}
-		-Dintrospection=$(multilib_native_usex introspection true false)
-		-Dvapi=$(multilib_native_usex vala true false)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
-}
diff --git a/net-libs/gupnp/gupnp-1.2.3.ebuild b/net-libs/gupnp/gupnp-1.2.3.ebuild
deleted file mode 100644
index f95420747be0..000000000000
--- a/net-libs/gupnp/gupnp-1.2.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org meson multilib-minimal python-single-r1 vala xdg
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
-SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-
-IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-1.2.3:0=[introspection?,${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.2 )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	virtual/pkgconfig
-	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
-	vala? ( $(vala_depend)
-		>=net-libs/gssdp-1.2.3:0[vala]
-		net-libs/libsoup:2.4[vala]
-	)
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	xdg_src_prepare
-}
-
-multilib_src_configure() {
-	local backend=system
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	local emesonargs=(
-		-Dcontext_manager=${backend}
-		-Dintrospection=$(multilib_native_usex introspection true false)
-		-Dvapi=$(multilib_native_usex vala true false)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
-}
diff --git a/net-libs/gupnp/gupnp-1.2.4.ebuild b/net-libs/gupnp/gupnp-1.2.4.ebuild
index 3fe2d9a3b039..f95420747be0 100644
--- a/net-libs/gupnp/gupnp-1.2.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.2.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
 SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index ecf3c3aa8463..03df9d839fc6 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -1,12 +1,4 @@
-DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
-DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691faef9cc6be3fb99426a3c1e3f24ae50689dfd8e46fa52a22d713780476130ee6fae6294b83cc3526bb5131cf16b98f2 SHA512 110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052
-DIST http-parser-2.9.2.tar.gz 51298 BLAKE2B 5d37ea197acbac468de03081010fb3b755a093085e56c9fa5a3d4dbd70dd2903335a8113ec21664ca54a74aac4cbbb1cc64b861d021df944790453c2de9baaab SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
-DIST http-parser-2.9.3.tar.gz 51973 BLAKE2B c46160e811874f3d4d2a7390e3b64520c7c01d51f74fb608ca8972ffe264cc389b744c1b6d8b5b6a7c9d7816eb95c179a9c210ba1a122ac4fa95996308d667af SHA512 d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b
+AUX http-parser-2.9.4-non-x86-test.patch 645 BLAKE2B c96cb4bbdd4560b738012b0c6a4e527a5d7b1e7253ec69ee65710b2afcd4162680b6835c20144e5baeed8e9dce253a60dbb240943adad91ec5b642cd981e7538 SHA512 4bd68020912ed43e07f2abaf7425e57ab855a3d04086a4b06d3bdb8fb4a30887a6094d0aebbf2fcd67757eda7c9dc2ae0a1c4e9cbcd2242f50fc4f0b38b764c0
 DIST http-parser-2.9.4.tar.gz 52056 BLAKE2B 988ebc3f3e1a7d53ed4147dac2e09c4d6021bb1a287990d83130c24e9fee01a3123b4c5ad9e1b86c0f123248484dae272010aa1f3ebd3bd4574d8407ede94e62 SHA512 b45df7b94d1c51079d44687d0a7f901f44faae51df4e84c7e3fe38f130c2d809d0e7c2a146c57b3723e60732aededc246bf44eadb10a95b710963d641f9fe7cd
-EBUILD http-parser-2.8.1.ebuild 1009 BLAKE2B dab1aeac7fc07cabadc19ae29050975d5f7712b260f314e06115f9367287edd0a8b524706a6817ea0a90d2a29fa8bb2d5d132dedf21b1d7476a8635e963346bf SHA512 b764290864401b181216c761847f54903671c19f2ebbe45de9d736e2c8fb02758054364970f9b1f913081004495087049c282130679536b785a877951a036688
-EBUILD http-parser-2.9.1.ebuild 1014 BLAKE2B 0e49d3893d32f53525a8e568706d57d1e65e32220cbaca91c52283e724b52f149fbe2263fb428431c9c1da61463899dba1e3454cbb47ab6803d14ac033e2dde4 SHA512 c85c7b57215496c937724f84f317ba21189aa04a9f41cbeeed5917fbb4ef9db3f77d34ea3f628166a023d3b1dbb453e2c4783b764c02e7f43b4b7532d7d5a410
-EBUILD http-parser-2.9.2.ebuild 1010 BLAKE2B 07e668e94ac5b440db9d267c10ca3bbea73d268f4be2793d18db3cfbbe6f948a00c196ddc01874549c3a23a9d6adc90b6f1a1c396a3d4fecf5c02aacf9d0ffd7 SHA512 0787e74dcc693f419a75fc1336155ebfd5abbb0aa5bf05ccdde1b60e8f4dcd80834d6e28e2637f6fb6f775fc963f1224dbd7ad79647e76d7c90071725e47a74b
-EBUILD http-parser-2.9.3.ebuild 1010 BLAKE2B 07e668e94ac5b440db9d267c10ca3bbea73d268f4be2793d18db3cfbbe6f948a00c196ddc01874549c3a23a9d6adc90b6f1a1c396a3d4fecf5c02aacf9d0ffd7 SHA512 0787e74dcc693f419a75fc1336155ebfd5abbb0aa5bf05ccdde1b60e8f4dcd80834d6e28e2637f6fb6f775fc963f1224dbd7ad79647e76d7c90071725e47a74b
-EBUILD http-parser-2.9.4.ebuild 1014 BLAKE2B 0e49d3893d32f53525a8e568706d57d1e65e32220cbaca91c52283e724b52f149fbe2263fb428431c9c1da61463899dba1e3454cbb47ab6803d14ac033e2dde4 SHA512 c85c7b57215496c937724f84f317ba21189aa04a9f41cbeeed5917fbb4ef9db3f77d34ea3f628166a023d3b1dbb453e2c4783b764c02e7f43b4b7532d7d5a410
-EBUILD http-parser-99999.ebuild 874 BLAKE2B 642dd498c67d2ebb02bddb1997f4cd20d372e235174e99d79280e0b258311052a067d226ce79be6052cf6ef943d8f853f2aef149c4a557e767f1719b46cdf9ff SHA512 4729203fefec280b07472592ebebb64ffbadfda3a4691383e3da1de68c65d94237c593a9b39f4626b4ac99ec0daadbac2a8ba07aacb098e465a86476de64591c
-MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
+EBUILD http-parser-2.9.4-r1.ebuild 1066 BLAKE2B b8a511af70cd8cbf8367064302b71d5111686519281403224891e6a75e6e2fd9a9ce9a2b9fe681453a2990cf248bfc9f0b328edaca4a1116aff3f85a58df5c17 SHA512 38ef55c46b2aeec84f833b3c9dc19841c7da9834a2b99f65a58fc5abdc4c076f3f713ae269ccb67a073f59bc5f13eefb76b5158029f60a817a0e367e0b911e65
+MISC metadata.xml 330 BLAKE2B 1d7919a30fc6b050a0e9a94bcbf905e2734b3a80d567771a541e438b7bda2b004cd0d0a621992d526390b89730f86dd2a2cb70e948243753c0b575d0af3edaee SHA512 8c36c72f77c03b3aaafbeb0f389a4897137d7dfe449fec5108db4ad02e65cfd93dd66a6ebc007edde1f79f983658c3d6d08444da8e0556e31661e3633789eba0
diff --git a/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch b/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch
new file mode 100644
index 000000000000..8bcbbf3589a4
--- /dev/null
+++ b/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch
@@ -0,0 +1,20 @@
+diff --git a/test.c b/test.c
+index 53a3163..49c4b7a 100644
+--- a/test.c
++++ b/test.c
+@@ -4343,7 +4343,13 @@ main (void)
+   printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version);
+ 
+   printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser));
+-  assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *));
++
++#if defined(__i386__) || defined(__x86_64__)
++  /* Should be 32 on both 32 bits and 64 bits x86 because of struct padding,
++   * see https://github.com/nodejs/http-parser/issues/507.
++   */
++  assert(sizeof(http_parser) == 24 + sizeof(void*));
++#endif
+ 
+   //// API
+   test_preserve_data();
+
diff --git a/net-libs/http-parser/http-parser-2.9.1.ebuild b/net-libs/http-parser/http-parser-2.9.1.ebuild
deleted file mode 100644
index 28a3330d367a..000000000000
--- a/net-libs/http-parser/http-parser-2.9.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2.9.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-2.9.2.ebuild b/net-libs/http-parser/http-parser-2.9.2.ebuild
deleted file mode 100644
index fbfc696edd30..000000000000
--- a/net-libs/http-parser/http-parser-2.9.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2.9.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-2.9.3.ebuild b/net-libs/http-parser/http-parser-2.9.3.ebuild
deleted file mode 100644
index fbfc696edd30..000000000000
--- a/net-libs/http-parser/http-parser-2.9.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2.9.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-2.8.1.ebuild b/net-libs/http-parser/http-parser-2.9.4-r1.ebuild
index 1d64d816e0bd..34d63a7745e6 100644
--- a/net-libs/http-parser/http-parser-2.8.1.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.4-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="HTTP request/response parser for C"
@@ -10,9 +9,14 @@ HOMEPAGE="https://github.com/nodejs/http-parser"
 SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/2.8.0"
+# 2.9.4 restored ABI compatibility with 2.9.0 but since we failed
+# to set subslot in 2.9.3, we want to provoke another rebuild
+SLOT="0/2.9.4"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-non-x86-test.patch
+)
 
 src_prepare() {
 	default
@@ -22,7 +26,6 @@ src_prepare() {
 
 multilib_src_compile() {
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
 }
 
 multilib_src_test() {
@@ -31,5 +34,4 @@ multilib_src_test() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
 }
diff --git a/net-libs/http-parser/http-parser-2.9.4.ebuild b/net-libs/http-parser/http-parser-2.9.4.ebuild
deleted file mode 100644
index 28a3330d367a..000000000000
--- a/net-libs/http-parser/http-parser-2.9.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2.9.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/http-parser-99999.ebuild b/net-libs/http-parser/http-parser-99999.ebuild
deleted file mode 100644
index 7c1256025252..000000000000
--- a/net-libs/http-parser/http-parser-99999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit git-r3 toolchain-funcs multilib-minimal
-
-DESCRIPTION="HTTP request/response parser for C"
-HOMEPAGE="https://github.com/nodejs/http-parser"
-EGIT_REPO_URI="https://github.com/nodejs/http-parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	tc-export CC AR
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
-	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
-}
-
-multilib_src_test() {
-	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs && dolib.a libhttp_parser.a
-}
diff --git a/net-libs/http-parser/metadata.xml b/net-libs/http-parser/metadata.xml
index 390b89b4f048..d170ad69fce1 100644
--- a/net-libs/http-parser/metadata.xml
+++ b/net-libs/http-parser/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
-<upstream>
-<remote-id type="github">nodejs/http-parser</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nodejs/http-parser</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index fb4861018673..e50a416adc8c 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,3 +1,5 @@
+AUX libaccounts-glib-1.25-assert-failure.patch 743 BLAKE2B 5f0ebe2754f4d0b03bfabfb83e3c7fbb3f54f117a1548275e8f974d43c92aeaadbae6c22d909127aa4a8c47e806a26f19e6ae598f30c5f34e3e2b48b3a7ff8be SHA512 4a483a915fc72efa42c10947cc399f30f2825a8f2bd59d88afec5da9cb29346572ba80c316ca4de4b21132e8ad34e031cdd735cb3ed0767d51780a15ac086fd7
 DIST libaccounts-glib-1.25.tar.gz 117337 BLAKE2B 72e6e15b63eea4d5b2a3e994779a4636bee859c6d395c8c9f65120cfee1c25a5708971b438010f668eefee20735b01e9f9f4e1ac4cb55495a06143d20198e422 SHA512 cc8b493d246f99300ee614fed93258378ecdbe9c518a958a59827ee8f74559b1ee3683acfb85f59aa91390275497fb35041da2be47f27f24f96e1efd5d6d2e20
 EBUILD libaccounts-glib-1.25-r1.ebuild 1310 BLAKE2B 6c513410dd11fda7262bfe9d5c096ba1121dd0c125eb4dfcdab28a76400028571988dcb1bef8b7b08cb2989c5a8fb4ba5ff1ec8cf86d342469a750dbf89f3dc8 SHA512 a58f84f4f760159b6209d00117d91e8859de258deea787c9c723609fd393193ac8f89b66001b6e8113e140bfb4a7a3e29b345696969e47b4f1d09be98a1aef02
+EBUILD libaccounts-glib-1.25-r2.ebuild 1365 BLAKE2B 207de9315fb812b361104308a250248bba7044bd69bfa77950a2cf1b034277f6913885cf82cf4d7ddac60975b3251b57932dd7c633283745f204144394565f28 SHA512 03b3d286f01151f71dfe48e10f24b383e9fbdb34020489178c451f74ef1687cdd7beb1547f14c8bdaf32cdf161edc9f383f9910a582ad34c942be42c0246dc5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/files/libaccounts-glib-1.25-assert-failure.patch b/net-libs/libaccounts-glib/files/libaccounts-glib-1.25-assert-failure.patch
new file mode 100644
index 000000000000..f35aee5c6a84
--- /dev/null
+++ b/net-libs/libaccounts-glib/files/libaccounts-glib-1.25-assert-failure.patch
@@ -0,0 +1,26 @@
+From 29bdc47abe11d3bfcec7a35ed83475eba04bfdaa Mon Sep 17 00:00:00 2001
+From: Pekka Vuorela <pekka.vuorela@jolla.com>
+Date: Tue, 7 Jul 2020 12:51:50 +0300
+Subject: [PATCH] Avoid assert failure on ag_provider_get_tags
+
+---
+ libaccounts-glib/ag-provider.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libaccounts-glib/ag-provider.c b/libaccounts-glib/ag-provider.c
+index 93d1541..8a79616 100644
+--- a/libaccounts-glib/ag-provider.c
++++ b/libaccounts-glib/ag-provider.c
+@@ -464,6 +464,9 @@ GList *ag_provider_get_tags (AgProvider *provider)
+ {
+     g_return_val_if_fail (provider != NULL, NULL);
+ 
++    if (G_UNLIKELY (provider->tags == NULL))
++        return NULL;
++
+     return g_hash_table_get_keys (provider->tags);
+ }
+ 
+-- 
+GitLab
+
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
new file mode 100644
index 000000000000..7b08a98a2200
--- /dev/null
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit meson python-r1 vala
+
+DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
+HOMEPAGE="https://gitlab.com/accounts-sso/libaccounts-glib"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/gobject-introspection:=
+	dev-libs/libxml2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-libs/check
+	doc? ( dev-util/gtk-doc )
+"
+
+# fails
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-VERSION_${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-assert-failure.patch" )
+
+src_prepare() {
+	default
+	vala_src_prepare --ignore-use
+
+	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir meson_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir meson_src_compile
+}
+
+src_install() {
+	einstalldocs
+	python_foreach_impl run_in_build_dir meson_src_install
+	python_foreach_impl python_optimize
+}
diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest
index aa989af051d3..f31cd2b39dc8 100644
--- a/net-libs/libasr/Manifest
+++ b/net-libs/libasr/Manifest
@@ -1,3 +1,3 @@
 DIST libasr-1.0.4.tar.gz 413258 BLAKE2B 971dabb83e322808344c4b53622623556f662c6ada200862469dcfe4f0277ade438b39e0c0e19d372622dfd3c3bc69c2bf1ca22200e6318c062f280f72efc15e SHA512 6f189f9f492da8204396fe1246b4a0162751b2060a881469649ecf987b7ac1cc834193d2052e80a09bf94fedc8fc64123e9dfcfe3a2e4395f9e26d37afc84501
-EBUILD libasr-1.0.4.ebuild 404 BLAKE2B d1fb56eb16ba3d9ab9472e7955abe62aad7e7e05e205ef73e117b25b28d6780ce17c3a0d17006b98490e78bff6b0a413ac6532e8721eda5337d7a1fa3cfda25d SHA512 b484bdc6d0c10187212eb81f5721a6ce205045fce4840d1d078a5f073d3fc7d9b1bcd4c0c93305bf06bafe823d3048943117fc3a61e1ed4bc617ca5e55c1a04a
+EBUILD libasr-1.0.4.ebuild 480 BLAKE2B 5cf5584fcc4999c40a13ae05333c40a48c4aaf9f60bc4ebba420090efaebe2e4218d25f6b885b18e4291d27f9a5cf41a76a2d2c517578a528b8812b0ee1f321c SHA512 fcdac3bd93c7a25aa7683674054b5563c795cd95ea37db1178dec3b32d452e6d2cf8c829c21eba9dda1279e927d2a9380086f9e2c3eec884eea72573b7c97243
 MISC metadata.xml 331 BLAKE2B fb0ff46381f7fa14f0fd15ffda08e378a5a88e9771ce464ad813e4c8cf7d2146ca45b2c2cc8c13756bdae2413758f7cba2c68cf4752405359f311eca700c7fbb SHA512 dedfef00a1e0f26438a1e0fbc9b53fc64566bd6def05260410d21aa3ff941ef0c5c9dbc205b3516052b0409943acbfb431e4702c87d1c94e9950ab9492f68850
diff --git a/net-libs/libasr/libasr-1.0.4.ebuild b/net-libs/libasr/libasr-1.0.4.ebuild
index 87b8e9693bf9..41ba9e0f2126 100644
--- a/net-libs/libasr/libasr-1.0.4.ebuild
+++ b/net-libs/libasr/libasr-1.0.4.ebuild
@@ -10,7 +10,12 @@ SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest
index db22859a8635..e8183fc7c0e0 100644
--- a/net-libs/libblkmaker/Manifest
+++ b/net-libs/libblkmaker/Manifest
@@ -1,7 +1,9 @@
 DIST libblkmaker-0.3.2.tgz 17893 BLAKE2B 390ed56c7d77b904ec52d52cfa9dfff4e5c01c1662e0f5a5f17f92eb7b3d79619bd6ee64cfa28bbff5750db7cbc31d1cd5662b11a86ef63882063ddcb72cfb6b SHA512 e45c50c11676995171f6fb27346a42843a2c035c391ab84b5e565f5fff109a4ced6cdafb6c662572eb7243b25d2014400e9516cdbbd0d65f4ea31da7d0e74bdf
 DIST libblkmaker-0.4.3-github.tgz 13712 BLAKE2B 4c93b8a74d25b5833371e2db78062f35c726b6ac89b8b22420a61d15a1d37cf0784b001e7061da4274ed34691021d5e92a27ce04260621cfdac6b4c7c49ce69f SHA512 a8686fc0cd757a214e24476c2fc8bac4511e6522ba977134150c0084dd2a3d7620f3378f4c454dcefb675840b71597f37d5b696a74ad0251b5d3921082c23285
 DIST libblkmaker-0.5.3-github.tgz 14161 BLAKE2B c8da4f7e3e2811cc88a03537ceb2e145ba3bb796520f4330d190e5935c13b73769cba73612d321f5c63b636bbd821e334b5a72ab893bd765edbcf49ce374f789 SHA512 57edcd583879d6abea716b6817a99dc345485392d149ddc6bb2ff9bac76d22f84cd960dc0746852e7c944a10b85d26c57fb107eac79680f77829c9bbc03c202d
+DIST libblkmaker-0.6.0-github.tgz 28907 BLAKE2B 31b64604040a514ae844564d19e884932fbaa0640d0491cda5ec9e922b0714c89e8810f1da3d0057625633555ea486c15e20f2a32d8528a6795be52e692d4e4f SHA512 3e9028c7c4664491274c241020d507ba6d736b9e9048562434d27d92f6cdd58ec167fae060bc355ee6a7f010a6a8a6ccff1660ecfc616c705c5deb3ed95c5e69
 EBUILD libblkmaker-0.3.2.ebuild 539 BLAKE2B f82f0c021d3a6dcd6ecc7cd777c26d51a7dfc712a0e96b27caaae7d144379ce0050e84d91a55dcc35d32de8206eff3b65e99b711c5728711445ba1333276f2c6 SHA512 422a503f2b0d561f06d690f66803dbd6fae22d7413d3d08730e7e640ee266dba9dc5748a23ea254e221194e3882d879610129c144028e1d90e9a1923a2fb5c89
 EBUILD libblkmaker-0.4.3.ebuild 514 BLAKE2B b33abfa6b7cebd3af366855219d01ad6ab281e4bb4ba557c428d988594136f0a4f6c24296648e5a2ef51a55bb5b5b9ab03e5a7a2ead6b8686376eddc419de9d2 SHA512 60099192c78c29f4972d7dad77ddbf2452c4089df11a802a6fd1dd7531e4da4895f7218567bd7d15b950efef0db82160088a8de1a6afb6eb747324282045d615
 EBUILD libblkmaker-0.5.3.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e
+EBUILD libblkmaker-0.6.0.ebuild 691 BLAKE2B 701e1dedffd93d5677a0c9142cae9610137bd839e5e051225401e38e11420fe85642fa21042756bdaa63bad4848fd821072900299e723986564f1c91861954e6 SHA512 cb3d664c783778bd1bc2c70732ec7f798153ddf97eece60d2e823bb541a3642ce565a0db504d01e144797e4b20f488b0418d996effe3ef504208fff8b57d0a68
 MISC metadata.xml 458 BLAKE2B 6b0af9ae636522bc685b709e618ccf90343d3639211c2cd660de7f32934e04d672f0202c239dfcf91b10a27189a3f26694471007f7ad73adbfa5f1bf7a85af7c SHA512 55bf903c89e214eb664da1995053dbfc0dfd896c1cda51ec7ba38c0f8bcc20e9aa4142702c201ac57aec1a132ceb338c8137deaad9c8502e275ca517a63eebab
diff --git a/net-libs/libblkmaker/libblkmaker-0.6.0.ebuild b/net-libs/libblkmaker/libblkmaker-0.6.0.ebuild
new file mode 100644
index 000000000000..3a9c7429f916
--- /dev/null
+++ b/net-libs/libblkmaker/libblkmaker-0.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="C implementation of Bitcoin's getblocktemplate interface"
+HOMEPAGE="https://github.com/bitcoin/libblkmaker"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/bitcoin/${PN}/archive/v${PV}.tar.gz -> ${P}-github.tgz"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/jansson-2.0.0[${MULTILIB_USEDEP}]
+	dev-libs/libbase58[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/libgcrypt[${MULTILIB_USEDEP}] )
+"
+
+ECONF_SOURCE="${S}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-libs/libcapi/Manifest b/net-libs/libcapi/Manifest
index 66e8710a885c..b25089ef68f4 100644
--- a/net-libs/libcapi/Manifest
+++ b/net-libs/libcapi/Manifest
@@ -1,4 +1,4 @@
 AUX libcapi-3.0.7-remove-libcapi20dyn.patch 890 BLAKE2B 308336e32618662b644d03b808df27da49d2dd6088caaa5c74ec5e18674919736649f9d01b19fe4f52749421b21c57338236ddc940505975a927f4921c621634 SHA512 7e5216d7dab21d397da85b6b8c6c5a3e4cd3b0a724ff30baeb9a4651981e1cf3cdae64f6b2a628026132e492d49f142a249db0a99f82cdb281efeddacd3a986e
 DIST libcapi20-3.0.7.tar.bz2 474174 BLAKE2B f1d1838882aafa48c76b9843c0c1cb8fb8774bab3a6ae79825c12ed5558f09257d8229266fd1729e77fdda575b30c729613521520acd1dbf636891fcf7d33b18 SHA512 c14e493f34fbd8477aed8efc0e6ee8dc07c6007be75610d59a15ce23f48cd5cd53da1b1ac64c11e7516df5aff40877c76ce7a6d72b5c7b1d24beee7592a51bbe
-EBUILD libcapi-3.0.7-r1.ebuild 546 BLAKE2B 3d8559a061f340655c92f7528c43fa02637b79ddd55520637cf33b7ca21cdb3ffd3e7ed3b3c7676c6c56168b8752a92f6f446b564f38561e7fc48cb080436ec2 SHA512 d90cec11655871aa604d70fe5397bc98735aa02e4fcf6e483fdcd72584d32c0ffd24b93f3c5dd9804df28e51a9b4e7a9d2762867a6e98a3c5ba8c28ff032477a
+EBUILD libcapi-3.0.7-r1.ebuild 730 BLAKE2B b5cc3adbe86af91df5f546e20e5d94ecc904d8f57f467b2487f5f7f60928aae115b8de864722e1af0533d4a1381c88c6175e8524cf33aeaf1f43470ded37d335 SHA512 f910b8a05bec1d4c39c7a1bb9482b7b021890a27bddc8801ad885362e5811bab6cb7eb9e32ce37a9ab000c6a414695f9e01c12ee4f6575eef72c4cacd2b61376
 MISC metadata.xml 247 BLAKE2B 2b0debd151e3491250440c82b4a798dc2f0b66d7596743046db44dcd61da4db89c08109295eda8649f595ffd4673579cba68f48e8466bc0294c30c50c17b1e23 SHA512 150c10fea209759328d07c0c018cfe5e89e632e4a5e1954f12ed48e75e0a7a7f9fc084cde4214fcf074b9504dc78b79e788c05db6cecc9521f6afdd852892c9a
diff --git a/net-libs/libcapi/libcapi-3.0.7-r1.ebuild b/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
index e8956cc46aea..581f0ffff130 100644
--- a/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
+++ b/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-multilib
+inherit autotools multilib-minimal
 
 DESCRIPTION="CAPI library used by AVM products"
 HOMEPAGE="http://www.tabos.org/ffgtk"
@@ -15,9 +13,25 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-S="${WORKDIR}/capi20"
-
 RDEPEND="!net-dialup/capi4k-utils"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-remove-libcapi20dyn.patch" )
+S="${WORKDIR}/capi20"
+PATCHES=( "${FILESDIR}"/${P}-remove-libcapi20dyn.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+		econf --disable-static
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index ace692d894a0..912f4ecd4d85 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,5 +1,3 @@
-DIST libhtp-0.5.33.tar.gz 496010 BLAKE2B 9648632e9f37c20a3efa5edf9b5ee5ed97b5ba767faf6b276c4d38760422b601f9443cfaf30e60c6e6dd555d259a3b5613f0370040753d7336f6ef5e94b32d55 SHA512 52bbb72710fd0f5fc917d62f5a2b659092669eda0553586e75c17c558e3f6559dcf8eb7707db931045af532592cbad691461af2dd5362f95e2a4884e7475bf94
-DIST libhtp-0.5.34.tar.gz 496765 BLAKE2B 8f4eb6b074d9a84fa872ff963f20b4a52f86d171a03fe2347affa9b9383d0d4ba4633b03ec5ca2a9a923c28d16e3f2304f0b4e32c8c4385c0333ba2f280ad21a SHA512 dc86c6b3a90439e9e2d5375b64119d80771e2dc076670f49b9d5f252d7b16fe5b643a16577ce50189c289e7baf16fcb84d86254d965a11ab1d148ad59455c20f
-EBUILD libhtp-0.5.33.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
-EBUILD libhtp-0.5.34.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
+DIST libhtp-0.5.35.tar.gz 496852 BLAKE2B 21ee020f94ea351f408eb3d0d2f99b01f054341a390c9cc42c44a1f2237a1fe965e12797ecc04cf9a519e34fcf495fae4b4119bca6c38ef1d1fa0a9d35c243fe SHA512 d88a8b5f93759a348d0cb039dd95c5504b09b6ff577138cebbaaccf06a6e7ab682e8b61d904e005af67ea4887492d949cdb466d1cbbd9b970a94a30e8b26564e
+EBUILD libhtp-0.5.35.ebuild 856 BLAKE2B 663c179c3c1f2d8c35b9c532f777f30ab8727d3f4c8927023fd33128d7a9c393cfa1c098e03c55619c574bd1cf0a390341c4c6ae3c7b25a3061828c300ef072a SHA512 3501836775b8cd7bc62f015c308f3d89aef81bee728eedcd4cb85ab324b959c36a096f8465dcb7f4a5331915775437d20090de2da0f929c0b80a80d2516f3d4f
 MISC metadata.xml 314 BLAKE2B e5d844caabcf76837a2fdd5d27d3aeefa56773856d21a49187139a38a0ca445a7647fa72928a239df94f88137e213ef7560020baf4c250ec5257b892bc2f7d24 SHA512 c8738803840e411351a88683e51e1c89b7f4ca635d3c2bf6062abee768ee0571fd4d3ea9cde45698c7427391a2b7e2603114e6455647cb88e40be151d9aff714
diff --git a/net-libs/libhtp/libhtp-0.5.34.ebuild b/net-libs/libhtp/libhtp-0.5.34.ebuild
deleted file mode 100644
index 4c0e8229142d..000000000000
--- a/net-libs/libhtp/libhtp-0.5.34.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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/libhtp/libhtp-0.5.33.ebuild b/net-libs/libhtp/libhtp-0.5.35.ebuild
index 4c0e8229142d..4c0e8229142d 100644
--- a/net-libs/libhtp/libhtp-0.5.33.ebuild
+++ b/net-libs/libhtp/libhtp-0.5.35.ebuild
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 2b83ba104a42..6f1519e27a4c 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,5 +1,7 @@
 AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047dada87e6721e50309c0d81ee411dadd3840bce2c72dc019aa1c7804801eafa387aead11b820b203de901f1dd4253e SHA512 ecd28b596cbdd01029b299d0f378e85f854205abd7bfb592061576dde35195dcc84b37f7aafe5127f76fb22b633f9f4ba13ef7158c58a021067cb7502effbc14
 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.7.ebuild 1222 BLAKE2B 44cab1f6dd0d4f8f0dd2146aa39556ce95237ed89059616e7f5e7593941df515daed7f4e0f0f9b9ca9cd32b85cc547b2bd47108a10f90e438a12ca069a5c415e SHA512 2d8fb1530149475142b1f256a4b191b7407609cd107a0aa19c33cf06e7d086e84d17c1d569ad8d4b9dd047eb237d2254c906dbbde62cb44dbf44e0f721d9ee0e
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
new file mode 100644
index 000000000000..37c534bcee47
--- /dev/null
+++ b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit netsurf flag-o-matic
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
+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"
+IUSE="doc test"
+
+BDEPEND="
+	dev-util/netsurf-buildsystem
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-lang/perl )
+"
+RDEPEND="dev-libs/libparserutils:="
+DEPEND="${RDEPEND}
+	test? ( dev-libs/json-c )"
+RESTRICT="!test? ( test )"
+
+DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
+PATCHES=( "${FILESDIR}/libhubbub-0.3.6-json-c.patch" )
+
+src_prepare() {
+	default
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i test/tree2.c || die
+}
+
+_emake() {
+	netsurf_define_makeconf
+	append-cflags -Wno-error
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+	use doc && _emake docs
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+	use doc && HTML_DOCS=( docs/html/. )
+	einstalldocs
+}
diff --git a/net-libs/libident/Manifest b/net-libs/libident/Manifest
index 93ccd73c2875..cb572ba9ff6f 100644
--- a/net-libs/libident/Manifest
+++ b/net-libs/libident/Manifest
@@ -1,3 +1,3 @@
 DIST libident-0.32.tar.bz2 205831 BLAKE2B c1f7798c83764774be933d0c34ec8729c66f3fd2bee6c7f8e5e472d929068c56bda9353cfa1b2fa5e7636fbecb38c02fe133233958992ccde766d1b614dd7a0f SHA512 5e5d0e3dd2514fa5af9dba02eca52cc8015d091fca05beeb23bae1c98d33a1a1313081cafc9e1e49d2beb5c524beaf1eb3679ff54330164aa170d74dbd84b244
-EBUILD libident-0.32-r1.ebuild 540 BLAKE2B f95920ccd8b3a085de149aa545511fa73b1e31dabb1a4f609e6b621be78acd7a3434d721ea4f7f8fea97851d6193da32fa2d8df0ac740402f454029a483bda99 SHA512 c8b4631ad50bc00d26541561bcdc577c629c36583822f517137c1d66f9a48d7762f9c07c1d1c2bc5a83dadaff28ed8d8b60b978fa3c6b9acbcc939684c7e7e7f
+EBUILD libident-0.32-r1.ebuild 589 BLAKE2B f67fd2ad6c9a04e7423bcbcb5be0611c726cd7cac3cd8e177b86b6ffcfcb18d88867a9bb068f318fd949b8850788825a4d05f8a6c93dabc9c0da8c9dc0b691ba SHA512 91de0a3440348f462a6ab98d8c7d1894155dde92f853467aa64ca00fd645793861e8983029342a21922d2d80bc8e69ab28ce88baae6f1267f0d00312db6459d6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libident/libident-0.32-r1.ebuild b/net-libs/libident/libident-0.32-r1.ebuild
index 99d4cc5919bf..6f49ea50ba4d 100644
--- a/net-libs/libident/libident-0.32-r1.ebuild
+++ b/net-libs/libident/libident-0.32-r1.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A small library to interface to the Ident protocol server"
 HOMEPAGE="http://www.simphalempin.com/dev/libident/"
@@ -10,12 +12,17 @@ SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 8d332b197f4a..3ad8c035df6d 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,4 +1,4 @@
 DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
-EBUILD libiscsi-1.18.0.ebuild 702 BLAKE2B 720d891d735ab26c8dfdfb214d3781eee4ea9cbdccb6b7e0ff933bdfbfbc5e6476df94dd40fd5cb9a0791a4500361be0bbf2e8df4e5527460f65619ce7926608 SHA512 88b67b61977325cedcd63ed0ff25592da7f17895e271ff08a1157d566d3b357cf5f7adafe816c6ae26898bbac8a5e61038b36a58a2dc82e6d9f3c905feffcc99
+EBUILD libiscsi-1.18.0.ebuild 701 BLAKE2B da88c225c1fd5330dbae0050ca38dc8c24a5b3ee61975cfd309e888e33c254dce64aa4241e892d4c5f15151786f62feb20cddeefbcaf4f14551a868b83a4f3c9 SHA512 4caf6d8ec37771d33c15e69d1c4af83377d67c7b8957d824e0baa3017e1c9652e64acd8105a3920c4c003a536b589d9a0e7a24e69330a01d0ec7edb24ba9d4dc
 EBUILD libiscsi-9999.ebuild 639 BLAKE2B 89eb8fb7186b731e920ac69ecdc0ac6ce3cfa9722d61e20f9b1fd5615f47274c303c99ed6e5b5d4f7c9f66aa2ee76f4945d4f5adc960df593f84188766df7063 SHA512 45c93c5fb0cfc20ba74c11777711308075fd9f658f2ba2e99421ea2002a159fd90bd0f9297a6bd0d43fdd0e768ec97fa0d52e7e85053b0b7524d6904592dad48
 MISC metadata.xml 247 BLAKE2B 3951ab56f9a5dd54a6da332a8f5a7c2b445ec812f8ba6ff6e8957e0ea605c197954b403c8da0d81fc02ee829ccbf807ee8fb929b05ff6d347e67bc22d8023c26 SHA512 8188eee6fd9f0b2bf471e9ceec1bb6459f1ef84ba7ef3dc372747043d3a6db6256dccd4e9e12596a07a04e778576e83fcb56350e59a7e5e09c43ac4dac789af9
diff --git a/net-libs/libiscsi/libiscsi-1.18.0.ebuild b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
index a493b1185913..652b0b2953a8 100644
--- a/net-libs/libiscsi/libiscsi-1.18.0.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/libgcrypt:0="
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index c10923ec6d03..e548d0cc5be7 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD libktorrent-2.2.0-r1.ebuild 1566 BLAKE2B 7cfb88beaab697d0d0ff3861213034fa06497964b94d521218954dc45ed2202552d7138244b2befd3e948840a9ba37ff94f484cef4e29d66534beea3b2267f28 SHA512 ccfece0c049cdad6f01adb2e26e6a5d17fd92358696de9db9bea9310b1b3826448fd2b6219da8735cf32190fedeb8d09e8ade66850d8d12f30b0422eae17e9ea
+EBUILD libktorrent-2.2.0-r1.ebuild 1551 BLAKE2B ea1add797a2ef00905b0c4bd7ddf18782e7f0d9f4e1533ce87df1bccb7fa7949a8edcab68891cc2ba0e46c574d5296dcd2aef9d05e3a72dbb231f2ae764f951a SHA512 7b1f88e1a44febb76014ed62e20b00f69910c56ff487d77003079ebf0551a34fa8158f01cc9239f853ff24cea3d0422a4ef93961c74effadcb0aedf46424f351
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild b/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
index dc2cd337b1ed..95565a6e37af 100644
--- a/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
@@ -11,13 +11,12 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent
-https://userbase.kde.org/KTorrent"
+HOMEPAGE="https://apps.kde.org/en/ktorrent https://userbase.kde.org/KTorrent"
 SRC_URI="mirror://kde/stable/ktorrent/5.2.0/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest
index 9e5bc0ec8825..f2d841fec975 100644
--- a/net-libs/libmediawiki/Manifest
+++ b/net-libs/libmediawiki/Manifest
@@ -1,5 +1,5 @@
 AUX libmediawiki-5.37.0-fix-warnings.patch 5020 BLAKE2B b00f572a413f09112cb9712efec8204b15ac5a77a6ca672ce5a4c0e53b2b4f7c329c6c792bc2d29a65afc131c8f17cf5b7ae14943296cad0b6e1e6275702a23f SHA512 2af979b26bdc224afaa9bd8259bc28085ff89ae0ec623620900b02e44467c13cc65d91c89789970f30048061b8fdfeff8b8be324b7e886f6700d12c3d1d6dcaa
 AUX libmediawiki-5.37.0-tests-optional.patch 470 BLAKE2B 856433e48d50f6046d1d994cafc081d1afe04a7d82fe30476e129716ede33ecd26ee721fb566de4fd094be4d897a204a34102790225b49f8a31f26f23cccc4d4 SHA512 91e483c2483e2d07ed2b4d974f37c19bcbcd2c69ff9841451d4aa182945469b83dcdbe5025807ba83438cfcfbf4218fe32f7f6d5f5232cca913285fe8b9bc33f
 DIST libmediawiki-5.37.0.tar.xz 55188 BLAKE2B d04ea7dc346792c49009b382fd774ad9573e70cb52599caa57ac3f0dcfac93c0569a42cc54e11ba185e80fc2a5847d6a6f6c81adda9907c87dd3f7459771da3c SHA512 5efcd30782c8d54cddad51c6a96065f2942529e89facfd1c3a71af343a898858db02fa95dd0af0161b3e13aee6a9a373a0a641ce64e128c7282cbf3770db6993
-EBUILD libmediawiki-5.37.0-r1.ebuild 849 BLAKE2B 721bded8441c281f008f7c53ac69bf6d7e819470ee91ebee8d9ccd6717e500cbd971002b17f47574f04ef3e2efbe25eb2cc6befe7b96b7d0cf297c42b9bd4834 SHA512 8f57d19d7cc6dedaa89f9ad1e9d0c09516b64243aed70115d1719725c7c3ad714c925d809c95272dddc3f44064c8bc16c1b127b72e540dd1c46ddd61836d4f96
+EBUILD libmediawiki-5.37.0-r1.ebuild 865 BLAKE2B cc27b3db59d3e1d4ab5d7c89af7f468e69a7ee14f8331a8db58be10d9dacf6258efc3f6c3bd5c71bd4bf8b597e86445373f3d18469cafff189d913602f6fef5c SHA512 ad61d3218c559ef0a3b96d709e995ee6c9f519e71272b170bec40272e05002e944411a6a9778cc5c3495ba1336a502970300e11feb62a7b4410e894dd4bd5fd4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
index 620b8aefcf78..f1cc05a6f424 100644
--- a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+ECM_TEST="true"
 KFMIN=5.60.0
 QTMIN=5.12.3
 inherit ecm kde.org
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 0591f6dbff81..6e420a4d03d0 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -4,10 +4,12 @@ DIST libnftnl-1.1.4.tar.bz2 368262 BLAKE2B e5f396b582221b9f9a7d3303d65548e359747
 DIST libnftnl-1.1.5.tar.bz2 373930 BLAKE2B cfd06084fb7de5dd6120a22faa43ac578f170e5209564579ff26bdf49e2b70b5b3944275861e32fcc7f6f2bb1d9f43bf51157665d0d5faea259e14cf930030c0 SHA512 a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7
 DIST libnftnl-1.1.6.tar.bz2 376340 BLAKE2B b5ca243af71462f7c91cae3f368bca7ba19151f5e14bdc459efc136cbf1d6f0234a097337dcee2a2e733a173c72c71496f34222dbd217e79b2a5b614315e6b30 SHA512 3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d
 DIST libnftnl-1.1.7.tar.bz2 387829 BLAKE2B e21ca38edbc7c651a061fcd6db80278ba99b4fe0c92c1912039fd0a1cd4b7636c87e17f538eaad8c6b963748c7c77800eaa83ddb80d344865504329984ac9c96 SHA512 80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407
+DIST libnftnl-1.1.8.tar.bz2 389632 BLAKE2B 5668bc3839abb99b44d2eecfa4fe391d1669b31d5f653f859ef2ae80ed355252bff20bc74773ec68024e0bf9e93c8993765b84e8d562fc2b2b1f7e3f5d3fed91 SHA512 173d8a7b95eb964a9fbe7ffcb46541a6bae976b4d4f2a28fbf9b03bf3e50a29b1ea12faa49926d2d33bc088580a833fc6e15ff59a30bcfe67c91c524f00c778e
 EBUILD libnftnl-1.1.3.ebuild 1193 BLAKE2B de38ffd4dd0740b905ae7736201550806cac8671acca11f8999e1daef009799efdb673d234f9ace51409dd243bd50d4cbe7dac8869538a02441bfded17811916 SHA512 47a7b1b84dde93caf3fa1b2bc098ad62063584b185d96465140a8f661db5021e25e4a2109b91331faa186747991188ffd419768fd8b2139179a1656d229f2e27
 EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
 EBUILD libnftnl-1.1.5.ebuild 1255 BLAKE2B f0a32d76a4cc25ccb33e16c1f9b0544f4b94da741fb335f7978ecffcb7e3289a42917773b293dcf383b77a72840d5a65cb21f21b502bba0c4f846309600d346e SHA512 dd42cb3ea1475d8f39034a7365c90f7e976f3cbc6f11020ccc7915c0d8bd27fe04dd2f7d784c1d08a8abaab02045119c705d10a802f3ff9a736a098fa6d5d615
 EBUILD libnftnl-1.1.6.ebuild 1200 BLAKE2B af974af8061f7789020a3efc449416e43af663ff1b8b098f820e5aff395bb25f9d99228bf363b5da8b5a32b8d38275564374f59088c24d0f11ac213d98e32590 SHA512 c6ee6faec8cab4159745be8665ad7363addc99f07d7a70b1c2e23337041ab2e5ff2b3262d9f13f946abda41c092482632249968c91fd6a31a4dd4005c551518c
 EBUILD libnftnl-1.1.7.ebuild 1192 BLAKE2B 5ce9550c836a983841de0197da1579e3c8259462334c6df811dacb4f66ec26d5269bce714a671e560c2b5048d085672912db9e33a58678c0e2273b7c35f877c8 SHA512 4b0acb69ff0f60a69ba115c219ff5d55d932739a4b7ee278b2e97e80144113d8ca3dc14a66e7e623f993e5d554594e301398595a260977f754d55f241345253e
+EBUILD libnftnl-1.1.8.ebuild 1200 BLAKE2B 6d0bb8f977e3a2910288ab3a5a3e7576b18f523c2c94172fdab12dfc5e4ce7604374da769ed66077dddef9cbe616695163ddb24f5e0f403d0e7a070a019b7377 SHA512 416d4570ac5dcb1d147e9ad0d7fd2c75dfe38ad7a2841cd99199723cdbf896abc68c4e5f551f8dd1f6745a999ff68724c15570b96d1bdea2cab41463c7be2ec9
 EBUILD libnftnl-9999.ebuild 1379 BLAKE2B fb6bcbbefa618ef5175256ca380a636085c561f188d366597c7d9b3d4ae89102d2b56703732deb7cb5398dba880e0f48eea23b38f8d972e4249e5c93d74ffba2 SHA512 63d0e7972a2a3e3bb92fec82afbf2b72de4b68d622b5ae71f2dd948f2897f077ba76e9b96e45698120127b6da935c6a505a1b7fb32440a3f4fb3b41c19061ee5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.8.ebuild b/net-libs/libnftnl/libnftnl-1.1.8.ebuild
new file mode 100644
index 000000000000..992fe51d51ef
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.1.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info toolchain-funcs usr-ldscript
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libmnl-1.0.4"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
new file mode 100644
index 000000000000..eab523797691
--- /dev/null
+++ b/net-libs/libnpupnp/Manifest
@@ -0,0 +1,6 @@
+DIST libnpupnp-4.0.13.tar.gz 537389 BLAKE2B 0085d9ea9cf1786bba8e8abb812b0c1279fc30c70a16cb2bf4cfad405ec1346180171dd39296a30f5747cd55ee06fc314bcb49fdb6537a4dfbcf048fb66fd7f5 SHA512 c0332552ab2ba8aea8e72858601f2415a08a68224f724454d230acddf612b2fdd873daf41aeeeb3e1b4d1694665245087b3c4f96c896d36e2e9c017ea95d13aa
+DIST libnpupnp-4.0.14.tar.gz 538629 BLAKE2B 3bcd1cf04126aa0d16056865e2f7c90bc479ae4ccea5094b2c44ee687be95fe346494a2d07ab7925963d88e614fff1a451341af7d41c2a16df1208aef728d515 SHA512 b224cadbcd92b8d66118da015db345b3ef5c4858a458ac681d550c1409e62f212d3b2a744a8368fa4149309f29de2edb8cb14c75ebcb14653ee351e0d24cba71
+EBUILD libnpupnp-4.0.13.ebuild 716 BLAKE2B 12c8be38c4513b2683678be91c322f7f9519839fd0925473f2f41e611a23e0509dda2565e9a201e5c855b011a4ed9a9c3b93f1d6e063918574d0b365609c9b00 SHA512 e030788b85dd8ef7d63348b8d984635b29a7e6ca76ffc37b25016c7f10f4dccd9d8cf356e01e93da94341b4ef5c9890128a85b5a88197785ceff12d20b6faade
+EBUILD libnpupnp-4.0.14-r1.ebuild 721 BLAKE2B 4736b9041ec36ce911adb2c21ae39bff774e0c1aa4ad5871c037196a0ba03af7988850f05e6f2fa5edacccdfa9b85c118188cb696cd37dc91ba210f8ee5bcf4a SHA512 2856fd4e7d5e062b00cc4be6228c6a557e0cdbc277e2b4731726b86f6dcc028b6489fd5929c108eb1c2ced5c18d3d1665461f317c0354911f9db918b7e69dac0
+EBUILD libnpupnp-4.0.14.ebuild 716 BLAKE2B 12c8be38c4513b2683678be91c322f7f9519839fd0925473f2f41e611a23e0509dda2565e9a201e5c855b011a4ed9a9c3b93f1d6e063918574d0b365609c9b00 SHA512 e030788b85dd8ef7d63348b8d984635b29a7e6ca76ffc37b25016c7f10f4dccd9d8cf356e01e93da94341b4ef5c9890128a85b5a88197785ceff12d20b6faade
+MISC metadata.xml 535 BLAKE2B f106ebdadd8d1f09dfd088420c9c750858ed36a2eff5eac1bd256a31cb277b0dbfeceb3cc1d724b65a66b97243f32d618379a8c65a52cf341f78fb4f20a4ecef SHA512 99e4e4ea26cfc4eff4ea0e289d144ec21cbb3834f434a1071c99dd890a0c24dded48b66918d61c4840bb6ed469b3e945f5292d14c244be7acefad561de55962c
diff --git a/net-libs/libnpupnp/libnpupnp-4.0.13.ebuild b/net-libs/libnpupnp/libnpupnp-4.0.13.ebuild
new file mode 100644
index 000000000000..a00ee17059e3
--- /dev/null
+++ b/net-libs/libnpupnp/libnpupnp-4.0.13.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
+HOMEPAGE="https://framagit.org/medoc92/npupnp"
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	net-libs/libmicrohttpd
+	net-misc/curl
+"
+
+src_prepare() {
+	default
+	./autogen.sh || die
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--enable-debug \
+		--enable-device \
+		--enable-gena \
+		--enable-ipv6 \
+		--enable-optssdp \
+		--enable-reuseaddr \
+		--enable-soap \
+		--enable-ssdp \
+		--enable-tools \
+		--enable-webserver
+}
diff --git a/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild b/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild
new file mode 100644
index 000000000000..733dfdc33817
--- /dev/null
+++ b/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
+HOMEPAGE="https://framagit.org/medoc92/npupnp"
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	net-libs/libmicrohttpd
+	net-misc/curl
+"
+
+src_prepare() {
+	default
+	./autogen.sh || die
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--enable-debug \
+		--enable-device \
+		--enable-gena \
+		--enable-ipv6 \
+		--enable-optssdp \
+		--enable-reuseaddr \
+		--enable-soap \
+		--enable-ssdp \
+		--enable-tools \
+		--enable-webserver
+}
diff --git a/net-libs/libnpupnp/libnpupnp-4.0.14.ebuild b/net-libs/libnpupnp/libnpupnp-4.0.14.ebuild
new file mode 100644
index 000000000000..a00ee17059e3
--- /dev/null
+++ b/net-libs/libnpupnp/libnpupnp-4.0.14.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
+HOMEPAGE="https://framagit.org/medoc92/npupnp"
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	net-libs/libmicrohttpd
+	net-misc/curl
+"
+
+src_prepare() {
+	default
+	./autogen.sh || die
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--enable-debug \
+		--enable-device \
+		--enable-gena \
+		--enable-ipv6 \
+		--enable-optssdp \
+		--enable-reuseaddr \
+		--enable-soap \
+		--enable-ssdp \
+		--enable-tools \
+		--enable-webserver
+}
diff --git a/net-libs/libnpupnp/metadata.xml b/net-libs/libnpupnp/metadata.xml
new file mode 100644
index 000000000000..d468735607a5
--- /dev/null
+++ b/net-libs/libnpupnp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>stasibear@gentoo.org</email>
+    <description>Primary maintainer</description>
+  </maintainer>
+  <longdescription>
+    The libupnpp library, which provides the C++ interface for
+    upmpdcli and upplay, used to rely on the venerable libupnp library
+    (a.k.a pupnp: Portable UPnP) to provide the base UPnP protocol
+    functionality.
+  </longdescription>
+</pkgmetadata>
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 344cb97a22c4..e07c79e831d9 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -6,7 +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 1915 BLAKE2B 07c0a1f8b90631cea3b1feb04a9b1c67cea39e5c994370f652c0e9fbcdb8f778631e74048cfe6dc9d7d1daf726b3d1ea96de6c0e0b767244056a145d7fb3deb0 SHA512 b77569c6ff1a51967507e8f722c40f8ee4473ae294bf80cb6af74e7300dcaff848be08305f77e35627dda12c919b625ccef510b245343cc7a7a71bdbb4c1ac5b
-EBUILD libpcap-1.9.1.ebuild 1740 BLAKE2B fe8f2ffdb8548719fa379514c6deb9753c7f9d49b26fbdd2f54ec3f922c7b2ae166449883bd85695dd1b397bacdf108b3996e20d4c62a3bf336dcbd1c09c6cf0 SHA512 12b202747893fdf2170caf1ef1355046dd388162bec8790fa638e6ecc7f6819bb19b1d41b5246899cb28214ee8cfa50e799d0d51457a857e32f1daaef5022d91
+EBUILD libpcap-1.9.1-r3.ebuild 1907 BLAKE2B 1c8ea4b16953e06956421db2ea00e5fbc76c7fa0490bb2409bbe687531e5db8fe632cb9e2ae26855dbd81ab20189e094d6f0dab37416ba5c13261712b4f03ff6 SHA512 d0fd1cc018ca36711ec7555ed494be63d20862bf2273d408aebe4bffc6eb2eb8e85e8ca2d213335c2d186c3e6021dd6382ce3fd0e275804162157cd5e6f03916
 EBUILD libpcap-9999.ebuild 1722 BLAKE2B 23bf6d429b4010ef74e9db6be8512a9ae5b7cd013836ceefcdf88ad6d680a8000a39953b0d259679a826e99bc2af7d04a1e87db06d30aa10d6c06e1c99fe8a8a SHA512 b3f929fc29f5d2f96fffe31554d65ecdee1523b7bf4fb8b4bc911999223816bdc376254a208cf142c1e8d9ba36177a4a19909c18e95ca7bb72b93652d0c96b3d
-MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2
+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 2e669584a72c..b6903a431f01 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/libpcap/libpcap-1.9.1.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild
deleted file mode 100644
index 4775c7d9c5b4..000000000000
--- a/net-libs/libpcap/libpcap-1.9.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal ltprune
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink static-libs usb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${PN}-${P/_}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable dbus) \
-		$(use_enable usb) \
-		$(use_with netlink libnl) \
-		--disable-rdma \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-	prune_libtool_files
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h portability.h
-	fi
-}
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 9c9e8fcf34ea..029fd0d8d91a 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -1,18 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
-<flag name="rdma">Enable RDMA capture support using <pkg>sys-cluster/rdma-core</pkg></flag>
-<flag name="remote">Enable remote packet capture which may expose libpcap-based applications to attacks by malicious remote capture servers!</flag>
-<flag name="yydebug">Enable parser debugging code</flag>
-</use>
-<upstream>
-<remote-id type="cpe">cpe:/a:tcpdump:libpcap</remote-id>
-<remote-id type="github">the-tcpdump-group/libpcap</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<use>
+		<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
+		<flag name="rdma">Enable RDMA capture support using <pkg>sys-cluster/rdma-core</pkg></flag>
+		<flag name="remote">Enable remote packet capture which may expose libpcap-based applications to attacks by malicious remote capture servers!</flag>
+		<flag name="yydebug">Enable parser debugging code</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:tcpdump:libpcap</remote-id>
+		<remote-id type="github">the-tcpdump-group/libpcap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 322c2ca5359b..37f5cd348ce8 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,10 +1,12 @@
 AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb126a15fa2e6c2602bc270144236bb7279f9fda9a505a487f569fe7170733e8e6b7e78b8e1fa6892c0ff0be9b3937e9f96f7318bdbf SHA512 a0fa6520c60489675176ca7d5d750d0f54e020592743a3437c184939314b71be68803a7f1cb8cb584fb7ad6ee884c85bfb7905d4bb3e0536d535e990981e9ba9
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
 AUX libproxy-0.4.15-avoid-nm-build-dep.patch 3445 BLAKE2B b5094d1b5869321a1fe4d289f5834f70a0422d001a583aa79eb3a9b1e3e84c3060098908c096398dd6186e9b00e88bceed1464952daa1e782ae862e0fc636e55 SHA512 6f0945337b9fe5586cc38e902526a5473e354143eb26db5a05c02a911ecc9de650f22a3f7b68cbb9e90e737f8001adaa1a6d17fcded5f7cab0462b14cc196111
+AUX libproxy-0.4.15-gcc-11.patch 3850 BLAKE2B 365313af90b676d471bf7d5b2fe13358d3fdc902e6dc7da37a56b5f186d36b61fd730d5b15511e29aec8a332c1ab622c98e27237d29b31a2448909c308e6da82 SHA512 dc211ddd3e68ed62f505297ffab08ebd6733b1bb9fa1376b69e69e7db67a875067b802209334d7901994eac115b692eda30abc284dd2fc42f0ce9678fcbcc581
 AUX libproxy-0.4.15-mozjs-52-1.patch 3771 BLAKE2B c5b760979a0c8188ada05e2842d65fd108451d57255c12e971a99f42e373e77c1ac069506085c1d8d20f395551b140dac77a0d33b009b760632921c9452c5d34 SHA512 6572bd725662533aa5a2660461606bc101bb75edfe21021a73f2faa4d3f5d91fb83637ac43e448ad124abfc1c6e59c82f96ae9cd571289767ee6c193be552fbf
 AUX libproxy-0.4.15-mozjs-52-2.patch 847 BLAKE2B 0b6b408b6745c6b4bf277549a8682db67b4db426e0fe87830c0ca51f9da3c0fc6afc39ee22f13af5c4e3abcf587765b1de0bddc508530302dded86eb1e547b8f SHA512 e1f3fd54ea7fba12d019fe9388236eba1afb73a7e9978c4bbcf9309f9d3aa246747f15e1e62a1d86eba05147b62b2d97d45d1b4547f08a01e4ddef8a8b0746ad
 AUX libproxy-0.4.15-python-3.7.patch 774 BLAKE2B fedb3b9c1f003a24706a8b9b66d70f3abe01dd26bdd25eacf7685247d262e02ae0b406d0a2871f12d8d1b92df5abcdf207d940fec91c964fb33d38b454a91d82 SHA512 4330e9043ed767accea8f6f74b6999017633c51d615b229e7a43e9ed468630c630653c6917a4196e8f05d285df383de3bb269a79db127d902d1c960f29d39246
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
 EBUILD libproxy-0.4.15-r1.ebuild 2708 BLAKE2B a2f4f66d4fb604cf4d3bbd2ab3f7cc336f36152f00ce82028a677e9d269755f75dc118976394e0ad0fbf594f1d1e9d3f2445eeafd3fb7b61854e4a4c5ce4573f SHA512 774fe0a0356d7975a010667270923726a645dd9cd803fcb112e600e0de069282a5cd625f00f196e7112ac24b68e914e62baab5e09c9a9521dac0f540932aecac
+EBUILD libproxy-0.4.15-r2.ebuild 2749 BLAKE2B 731c5c169fdb244d023fe13c3a527ff5bab3e3d1ad06ebf133f7cb735ccfff5af55627def215ef6bc2caf1d2d33fb4c3fc71086e9bc6b0705c19e1bb59de81da SHA512 1923237894e97d2ff10bfde1a281718489b1dbd90883b27b1a0b30066923ff558c9ad3cc4b5e83696f01d92b92656bc7356877187efc242b212eadb840cf7fdb
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch b/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch
new file mode 100644
index 000000000000..2d40a6c1600d
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch
@@ -0,0 +1,118 @@
+https://bugs.gentoo.org/732700
+https://github.com/libproxy/libproxy/issues/127
+
+--- a/libproxy/extension_config.hpp
++++ b/libproxy/extension_config.hpp
+@@ -31,7 +31,7 @@ using namespace libmodman;
+ class DLL_PUBLIC config_extension : public extension<config_extension> {
+ public:
+ 	// Abstract methods
+-	virtual vector<url>      get_config(const url &dst) throw (runtime_error)=0;
++	virtual vector<url>      get_config(const url &dst)=0;
+ 
+ 	// Virtual methods
+ 	virtual string   get_ignore(const url &dst);
+--- a/libproxy/extension_pacrunner.cpp
++++ b/libproxy/extension_pacrunner.cpp
+@@ -30,7 +30,7 @@ pacrunner_extension::~pacrunner_extension() {
+ 	if (this->pr) delete this->pr;
+ }
+ 
+-pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) {
++pacrunner* pacrunner_extension::get(string pac, const url& pacurl) {
+ 	if (this->pr) {
+ 		if (this->last == pac)
+ 			return this->pr;
+--- a/libproxy/extension_pacrunner.hpp
++++ b/libproxy/extension_pacrunner.hpp
+@@ -26,7 +26,7 @@
+ #define PX_PACRUNNER_MODULE_EZ(name, symb, smod) \
+ 	class name ## _pacrunner_extension : public pacrunner_extension { \
+ 	protected: \
+-		virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc) { \
++		virtual pacrunner* create(string pac, const url& pacurl) { \
+ 			return new name ## _pacrunner(pac, pacurl); \
+ 		} \
+ 	}; \
+@@ -41,13 +41,13 @@ class DLL_PUBLIC pacrunner {
+ public:
+ 	pacrunner(string pac, const url& pacurl);
+ 	virtual ~pacrunner() {};
+-	virtual string run(const url& url) throw (bad_alloc)=0;
++	virtual string run(const url& url)=0;
+ };
+ 
+ class DLL_PUBLIC pacrunner_extension : public extension<pacrunner_extension, true> {
+ public:
+ 	// Virtual methods
+-	virtual pacrunner* get(string pac, const url& pacurl) throw (bad_alloc);
++	virtual pacrunner* get(string pac, const url& pacurl);
+ 	virtual ~pacrunner_extension();
+ 
+ 	// Final methods
+@@ -55,7 +55,7 @@ public:
+ 
+ protected:
+ 	// Abstract methods
+-	virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc)=0;
++	virtual pacrunner* create(string pac, const url& pacurl)=0;
+ 
+ private:
+ 	pacrunner* pr;
+--- a/libproxy/modules/config_envvar.cpp
++++ b/libproxy/modules/config_envvar.cpp
+@@ -24,7 +24,7 @@ using namespace libproxy;
+ 
+ class envvar_config_extension : public config_extension {
+ public:
+-	vector<url> get_config(const url &dst) throw (runtime_error) {
++	vector<url> get_config(const url &dst) {
+ 		const char *proxy = NULL;
+                 vector<url> response;
+ 
+--- a/libproxy/modules/config_sysconfig.cpp
++++ b/libproxy/modules/config_sysconfig.cpp
+@@ -124,7 +124,7 @@ public:
+ 	~sysconfig_config_extension() {
+ 	}
+    
+-	vector<url> get_config(const url &dst) throw (runtime_error) {
++	vector<url> get_config(const url &dst) {
+ 		map<string,string>::const_iterator it = _data.find("PROXY_ENABLED");
+ 		vector<url> response;
+ 
+--- a/libproxy/url.cpp
++++ b/libproxy/url.cpp
+@@ -115,7 +115,7 @@ string url::encode(const string &data, const string &valid_reserved) {
+ 	return encoded.str();
+ }
+ 
+-url::url(const string &url) throw(parse_error)
++url::url(const string &url)
+ 	: m_orig(url), m_port(0), m_ips(NULL) {
+ 	size_t idx = 0;
+ 	size_t hier_part_start, hier_part_end;
+@@ -298,7 +298,7 @@ url& url::operator=(const url& url) {
+ 	return *this;
+ }
+ 
+-url& url::operator=(string strurl) throw (parse_error) {
++url& url::operator=(string strurl) {
+ 	url tmp(strurl);
+ 	*this = tmp;
+ 	return *this;
+--- a/libproxy/url.hpp
++++ b/libproxy/url.hpp
+@@ -50,10 +50,10 @@ public:
+ 
+ 	~url();
+ 	url(const url& url);
+-	url(const string& url) throw (parse_error);
++	url(const string& url);
+ 	bool operator==(const url& url) const;
+ 	url& operator=(const url& url);
+-	url& operator=(string url) throw (parse_error);
++	url& operator=(string url);
+ 
+ 	string   get_host()     const;
+ 	sockaddr const* const* get_ips(bool usedns);
diff --git a/net-libs/libproxy/libproxy-0.4.15-r2.ebuild b/net-libs/libproxy/libproxy-0.4.15-r2.ebuild
new file mode 100644
index 000000000000..cbec1147443c
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.15-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic mono-env
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="https://github.com/libproxy/libproxy"
+SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="gnome kde mono networkmanager spidermonkey test webkit"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	mono? ( dev-lang/mono )
+	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
+	spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= )
+	webkit? ( net-libs/webkit-gtk:4 )
+"
+RDEPEND="${DEPEND}
+	kde? ( kde-frameworks/kconfig:5 )
+"
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
+
+PATCHES=(
+	# get-pac-test freezes when run by the ebuild, succeeds when building
+	# manually; virtualx.eclass doesn't help :(
+	"${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
+
+	# https://github.com/libproxy/libproxy/issues/27
+	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
+
+	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+	# https://github.com/libproxy/libproxy/issues/28
+	"${FILESDIR}/${P}-avoid-nm-build-dep.patch"
+
+	# backports from git master:
+	"${FILESDIR}"/${P}-python-3.7.patch # find python-3.7 and 3.8 as well
+	"${FILESDIR}"/${P}-mozjs-52-{1,2}.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DWITH_NATUS=OFF
+		-DWITH_PYTHON2=OFF
+		# WITH_VALA just copies the .vapi file over and needs no deps,
+		# hence always enable it unconditionally
+		-DWITH_VALA=ON
+		-DWITH_WEBKIT=OFF
+		$(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}"/usr/bin/mcs)
+		-DWITH_GNOME3=$(usex gnome)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo OFF)
+		-DWITH_NM=$(usex networkmanager)
+		-DWITH_PERL=OFF # bug 705410, uses reserved target name "test"
+		-DWITH_PYTHON3=OFF # Major issue: https://github.com/libproxy/libproxy/issues/65
+		-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo OFF)
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo OFF)
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_install_all() {
+	doman "${FILESDIR}"/proxy.1
+}
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index b2b3e2541ba7..4d0248cd6699 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5
-EBUILD libpsl-0.21.0.ebuild 1477 BLAKE2B 9daf618050814bc285f0f0d3fffd83df06a3976881f1eb218db49300725e9d975b8cec288915f6a184e59d0c2a1c4079a26ee74067654380deb8c1ada8e20fb6 SHA512 6ba438b27e054eddca44a9d233f39ccb584f8f84791b2e01f21bcec64cb5e127e30c3105a650169bdb6d11d7aa4fde44cc2cd1c87620c684a7d6091ffc2c03e7
-EBUILD libpsl-0.21.1.ebuild 1487 BLAKE2B aaf2af0a6f3dc074fdc859a3dc91961d7a99036701541a01fde1b9c035e6909f7bc922f4e16ae96e5e71ae10e53a3acc4699132644cd60abac77376d5f698331 SHA512 20c55514cbb7d39528cf0607da8d080aee842f4f6c1113b6f06b9bd8bf58d78476e00375c83a7041522d48ab97fe473c3f4b650e014aee8292925fb6672b6a4d
+EBUILD libpsl-0.21.0.ebuild 1479 BLAKE2B 9a2f3c79a72bca40013f4fe6206df6283d52351b9b791168bddbcbf03bf2cabe86a1da3364b557582bac96c8c634961768a06e533a5973ce2ef42dcb4cdb32d9 SHA512 4003dd16406216aea416bef0038d02c177766a7cf1cd41dedf2956584f588bae109ef38187885489ef625d36e32a069721ccc7b2168ae526ab843450ed838a6c
+EBUILD libpsl-0.21.1.ebuild 1489 BLAKE2B 5c329ef46703521cc9cb53f127ed66261e9e42079446296e0c786a9040af4eceb9dcf41adc7f5fa86d16513051b19d1734de0f0f2a7a541dc2e39caec77b638d SHA512 87c7dc05fa2a443272a96153de28da31b23abf8ff5b40d344060d7da9055f18f7e51fdf201b1861b982e9f934a3aee11745073f1e949445f19539cef58b3d0d5
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 8470caabd80a..93e6a6d5a6a5 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{6,7,8})
+PYTHON_COMPAT=(python3_{6,7,8,9})
 inherit multilib-minimal python-any-r1
 
 DESCRIPTION="C library for the Public Suffix List"
diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild
index 16b8ab704fb1..b98b862fb306 100644
--- a/net-libs/libpsl/libpsl-0.21.1.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{6,7,8})
+PYTHON_COMPAT=(python3_{6,7,8,9})
 inherit multilib-minimal python-any-r1
 
 DESCRIPTION="C library for the Public Suffix List"
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 3608f7de40f2..1308584db6a2 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,3 +1,3 @@
 DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd
-EBUILD libsearpc-3.2.0-r1.ebuild 908 BLAKE2B 9841c1821d88c0749e51fc6910bfaa074556bca8ed68ddf7bc52f7a7f922701e3ddacf924bcb4a0a4ea7ba27f34d54131c5c0df3c0dc928a78d95bbeb4c971d0 SHA512 bae790d44c5e66961d226c06b93952db2165df96d449a3e2d3c567f67f501956410c4012488c46428a71d78c83cd028dec051e85c72a385d87920cdd9b708e6d
-MISC metadata.xml 248 BLAKE2B 95ce6c164ee8faf34471896ffcaad9a285d3418dcf763f778c5f58d38f545845c46c87cb3af4f3a8d71c542b127313a909e8f7972c15f930b1fdeffdb660478e SHA512 ffe6a49d28d3659fb952d60aff92836d3d1280f24dc340985d81a5b6600abe5ed8d961bee9ed1188b83be02e547676efcc06689b89ba5484a940a47fe48ed45c
+EBUILD libsearpc-3.2.0-r1.ebuild 916 BLAKE2B b2711f08905c0e4e416736596e38169c4332a786b06b1717a0622a735ce69c1d10cfa496e68a6f74bd6d6b5223c6f70d3d5d0c57f7cdb5fe9e61c53406f25504 SHA512 3b01dffd6a9fc17a8ae2565b4eae1ff83f74fa4f5cbaa6726e5b266558b1a557165b23acac0e39e068258cb8672fc1a00d5ab866d1de9abc59f5259271ee7243
+MISC metadata.xml 449 BLAKE2B 20e3552f9422b0bea67bed6a15bc66dd739931501097697257c75504c1e00084e87786abfa2a2887a6d311c9c9be4c82a6f3c47e989576b072153659e4a4a2ad SHA512 8497980e6954b1a59c8e5e5f3372d3138cc8d842f875b1f6ceab1665708a884beba57f68459c561140c15e056aefbfc80c4aaab19161ed857e144a4973dedc9f
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
index ba693b98ae06..fa8b4f944ac4 100644
--- a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_6)
+PYTHON_COMPAT=(python3_{6,7,8,9})
 
 WANT_AUTOMAKE=1.16
 
diff --git a/net-libs/libsearpc/metadata.xml b/net-libs/libsearpc/metadata.xml
index 86264192f9a4..836248a20a72 100644
--- a/net-libs/libsearpc/metadata.xml
+++ b/net-libs/libsearpc/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@retornaz.com</email>
+		<name>Quentin Retornaz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">haiwen/libsearpc</remote-id>
 	</upstream>
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index a1281f0da813..12f381a11c1d 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 344 BLAKE2B e35cd34f3dcc70bd0d785614f3e90513983c1a84c3c06025a5e207f5a58a8ea8b560cf7bfec4a26b39d1a9a47cd8df6f769ef517c83ae8b6f0cbc6033b22d15d SHA512 34c3fff52a30eb6d6131088fbc2761543718a6cc57abeb75815e9f83ee119a51754eade44c78e1828749b98e3c0942dd17276963951ce72c31246c7902145662
+EBUILD libsignal-protocol-c-2.3.3.ebuild 343 BLAKE2B c061e176adf6b54160bd616dfb2055625cd311fec54240c841601a2853e11b05b36fa1642eb51c4d7cfde8faa5d2425a23fd76c08e3726bb232210917c014cd1 SHA512 8df4113347aa032c912a6e7516f1cbb316b1418c65c57b382593060dbd93efb82957b7354a6cd9a78303a4bbdaf40d233d8dac29c570846c59e33ca1991cc3d2
 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 9c40ea1f66c9..5503aeff7f1e 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"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index 9b6f1936fcaf..71bd9760d2f7 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libsignon-glib-2.1.tar.gz 52440 BLAKE2B edc27f5f09c3f6d05f32ff6b560934dc003072940b44932fd90021511510fb56beaec7f25dd051b3c1d12d10942f292cc906a9fc4b74bb7f2daf8b885f15e644 SHA512 45d8e26263a16b98517cda0fff8e46fb1ffcc4bb833a6364454f120eb9819b48ee04bdb338bf5e9f0b0fe344af5940f35ed56f0765ca3605dead5b3755657dcf
-EBUILD libsignon-glib-2.1.ebuild 1893 BLAKE2B fa1c048403ec4036b0ec82e8ac1a7558ea84e1bf9e1c79ae36ae9f2a7be1b977d9f59ff59c0d66d1239eb09c0b400514085b953462bdfdd8c24770da25be4953 SHA512 c42e272817f6a07e39292c7d44998c6fde7db9b7ad3e6a778881d5b232cda2d440d333f0eea415d630f81a7884cacaf85a998ea6c678b1169b60a5e7eff73ebb
+EBUILD libsignon-glib-2.1.ebuild 1904 BLAKE2B bc65fdc9a362f180a0cbd5d4284894e8cce53ce43da862960b8506de6703302bc0a3bd259d633484c9c0f77759a826d14caa7beabd7d954a403667bb2a48768c SHA512 4ffba69b844d6c1fbf09e3c76e97028f3c61cd98c57d9e8c619118eb757df54855bd88f7a01fdd9f2da97438d84932793fff0f26c757a9224c2f477a5971b870
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
index 33de3ed28b3b..04e74abdd6b8 100644
--- a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit meson python-r1 vala
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
-HOMEPAGE="https://01.org/gsso/"
+HOMEPAGE="https://accounts-sso.gitlab.io/"
 SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index 0179239de116..cb410af82617 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,3 +1,3 @@
 DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
-EBUILD libslirp-4.3.1.ebuild 866 BLAKE2B 8b593217b287c6b0c7145256d20ac2249c1aacd22a6f78d52ecb785b446e2b979459ef2f94ccc94250810f76dcc24cd634b42d9c33f415b7f5dec00ba71e53f3 SHA512 89c0c8c6bed340aacbe107f6d056321da86bb000d1db484ca3f7b74ef5054619372888939e822fcd6ff5e2ab3e0c6a796a49ef830e750f44630f5fcd251e4045
+EBUILD libslirp-4.3.1.ebuild 865 BLAKE2B cf25ff2e27f4220eba664b17cf08f300ee0e83c27a5c314944d0dde730d3dac8ddc8e4a2fa0f20cb90a635d262411f186ddd38b951c148ac54257f7ef2199ac8 SHA512 1e8701efac9726e608f6a42db0420a05be3e9654ac0c44610d6df6be74a1146d65cd32be97af2afba959482995d7fcb2cbd15012e009167fa17eb7282ba66a7a
 MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/libslirp-4.3.1.ebuild b/net-libs/libslirp/libslirp-4.3.1.ebuild
index 09463b75af17..5a87450fae43 100644
--- a/net-libs/libslirp/libslirp-4.3.1.ebuild
+++ b/net-libs/libslirp/libslirp-4.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
+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."
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 34b6b3caa1e6..08ab370ba46d 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,7 +1,5 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
-DIST libssh-0.9.4.tar.xz 500776 BLAKE2B 56b21faac5d24f38c4fe695b31ec879ebab74f7cbfb8b8d336dee37766b7b0802ccac9b02726515ee29d44e18e832cfa322085d5669de1df94e5a428cf9add0f SHA512 38705c19c293ea5e6d286d22eb17021dbe58d88c1e647b699933aa0db9ca1174d43d1ff76c1a1b17bf2cc1a8297ec02f1a67dd9e969676dd69cf6fbdae9bc8d4
 DIST libssh-0.9.5.tar.xz 502876 BLAKE2B 8ea07bf25218563cbbdab31683e679f71298e2c7c9bb2430195e84892838cd55b9025ed292de65c4942ecec7d4037d5b92a414232fca6c8e41821776f4cf815c SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
-EBUILD libssh-0.9.4.ebuild 3190 BLAKE2B 1e427a29c63f83cc1e12d4042c612dba16601ac1e8b9608999ca155c3bd95ce26ec9a9d73736704659548b5b6f8a830a413968753d87c2bcc2853b16b519e117 SHA512 255b96b1a34adf672c7bc1ae27572b3aacb918b607ad7eedbb631c72bc3b2a16dcdd1f4b0761f9e49e65d112224dc4ca768cd4f03e31d585632d0820af29ae24
-EBUILD libssh-0.9.5.ebuild 3195 BLAKE2B 470035a7852d16254fbff4b612325b460a7e72bfd5a7cded651f2dd1c2cd55d4da67cf11365e788f581aee67d71f6f4eb026f948f72a327e6a4cb4b77ce3624d SHA512 c9012b631301863f97e665d317382d3dd1487fcfe7bea3d2cd477a01955d62cfba7334a2add75549cfd89c4a8b573aaa5f2130b63910e602c17701dd842fa00b
+EBUILD libssh-0.9.5.ebuild 3190 BLAKE2B 1e427a29c63f83cc1e12d4042c612dba16601ac1e8b9608999ca155c3bd95ce26ec9a9d73736704659548b5b6f8a830a413968753d87c2bcc2853b16b519e117 SHA512 255b96b1a34adf672c7bc1ae27572b3aacb918b607ad7eedbb631c72bc3b2a16dcdd1f4b0761f9e49e65d112224dc4ca768cd4f03e31d585632d0820af29ae24
 EBUILD libssh-9999.ebuild 3198 BLAKE2B 7c0c30d1201aa21acc97be9d08529232c9e9b075dbe861e37b987307f7cfacb7540b59f99682fe1582b6dde44fea98740c4547cdaeca81c1861ad33a9060c48c SHA512 b2ed19610d62456c42d38544aa58a7ffc48b60ebc6424b6006e1eb3b668d3ed98bf05228c23cea8806bdc92a9bac0f4821fca2a7eb7f182b9489d840a45bc81f
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.4.ebuild b/net-libs/libssh/libssh-0.9.4.ebuild
deleted file mode 100644
index 31c86bf94ce8..000000000000
--- a/net-libs/libssh/libssh-0.9.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -e "/torture_keyfiles/d" \
-		-i tests/unittests/CMakeLists.txt || die
-
-	# disable tests that take too long (bug #677006)
-	if use sparc; then
-		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
-			-i tests/unittests/CMakeLists.txt || die
-	fi
-
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_NACL=OFF
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DBUILD_STATIC_LIB="$(usex static-libs)"
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_install() {
-	cmake_src_install
-	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	use static-libs && dolib.a src/libssh.a
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.9.5.ebuild b/net-libs/libssh/libssh-0.9.5.ebuild
index f8f234b154ac..31c86bf94ce8 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 4a4d51efa594..6fbd90c1d80b 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,6 +1,5 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
-AUX libssh2-1.9.0-libdir.patch 573 BLAKE2B 5464910fdb5a9461ad4ad6e94c0c682bb1106d437a47a035cb107c9dbec6d2d9e89f791b4f7309fdba307b898f229dff8bba5b5af5b8c6af2ca6ddc21d949695 SHA512 5b389312a4b0bdb6d724f54ce9659612b11f86add4b185b10ee4277b641b26c63256264e11225ea5f28775f0ac9367b391fe77470f34851aeca2e3b5e3408446
-DIST libssh2-1.9.0_p20190913.tar.gz 467616 BLAKE2B 2df7569aa118cf339340f32a106a547265a777af5834e0e22d18ac71946747e708c48d3125489b277b5c266d66cb35e7e224425bfc6a9b2e37e5d267fd7792b2 SHA512 0e095770b059b28aebd47a1219873bfe3b6e5775bbee5d526a7b6a287090e474ceac91c03b1b8a619a2a77916a110d8d20db22edc3cbfd1772190fb394a53f8a
-EBUILD libssh2-1.9.0_p20190913.ebuild 1532 BLAKE2B 2ac72fed78fd2d1510ca14872a7063b5ade8dfb575e08c81ad467b0ed30219c34d08cb56a510cb93729edf6e08d06bbb16fd5f2b1ce99316a1c239a8e21b1999 SHA512 e24826c6a106467e144e60786b70a43246bc8d1fb90f1dd49ce74bb5079b55344b490f0346073182f3657ec1f6e2a4ba6240736f7e82d1168d27321ae34db557
+DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871 SHA512 fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d
+EBUILD libssh2-1.9.0_p20200614.ebuild 1492 BLAKE2B b5f394530cdba3400546e3c787b94cbf64f87b3600fdfb83c654c7fd49cd9b14e15e340c92db10fdd4f5d8196a66476533e1502913d57e26edff62a258674778 SHA512 e69128f29f65e750a2ccce48543f4d889135cdd4edb71031dfe57efc17cf146588e7532555bdbe8403263aaea77a26e0046a2a443c25958d8905f7e6b3b22432
 EBUILD libssh2-9999.ebuild 1250 BLAKE2B a76d19e2dfba73b98e161d959b686be14b985b6b9833a88c6eb9700590126b290db4c12ade2eea580051e5811108c72b1ce24329dee4aa6dc0fc51f228165f8c SHA512 c40f416a3913e5f452ef2cf6392989cd7a5b87bfe7d35f36cb8e9750cec67056d22b8a41b16920be182827ec4b64a137dbfc097cbd76f83db8eab062de6edcd4
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch b/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch
deleted file mode 100644
index e04acb0904ba..000000000000
--- a/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -392,7 +392,7 @@
- ## During package installation, install Libssh2Config.cmake
- install(EXPORT Libssh2Config
-   NAMESPACE Libssh2::
--  DESTINATION lib/cmake/libssh2)
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2)
- 
- ## During build, register directly from build tree
- # create Libssh2Config.cmake
-@@ -424,4 +424,4 @@
-   COMPATIBILITY SameMajorVersion)
- install(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/Libssh2ConfigVersion.cmake
--  DESTINATION lib/cmake/libssh2)
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2)
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
index 9850017d5700..edff9820da9c 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-EGIT_COMMIT=336bd86d2ca4030b808d76e56a0387914982e289
+EGIT_COMMIT=6c7769dcc422250d14af1b06fce378b6ee009440
 DESCRIPTION="Library implementing the SSH2 protocol"
 HOMEPAGE="https://www.libssh2.org"
 SRC_URI="https://github.com/libssh2/libssh2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -35,7 +35,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
-	"${FILESDIR}"/${PN}-1.9.0-libdir.patch
 )
 
 multilib_src_configure() {
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index 8543b6bc14d2..d0225badfddd 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,3 +1,8 @@
 DIST libupnpp-0.17.0.tar.gz 475725 BLAKE2B 568ead87791db1a41a4e5f93280cc8560336516cf676e1b64c35d0835579501ba61b75ee41e1dd1e58024d771f6f077c3c85515929be1c059a51ca314756fbfb SHA512 da7ef2453a8fad1e226c6252a84d76bf874128d306d4f9ca53e77e64734d113f3ad6dcd79549b2fe2a3cfab22243b5dceb1b7bd1fffeb512ed996b8fc680667e
-EBUILD libupnpp-0.17.0.ebuild 452 BLAKE2B 55b83c65a1b5bec4a5bca172acde911ae00c91aa6a5e8d44bdef1e6cb52ba3a0a96e6f60addf614e07fa2d998c258e8e4edcc9b65091279f2b189283b51c6664 SHA512 9514fefb30efe8737b99700ba7820e5ac094efd51cb008e576d5b92b7e7b7e7d60fc16ffc83973885fe3c065b5fed60e6d5be2ca3ee33ee6ffcbb5d63c84cb5a
+DIST libupnpp-0.19.4.tar.gz 469296 BLAKE2B e1240446bdd48329138183015445778f89abc575ade64a15c8564d2d3a6992b73c8fe7d0e9e99370f37ea851e65fef0a6b52e0fd274d064a5cdbc65ab2129c2d SHA512 4fda8ef9046d18b39cde4c5c6cfca4284f1f6ad76689cdab5a0d584b9fae17adbfe225542b81b88c62e62b65584dab38211a0606ac02ffd0f12abd13246c040f
+DIST libupnpp-0.20.0.tar.gz 476361 BLAKE2B 23c319e506a073b769437a842db6cd03709d834cb91b9c7626fdd3ff0573c8a654b8de91f180d152885570e42c53fa58e7f1602f932511a89b532340958329b4 SHA512 18b3026e65b3f1ae0b8d61154325e7f89c808fe2281d7d514358298a29152a4b5903f5cad9d8bbe9db34c5f57efe98989efd9d99c0b512197eb4554b3a4ff3cc
+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
 MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/net-libs/libupnpp/libupnpp-0.17.0.ebuild b/net-libs/libupnpp/libupnpp-0.17.0.ebuild
index 711082d6f680..f64ebade3e90 100644
--- a/net-libs/libupnpp/libupnpp-0.17.0.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ KEYWORDS="amd64"
 
 DEPEND="
 	dev-libs/expat
-	net-libs/libupnp:0
+	<=net-libs/libupnp-1.7.0
 	net-misc/curl
 "
 RDEPEND="${DEPEND}"
diff --git a/net-libs/libupnpp/libupnpp-0.19.4.ebuild b/net-libs/libupnpp/libupnpp-0.19.4.ebuild
new file mode 100644
index 000000000000..638dc365a3e3
--- /dev/null
+++ b/net-libs/libupnpp/libupnpp-0.19.4.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"
+
+DEPEND="
+	dev-libs/expat
+	net-libs/libnpupnp
+	net-misc/curl
+"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libupnpp/libupnpp-0.20.0-r1.ebuild b/net-libs/libupnpp/libupnpp-0.20.0-r1.ebuild
new file mode 100644
index 000000000000..2ffca9d9e1bf
--- /dev/null
+++ b/net-libs/libupnpp/libupnpp-0.20.0-r1.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/libupnpp/libupnpp-0.20.0.ebuild b/net-libs/libupnpp/libupnpp-0.20.0.ebuild
new file mode 100644
index 000000000000..638dc365a3e3
--- /dev/null
+++ b/net-libs/libupnpp/libupnpp-0.20.0.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"
+
+DEPEND="
+	dev-libs/expat
+	net-libs/libnpupnp
+	net-misc/curl
+"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index ad3eae368997..c52a67a0d64c 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -2,8 +2,8 @@ AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a44
 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.0.tar.gz 12674490 BLAKE2B 243fdcdef0cd9c36ee8bcf3c75b7467200f4fa1e6178cdbb9cc78d20d1aca533e910c9892560bd5c50c3ff98d783665616ea6d283ee8faae3f569bc526a31f42 SHA512 7748021f8a26e26474ae200f50ec8b59f19e69fbc612bbb31bbca2524e4381b2a7dde605740ac355109c9e34593fb5aee523d581ac64d821a594ffaadc16b1cb
+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 2488 BLAKE2B 9553bcaba9e29503a9476fbd0fa0c80a9362fbe3f8ca3b2bed9584f726c41e200124eb252493116c57ecaa19844e13c44dc31ef94387f9454dd50b3c67106a48 SHA512 ef085e6a3e349cab1cc0f0f5a6b5b755b33b9e0cea1e0aac86af47d723d6fe168b5df37705047e09196e2ee69ead66741d4e77ee1da401cedc23c8f2e1c76733
-EBUILD libwebsockets-4.1.0.ebuild 2332 BLAKE2B 27c8a914051a5286c1355ad666687627d6d0cc228c8a0c41fa1ded22c953b92c949ef6898b60e8af3826f555544a29a4e7ec3011c42e75d3574d89b9261c6ad1 SHA512 f61208d9b228cd6047fe45bdb9ad7c07e587395448c6fcb20a59b8b2de7437cb41df8f0891672898600a587780ef762e319b8968136c64b4f774d59c83375c23
-MISC metadata.xml 1894 BLAKE2B e0ad4c00319acf9e3680273380ccba89cc5cf79c893f53bc4c3e6633f1a35f25a771c0d7f1b3516e162e4606d13d84b6a3f9461fe0c576b8c86e9adad2dd3993 SHA512 1fac29b1da39acea4a90ab64594f6c47c2afd6bcc10b8af1f858af191abdaa69125d11983ef69b98655a4dd6d53a992eedb08a1e8ebee5a8dd81ad6b0a39f71c
+EBUILD libwebsockets-4.0.20.ebuild 2519 BLAKE2B 88c178b4a7ab0704bdb0660274d59488ed14d7e365c92a991f90963789cb4ea6409f3774e710617ae254f3e1a525d255dc66d21b8c30200bf714fe67be422b4d SHA512 d1ec85cf9704f300ec40186226960fde1474a7654b93665025a4b8ee37b17147d95ff7179e276763b3d23f83b6eab7cfbe52c532475023ec8a5af2e838632f91
+EBUILD libwebsockets-4.1.4.ebuild 2368 BLAKE2B 978ddf6ddc319cc93fcc5a22be81475e5dc329d8ea78f103b7a739bab55fab92522205be1da6783cb5142f650b79d7a099ebdcf52345e4960293afe56ca62138 SHA512 48e48e32e3f971dbab4d896121e180c87457b2e41cf483b130eb0b09e699655875d75d38bf42b25f5b085dc3fd702395c2dfb2fa5c49e505a2fa1e14f1718344
+MISC metadata.xml 1662 BLAKE2B ba4299d39ac10860ea908bf83ccf687af48d3e5764b9823a9d1e727390dc53c569d1e824587fb7e586e211e4366c799b1e91efb817fe6495ed0e6ea643e94147 SHA512 722b59c06d1d1810b21852cac65fd6a7a929f280cbdcdfd0ea97285e8bcbf17ad84d00c7d41308deb2d91905ce3d5f3f0cdc8f5f975a4eb7c0b7fefa431becfe
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
index b0d538ff9060..134f80a69943 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
@@ -21,6 +21,7 @@ REQUIRED_USE="
 	generic-sessions? ( smtp sqlite3 )
 	http-proxy? ( client )
 	smtp? ( libuv )
+	socks5? ( client http-proxy )
 	ssl? ( ?? ( libressl mbedtls ) )
 	mbedtls? ( ssl )
 	?? ( libev libevent )
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
index 7ff883e7d82d..30dbd55c5f2f 100644
--- a/net-libs/libwebsockets/libwebsockets-4.1.0.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 ~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"
@@ -21,6 +21,7 @@ REQUIRED_USE="
 	generic-sessions? ( smtp sqlite3 )
 	http-proxy? ( client )
 	smtp? ( libuv )
+	socks5? ( client http-proxy )
 	ssl? ( ?? ( libressl mbedtls ) )
 	mbedtls? ( ssl )
 	?? ( libev libevent )
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 23c9033fcec9..429f0474f146 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -19,7 +19,6 @@
 	</maintainer>
 	<use>
 		<flag name="access-log">Support generating Apache-compatible access logs</flag>
-		<flag name="cgi">Include CGI (spawn process with network-connected stdin/out/err) APIs</flag>
 		<flag name="client">The client part of the library and libwebsockets-test-client</flag>
 		<flag name="generic-sessions">With the Generic Sessions plugin</flag>
 		<flag name="http2">Support the HTTP/2 protocol</flag>
@@ -32,9 +31,7 @@
 		<flag name="peer-limits">Track peers and restrict resources a single peer can allocate</flag>
 		<flag name="server-status">Support json + jscript server monitoring</flag>
 		<flag name="smtp">Provide SMTP support</flag>
-		<flag name="socks5">Allow use of SOCKS5 proxy on client connections</flag>
 		<flag name="sqlite3">Require SQLITE3 support</flag>
-		<flag name="zip">Support serving pre-zipped files</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">warmcat/libwebsockets</remote-id>
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 8cef855d84c1..68cb54d0b576 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,13 +1,5 @@
-DIST mbedtls-2.16.6.tar.gz 2603563 BLAKE2B a4011bb2b7e3eca554cded05c4650fc16b48d86ae1ac7fefe29df6b29e38c1e76c880f082be83759b4dddd96f831a1238c2df41671bd9794b028402b3dd63f60 SHA512 a4c2e70c0cc6b1f1571a9f2ec27ede2620eb1937361599cab0e05b807068397d25695d5cd23931fd0f4cc051de6367c2b6c77f3507ed8b33cd492589c51eebac
-DIST mbedtls-2.16.7.tar.gz 2658294 BLAKE2B cb53ac0c8896ce0dcc2b54edf4964267bf27057fead00f82f15de0ead786efcb4ba7e554e1c06ccb8a0f9fdedd512d94dce74a7a6e093c0a488ef257ded1458a SHA512 57374061ec8ec7cbb745aa08235d17d4566435c7ad861c0a9fdc8957e09c1ea6619f0deb8a22040fa3674d0fab58ca353879eac1388e710c81840a7ae1225b9f
 DIST mbedtls-2.16.8.tar.gz 2662927 BLAKE2B 80dabffe644c792ce8a317629950bee71a2376be8f84de29d5cb92047ee433347e7e91be513d638b2954c0c7b2393eaef81b7d449753efffab25694b8a8b52d5 SHA512 645d58d42594a2b547b904634acc1e7e8583465e075c190183e1179638f05e1f8f5c56561ab172fed8dcec4a1742429663abdfdc25d607410ea64a35fbb22168
-DIST mbedtls-2.22.0.tar.gz 3822997 BLAKE2B 0857479e89f9850f611cb8c946c489f715a83edba88673b874cd3e6530a7f72c48671e02435087a48aa9a550d0901a5fd2990f9b3a4d69edceecf1fa01772ab6 SHA512 391b99a59ed4edf9625e71e610ea71c6cefa4ea1210d306eb595d85f7408d5decf5fc995d4a411698f1536651ee1230b305dd354df15dbeef9469aa6a7980e09
-DIST mbedtls-2.23.0.tar.gz 3877508 BLAKE2B 501aee4ec19d9b52f4c3e56b821a00ff592c28ed188f9f192e83a6cd777428eafdc6b2cba3eef20bff5e1b9dc3abd43fbd4f102529ef920e11663703799f4626 SHA512 c2a04f659bf63522f10f6660c2d196d7f39a057ff5a382734ba3b839f463ead4e5c9bc0d21fb909d56fcd2ee4c711248be14861f388cd383385484d364247634
 DIST mbedtls-2.24.0.tar.gz 3912697 BLAKE2B 4355fb4db90e3d72e73adcd8ee96c7db2809154c08a00c1a3a8a8f8d6360689f17317a6dd3564c85e1fadece1a49f1ce30561ad21faf48a5bab78e223f2cd070 SHA512 5437ea57eb8b8af9446a796876aa2bfe3c59c88f926b1638c7e8a021a8bef9f4bc6cb1b254e7387e2afe095bd27c518060719726bbaf5478582a56c34315cfb8
-EBUILD mbedtls-2.16.6.ebuild 2466 BLAKE2B a385e37e1c506efbd1894af6a8b08643000a1561640c46fa602f29c50f19ac2fef9ff6351070c63ed8d3bce0b57c2804e947670f5d935abd1376edb6a0006d4e SHA512 0ffc68758eb5aeb0223a284308d531cb74b627290133e6ccbd517f14bc2d47fa189b1100f658c7c3998e91dca6e0265e944d27a5501bbb7410318ed408d9a5be
-EBUILD mbedtls-2.16.7-r1.ebuild 2498 BLAKE2B 3bc8c2d29f0b7c6c1e053d9a9580c2f20328308a70cc9e2f3028937de615c3d08f617597133296a006707093829d19c28a613d1e8d57f18d91ef5e4e8d068542 SHA512 36107a890ef9ebb8dde5596bd3d8fd0a660149adca8f8fcea8a0eb733e0422305ad38bdb35afd2e4ae6ec489a1885a37c3e2bf5b11e2de879c50a337d0a6338f
 EBUILD mbedtls-2.16.8.ebuild 2498 BLAKE2B 3bc8c2d29f0b7c6c1e053d9a9580c2f20328308a70cc9e2f3028937de615c3d08f617597133296a006707093829d19c28a613d1e8d57f18d91ef5e4e8d068542 SHA512 36107a890ef9ebb8dde5596bd3d8fd0a660149adca8f8fcea8a0eb733e0422305ad38bdb35afd2e4ae6ec489a1885a37c3e2bf5b11e2de879c50a337d0a6338f
-EBUILD mbedtls-2.22.0-r1.ebuild 2466 BLAKE2B 90da7d7d549d86b4e1d4c8f2ea81cbe1264e3da6feff6f1c6278ca55c66f3ffe877a98b878873466479df551af1cbe87578572ffea7caa7949ba2951b6d4b582 SHA512 cb69ae5bb9eb99cbaa73f51d31fd253566f5d0bfd1bc55ca5abbc61f13ffb0d834ddbc8c8f8915e34bbaafda381c22e9349f8474c2547a6f2546d3762cf111cd
-EBUILD mbedtls-2.23.0-r1.ebuild 2498 BLAKE2B 2e536e115ce4d55d5dd2e7561d7e1c742ae7a085872bad0a26267f1fda01f00d09ba34abf0bde576d516313ec0f8f8af96618610c45adefbb1a059873a8936c1 SHA512 46a61cb276f8fe028d5a7ee341f0063d5d721f1737f8807953586438572678fd83c1cedfb792343d5b648f61a29ed8c38446397d627fd1c89b80ff1f453652fe
 EBUILD mbedtls-2.24.0.ebuild 2498 BLAKE2B 2e536e115ce4d55d5dd2e7561d7e1c742ae7a085872bad0a26267f1fda01f00d09ba34abf0bde576d516313ec0f8f8af96618610c45adefbb1a059873a8936c1 SHA512 46a61cb276f8fe028d5a7ee341f0063d5d721f1737f8807953586438572678fd83c1cedfb792343d5b648f61a29ed8c38446397d627fd1c89b80ff1f453652fe
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.16.6.ebuild b/net-libs/mbedtls/mbedtls-2.16.6.ebuild
deleted file mode 100644
index d62684916aa0..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild b/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
deleted file mode 100644
index 6114da3d948f..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild
deleted file mode 100644
index 447630263d2e..000000000000
--- a/net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
deleted file mode 100644
index d8a0317d15fe..000000000000
--- a/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/5.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index b3af941a3299..dab3a77f6c20 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,3 +1,7 @@
-DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
-EBUILD miniupnpc-2.1.20191224.ebuild 1323 BLAKE2B 28df43609d2274aae43c47ec35fcd5f813ced3935eca25b3f700ae91f0293a1df9fd4f39559fd41296bbc676ed0e263e448c1953fef7dad902379a347d5a1df1 SHA512 465c177828696c55f15983fdb49b330c4f1e6c19c47961f112ca24813a01a2c339f2af0091bd36daa974cd875ec449b4dedf695a10ce4fab318bdacd1cfea6e9
+DIST miniupnpc-2.1.20201016.tar.gz 97682 BLAKE2B 2c98f71ff7262a24a69a9a4af411dbeb58c20ec4181bca8bbdd61c628bf5bd49f7e9b763b73ffb5d3508b5b545a0c918828ead2a376b57b8ea5051cd7b8e9c13 SHA512 d619f7e205cac68137020fab31e8bdaeebd09eeaca5e42e1e03a9e0085a64d635ec896862a488b0d57798d1e6ce96e2ba5652f60c0b8df9fc866eea90baea152
+DIST miniupnpc-2.1.20201016.tar.gz.sig 543 BLAKE2B b8ddcadb58e7b8dc4646ea1ac4e10331fe70a5b9a27902dd5ad09ac306605160b63f2e21d96eda4aa0f77485800cb9c5aa110f215dbe3536a9f6ec1c4a5e9ed9 SHA512 fb7886d4198bd2ae1eeff293152ff509e7ebe6ff0f9b3c20d5824f7ca9f65091a61db2bc0a8ac9fb0449994aba594cff3bf6c556876dbb47d593ecf8b7b26d10
+DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808a516c19d4f99fdb205e20149f27ef495d9f8da09ad3a28656580bfc16d1cf99ef993e41e9600cfe427b4a776d2 SHA512 b5bb674f162cae3d9e0205a9cdf6acc1fb334ab8ac5330be924411a8fd46833fb916d09f947d1e40d05224df7df1ecf6d812037185690e5022287c2024eb183f
+DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
+EBUILD miniupnpc-2.1.20201016.ebuild 1523 BLAKE2B 53a24a8767c864c6b82f54f2822e79b9670f632a872fb10f798af381001ea65d4a7de3f2f11dd8e6c5d82eab943f3b1a69fc7953868b2578fbf33dce0e253114 SHA512 2b60ca7a7b798953a969f28aef2a325175bff279996edc332423a9088f620c295c2879377cae3859244deafd7e9fa5c23cf6c28a487b8725723bff4e330ae061
+EBUILD miniupnpc-2.2.0.ebuild 1532 BLAKE2B f2addd212049fc794f7d63e9d77ccf703bb1943662d475eb5bfd5c3fb9ef29327400d1628ff33eb5e2f280294668dfae6e5a1a6468f5605edf8f702820818376 SHA512 3635df1e464624500593db7ddcbd9744027b4867e17cdb930b36f142f610e5e5c6c6294786bbd57c1792f51a38bb676467f65b3d4d55f0e83cdd925b211b4aa8
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
index 7c74096859fc..939ae17cc4ef 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="UPnP client library and a simple UPnP client"
 HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
 
 LICENSE="BSD"
 SLOT="0/17"
@@ -15,7 +16,11 @@ KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
 src_prepare() {
 	eapply_user
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
new file mode 100644
index 000000000000..9e79fd0ac53e
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 549fc31059bf..a77a6e24acd3 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,23 +1,18 @@
-AUX nDPI-2.2-libcache-include.patch 819 BLAKE2B 5a0698bc19917ebfd737e886937d023e83452bfdd812010e2b2622461ca8eb6758533ecf5c1b01495eab21de72fd7f0608dd826d864336446f893d083b68ed55 SHA512 854b65c5dbdb19bd73040ed12740c945e0f31e50c51a0ebd32c646177043e28eee79e572747fe23580f7c2cca7cf59a22655f084e111bec3e146a4d4b6d941cc
-AUX nDPI-2.8-fix-pkgconfigdir.patch 248 BLAKE2B c5dcef9651cfcaf1a422903d1231584b7a29c07caba193ab016c380f3cf95887c29ba709ccebfd7649d1f6469bb7116b08f1e1fc384c7e3f00c2e2ae621a3934 SHA512 b461d43ba5673310b4dc0bc37ae772dc1940c5817a6d3817bdab6e6e4a4c86d9797163f458f07417aa3b707253bcc50428b021b6e042f52480597789b92ceffb
-AUX nDPI-2.8-relative-sym.patch 618 BLAKE2B 09a859edccfea2816bdb62e68fff04f11c414a39f6237f1a4606fd88761bb38462fde9ac042352bcccb49b5da713d6f18388e7ec8d4d9a9a351caa4966ac46a8 SHA512 bede4effffd351a2bfe87251ea512c0688f97b89a344f2a91ee0860a74e67535fb611ec11c162f91dd6d612e4a268ac2f551083e790e992f38f1e3173cbc4fc8
 AUX nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch 1041 BLAKE2B a513bcff2b9efb52a61e843c8f5d28558786db6dd3f38fc53d1c7461199ef5bfd81a4d30eb5c1279ef36979f585135c9511e4f59f93b015411cc3084fe1a7a75 SHA512 42f5efd626946ff7825be47ba9b2729216342213a1e886eb969f27a9c3757db1ac788d03592240156386c201de7457e1366df37a838da582b4f2afbc07f4f7a5
 AUX nDPI-3.2-0001-Added-fix-for-serialization-loop.patch 916 BLAKE2B 85c6f19146c2eb5b50fd524f6584566d9abe81e55b2c5d108f0022577201170ac48ee9f3240935416988cb37df90efeb12e38bc46b9428bd946da7c463d748bb SHA512 430881fcec23252aca4de4786b16abbc6845d879872560b268dcd6c5dc36b8d4f6ae6888103efcc7d4e4dd91f00c3e3e10dcf52ae5811b97e3877605ede41968
 AUX nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch 2643 BLAKE2B be3d1a9bd632d4b1837d22248af94179debd48e4c99715553839f1f630cd0aec2ce345953d8f8fa1d01c682b6a466f565e850343541bf3a1a92d49a55d912d5b SHA512 41d849d2a1e204c82779896f5561cdc20ed1a4aa62391255bf7ef862589e1260ddd77bb44c6a9462cb3cc80d9de0aca731c8f78e3c06ca69dbead66a09b26018
 AUX nDPI-3.2-0003-Fixed-invalid-allocation.patch 794 BLAKE2B 3f8814e0c836dd0d2f05f5516154c43624a9b9cbf4a24f63a47334e808cc9e28fdc3c51d31f743dfb62fc8ca13187ed21e66122d50a03fd4d6bdaff85f49069d SHA512 2b20d6b92497dd23f72d2c486f32b749dc2e2b86547443629b57dc00aa163155eebef2d5ea123386f257a582e437f886787421ce2232be0f7d35853b6997cd4d
 AUX nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch 6861 BLAKE2B a5e3c17b895167da57ec472444bb5933eca44120c4281a455e494c1ab62806619f3eb860ba1deaded8049a03c4953d2c4c8951187c1aabddfc3ae7d5e8bebc95 SHA512 173ff8a9568cf2e56e0ea1a271de0090f02fd2a0bc17be6e02b1bfed0327ddc78014fbe6f2fc5850eb5a2141f133cdc70f2ce614ff5f6e820cb577cfdb8d5513
 AUX nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch 1063 BLAKE2B 75774a72b8d9b6814cf5a7b9f68bdabd07ec1703805807f6e4c46bc1392d0044b7513019e35a04b0209bcc34088bdb49b98f1c6eba72162a7c5665d14c3397a2 SHA512 68f17871e32de9abb1f5fa1e73d5ffbf29e906ee8088d28c764d140833c64ab41ec1fe97f0b8a6d5ccdc65c9f7beac31500508303f74dedf5ab84327a2a56c86
-DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
-DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
-DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
+AUX nDPI-3.4-configure-fail-libcap.patch 911 BLAKE2B 6f376334d7c53a2a6c6a0e5babea2c6e2c1c744159b9113e5346e4fd312e42487655f728ca838d32e26a681287b795f0f9236fc70db9f626dbf1526e4c654bcf SHA512 638a1c0a791459f8cdcbdcc71ff16eee8ca43a1d1fd4346b61f30b127b5bd5047f7bf86c87c23784001588b029e35a633bd73423066839bffac754162a86f4bd
+AUX nDPI-3.4-fix-oob-in-kerberos-dissector.patch 882 BLAKE2B 189f3bbd5b209d7b7ea8d1febd06901dea20acc7153fc8ece674f7f67c2217e946ae519af77b9553e8938f7bd90e7c56e1c68849c78726f828d0fec9cbf80f86 SHA512 1aa8201959872163cc4864745149700982ef0188e4a341b0a33e9eb0b1afdf5d9dc244fad070b32ceb0fce7b9dc42622cd4e7a327a42ff24e10ce0211d3da984
 DIST nDPI-3.0.tar.gz 26902734 BLAKE2B 79380ce5138b8ba99169ce3a2afeaa2a2bcded9bc7834d32af6911e9cee60395613a390d2d5d0530b9ff9263ad707e78f49d35098428c66a9c95a98aee2d8df8 SHA512 74c4a41201e809b476f4c23b99c2391b7bcbc76507a11261d216caf2350db8fd4ae3dac69d1d2179b12217901da1e04676aeca05d3a8e63d1a162469b33ab4c0
 DIST nDPI-3.2.tar.gz 29586049 BLAKE2B 4ea7f1cf39b5363b724c2db84c006de2f0e05ea275586241c3e1b9a53681f1da83dc752e69d379d6b8c8bcf8b15b146e8a2de127931d3b2061112aef297f7d79 SHA512 bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
-EBUILD nDPI-2.0.ebuild 636 BLAKE2B 0fe243e30b94361eba3ede095dd9fb811a71067ce3a46e00ea437daece431e42a3f72665e918c497254bd99f092aca381bb6f870180a30a8008e5c22eed1099f SHA512 8b4c2650841a748683fb4ee4bee41c999a9c0cd60c92cf0160577f5f1d8fbede979e5e02f0e3c60f78c010661826993c804a9e07a23fd6042baee89ed259683e
-EBUILD nDPI-2.2.ebuild 1013 BLAKE2B 4e5423411ded7c631b27615da56f8b1cd55ad0f66847f78aaf26348de286e0ab9436f9369ad1f5a1a0b24edca6dab921cdfb88bbde3d9078add58ff251109bf7 SHA512 ba79f9c582c89d86bc26998958de455f0ebdc30a96bb5bea46e6f24c099288a0e6485b53bee801bf4d5c7430700cfbfd54791c722dd70851af87a81bbb786ab3
-EBUILD nDPI-2.8.ebuild 1073 BLAKE2B 62465dfb22f70d24ba4947d7005ffebe89b930336c7ba1dd651649840b39245cd470e72c16c5ca46393bc28120d52315a0685249e7a2aa7f04ded86798b69e62 SHA512 dcf8abb346221acf640f858165a5049522c20ce7919466e733f34839c943b487e9beba309e73f7ee1b7a89ffa3b95115e4c7eb51f48cb42e4c7b5430017ccbe9
+DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
 EBUILD nDPI-3.0-r1.ebuild 966 BLAKE2B c0b61a5243af862d1373a734ba8f0ffe8f95c40bb0ffac40dc72b1bca0a704eece2893d4c8d876744ee298a05243b21490f89218d9c493f7cdcd4ae4c3da2527 SHA512 8f0e6004fea392c1573477976b83de81e2bb3467bbcf4ffa18817f79c5b1cca00a6c35fbeccc753e41edbf7a8d15d1dd74bd68bd2af9d4726265c60bf8a3ebbe
 EBUILD nDPI-3.0-r2.ebuild 1176 BLAKE2B 57e01bdf62c55c2c69f1bd64599a1838eb050371ac0f18e5beca7d453840e1abee0aea3cce222ce044fb7f9a084e5030459164eac680af892b897fdc8f1c1d10 SHA512 c82c47552699b3feaff9e2007fa357c0eded3175b28fa5817d64c35283fed2e9ed7499a5ac0944664243a859fcee4e41db0d1382eb8c0cd52bafec3388702724
 EBUILD nDPI-3.2-r1.ebuild 1750 BLAKE2B efc6ab0d48a8d5db4237d1f8b59705c9e489cfc2fafd431339c9a2c7a90ae3e9a28c9ea17313f34ed1912f93be7c9d32ce2528ee40960fbf354e6fc807b3ab2b SHA512 cc1662b4a436d51e586ebc67b4c4c88440e85203586a2fddfcb6c9d6593969665a6890b4b6211e717b4bbf4cd80230834af0a1dd1a8f1c14e6df63799f0c507e
 EBUILD nDPI-3.2-r2.ebuild 1816 BLAKE2B 1ff85ae67f95fc476ee4ec7c72d68b22f5bc559ac4e791297b3daff664f7fc2c85a8e432f69e6d7e107accc5dea99183600233f65bd2f641decd40d69697208a SHA512 a014ffa4d3507fa55fadf149b832a1f02adbb3ce8b148b24c46cec186a680f2c04c7a79b78c4e5cdddbf13d3e9be68acbadd428c15a07c185e389375e6792028
+EBUILD nDPI-3.4.ebuild 1542 BLAKE2B c33be0c27e0521e4b75b10a0fd49b8f208120fff45653c9f9da4f8320c7d31b25df5374e33fb8517551bdda081029eb14e5db2278fdaa1c6ab28ed45e13ce9de SHA512 e3825dab00f2e399df07f6753f2e53900d5caaf9f41da325f30ee4c2ed7669f08278b2b96e12c06fad6057eae4587c909de3222b50982f63afb26cec7e206e11
 EBUILD nDPI-9999.ebuild 1293 BLAKE2B d69406384a02ff5fa67aabcf6d97183b362b4fcf7bfb06fa4ba95e53469007305e197459e9250b4be800a89506a3542df3abf07ab60aef3d9aab93bcca5daa0d SHA512 6def195805ee8aff6339bb0a38a098048a95391b6aeed6319946d550e79aac36251d23d4401854b043e7f46003490d15736b67b1c3af044ffcc11b939bc38ff3
 MISC metadata.xml 292 BLAKE2B 387a2816be3615c7a1430ca3888546eecd1b5c679805b87cf7975cf7d4b59a224c8edea34ca354b8bf4d793457531f6388816cdf86641fcc3f6df89432848b46 SHA512 488fc61860f278d9f7be4a6cd246eb45bac7efafe57e777f1c46984a07f132a76dcca6170b4876edea4d720f4696549b85989ae012749a00d234a0137b98ec6f
diff --git a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
deleted file mode 100644
index 44d78e99f327..000000000000
--- a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/include/Makefile.am
-+++ b/src/include/Makefile.am
-@@ -7,4 +7,5 @@
- 		ndpi_protocol_ids.h \
- 		ndpi_protocols.h \
- 		ndpi_win32.h \
--		ndpi_includes.h
-+		ndpi_includes.h \
-+		libcache.h
---- a/src/include/ndpi_typedefs.h
-+++ b/src/include/ndpi_typedefs.h
-@@ -25,7 +25,7 @@
- #define __NDPI_TYPEDEFS_H__
- 
- #include "ndpi_define.h"
--#include "../lib/third_party/include/libcache.h"
-+#include "libcache.h"
- 
- #define BT_ANNOUNCE
- #define SNAP_EXT
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -12,7 +12,8 @@
- 			     ../include/ndpi_includes.h \
- 			     ../include/ndpi_protocol_ids.h \
- 			     ../include/ndpi_protocols.h \
--			     ../include/ndpi_typedefs.h
-+			     ../include/ndpi_typedefs.h \
-+			     ../include/libcache.h
- 
- libndpi_la_SOURCES = ndpi_content_match.c.inc \
- 		     ndpi_main.c \
diff --git a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
deleted file mode 100644
index f6f805bbeeb1..000000000000
--- a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = src/lib example tests
- 
--pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libndpi.pc
- 
- EXTRA_DIST = autogen.sh
diff --git a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
deleted file mode 100644
index 6a0230d65599..000000000000
--- a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/lib/Makefile.in
-+++ b/src/lib/Makefile.in
-@@ -61,7 +61,7 @@
- install: $(NDPI_LIBS)
- 	mkdir -p $(DESTDIR)$(libdir)
- 	cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
--	ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
--	ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
-+	ln -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
-+	ln -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
- 	mkdir -p $(DESTDIR)$(includedir)
- 	cp ../include/*.h $(DESTDIR)$(includedir)
diff --git a/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch b/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch
new file mode 100644
index 000000000000..7ae5a04d4e8c
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch
@@ -0,0 +1,19 @@
+Ensure that we fail if libpcap can't be detected, rather than exiting with a success return code.
+--- a/configure.seed
++++ b/configure.seed
+@@ -126,12 +126,9 @@ case "$host" in
+          AC_CHECK_LIB([dl], [dlopen, dlsym],   [DL_LIB="-ldl"],[AC_CHECK_LIB([c], [dlopen, dlsym], [DL_LIB="-lc"],[AC_MSG_ERROR([unable to find the dlopen(), dlsym() functions]) ]) ])
+       else
+          AC_CHECK_LIB([pcap], [pcap_open_live], [PCAP_LIB="-lpcap"])
+-	 if test $ac_cv_lib_pcap_pcap_open_live = "no"; then :
+-            echo ""
+-            echo "ERROR: Missing libpcap(-dev) library required to compile the example application"
+-            echo "ERROR: Please install it and try again"
+-            exit
+-	 fi
++         if test $ac_cv_lib_pcap_pcap_open_live = "no"; then :
++            AC_MSG_ERROR([Cannot find libpcap which is required to compile the example application])
++         fi
+       fi
+       ;;
+ esac
diff --git a/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch b/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch
new file mode 100644
index 000000000000..7e8f381cdeab
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch
@@ -0,0 +1,16 @@
+Sourced from https://github.com/gentoo/gentoo/commit/c02681fcb7839ac1829ec09394334ddbca1b0aea
+
+diff --git a/src/lib/protocols/kerberos.c b/src/lib/protocols/kerberos.c
+index fa0ab6cb..32319668 100644
+--- a/src/lib/protocols/kerberos.c
++++ b/src/lib/protocols/kerberos.c
+@@ -189,7 +189,8 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct,
+ 
+ 	      body_offset = koffsetp + 1 + pad_len;
+ 
+-	      for(i=0; i<10; i++) if(body_offset<packet->payload_packet_len && packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
++	      for(i=0; i<10 && body_offset < packet->payload_packet_len; i++)
++  	        if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
+ #ifdef KERBEROS_DEBUG
+ 	      printf("body_offset=%u [%02X %02X] [byte 0 must be 0x05]\n", body_offset, packet->payload[body_offset], packet->payload[body_offset+1]);
+ #endif
diff --git a/net-libs/nDPI/nDPI-2.0.ebuild b/net-libs/nDPI/nDPI-2.0.ebuild
deleted file mode 100644
index 4ab5cd458c2a..000000000000
--- a/net-libs/nDPI/nDPI-2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/json-c:=
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-	fi
-	prune_libtool_files
-}
diff --git a/net-libs/nDPI/nDPI-2.2.ebuild b/net-libs/nDPI/nDPI-2.2.ebuild
deleted file mode 100644
index d1934b2381d4..000000000000
--- a/net-libs/nDPI/nDPI-2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune multilib versionator
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/json-c:=
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
-
-	mv "${S}/src/lib/third_party/include/libcache.h" "${S}/src/include"
-	epatch "${FILESDIR}/${P}-libcache-include.patch"
-
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-	fi
-	prune_libtool_files
-}
diff --git a/net-libs/nDPI/nDPI-2.8.ebuild b/net-libs/nDPI/nDPI-2.8.ebuild
deleted file mode 100644
index 1412a46256d6..000000000000
--- a/net-libs/nDPI/nDPI-2.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib versionator
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="http://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/json-c:=
-		net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
-
-	sed -i "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" src/lib/Makefile.in || die
-
-	epatch "${FILESDIR}/${P}-fix-pkgconfigdir.patch"
-	epatch "${FILESDIR}/${P}-relative-sym.patch"
-
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-	fi
-}
diff --git a/net-libs/nDPI/nDPI-3.4.ebuild b/net-libs/nDPI/nDPI-3.4.ebuild
new file mode 100644
index 000000000000..cb053734cf39
--- /dev/null
+++ b/net-libs/nDPI/nDPI-3.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/json-c:=
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4-fix-oob-in-kerberos-dissector.patch"
+	"${FILESDIR}/${PN}-3.4-configure-fail-libcap.patch"
+)
+
+src_prepare() {
+	eval $(grep '^NDPI_MAJOR=' autogen.sh)
+	eval $(grep '^NDPI_MINOR=' autogen.sh)
+	eval $(grep '^NDPI_PATCH=' autogen.sh)
+	NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
+
+	default
+
+	sed \
+		-e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
+		-e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
+		-e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
+		-e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
+		-e "s/@FUZZY@//g" \
+		< "${S}/configure.seed" \
+		> "${S}/configure.ac" || die
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	eautoreconf
+
+	# Taken from autogen.sh (bug #704074):
+	sed -i \
+		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
+		-e "s/#define VERSION/#define NDPI_VERSION/g" \
+		configure || die
+}
+
+src_install() {
+	default
+	rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+}
+
+src_test() {
+	pushd tests || die
+	./do.sh || die "Failed tests"
+	./do-unit.sh || die "Failed tests"
+	popd || die
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 15340824fd38..64b2c89d9e9a 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,4 +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 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
 EBUILD nghttp2-9999.ebuild 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
 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
new file mode 100644
index 000000000000..b43a0d325068
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	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"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index a8cbf035daef..f6794d839551 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,20 +1,20 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
-AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204
-AUX nodejs-13.8.0-paxmarking.patch 4213 BLAKE2B 4235139400e33fbc0e9f9f965953ed1603283d86cea879b5bb67c60686b45ee26237970a13466d2f5392ee463660b318e53061701f916c4f2f2cc15756f21444 SHA512 c738c9ab15b0ce9b2356827a63d2d35eb1ddf9441b4fc7e9e3e07ed30bf7a6eec680cb3901ab8de6ca9a9377e6a04a520b6a88a08ff5cb2673ed50ae737e066d
+AUX nodejs-13.2.0-paxmarking.patch 2710 BLAKE2B 9e63761ce7160434f7f9e5ef76ffd4d0fd61deb24cacd9ac4736bcc74145090d730c6b1d0a60cf9c815a08f22c7925e0719dae835a0ede0b65bb8af53418e016 SHA512 e5aae8fd9758fc1dbfc77f9dbfb62b90941a4b2e9e06a6d70f47aa6462d120e61a1774ba8526b2033161195040326d1b5ad643a816552154ff69a8e2548b3d70
+AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23
+AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396
+AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
-DIST node-v12.18.4.tar.xz 23679924 BLAKE2B 14de3c83851b89f85f7d6f549d9e43e3e97c7a84de94eef8c3a2789e960595749726b8039fdff1be822377355ede2bb95bba4fd1d17c3e5165c844a80eb32e53 SHA512 07101a9acc8dee5189f8484746715b57d4227d819e38a79c100da33f803b0f061e7b37fbd4114ce2bc3eea647726f8786880d3096dfab187c177679f3e1c78e8
-DIST node-v14.11.0.tar.xz 33379456 BLAKE2B 99e2eba4ba2e54209836fa1e3b63e42caf854d7f3bc99f5836300b0795ef8c785b78bd7c6b99148604f0bb1b34a5169c72e8be0f8d4f62412e7d352fce15ca18 SHA512 5014ebaeb109b0ecaca8f795a4e1a626c03b1132f9b8bac8826b734633c14e9f99b4f079c185a1f43f6938a1e543e5838f520159c3e08ca454398039fd26ef11
-DIST node-v14.12.0.tar.xz 33390472 BLAKE2B 930b196ada16d21e2d2b43d030d936391e039cc985ee517b6b420277baa071ecef8c8cef7bd2f24b5e167465e9d4acc6b0da36ae4e7332fe179c47724e05ff50 SHA512 168141a3e3f20be98a0e800a8e8f70e1ff330ff087cc08c31d6ae185882615723166f445d6310a23e1bb5a023e671a74834b40e1b83f2b789f65c787c18762e2
-DIST node-v14.13.0.tar.xz 33418156 BLAKE2B 8a986a467b77485fbe2bc9d580c48ae72536d6d62c826319b787d2937c86358787ae452676b69df608adb9d9754f4cd068b729614989a4f2a93973380c4929d1 SHA512 7a75bff501520afbe15d6ceea4b4507717111c87cf03de47047af790df2e2e9d71da9501c7256d5dd9f58616c3d04db2e74401dfbcbd72abbd0c81778a588893
-DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2
-DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3
-EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c
-EBUILD nodejs-12.18.4-r1.ebuild 6244 BLAKE2B fbac13ab6399a3dcdd076939e71f0f0482a9545e38d4d0536eb77a190a0115741c3bfee93a1a728ba789c98cbac5feaa4b638bbf5f74daadb9c37d66442c2f1b SHA512 b07a1468fa22fcf8f61edb26da10c448e89b9a1b33ca4e3fe2161f78bcf2069adaa6a1adf5e11ec2be9b46ebb8150da3dee3a69c93cb58cd8eb522a282d03463
-EBUILD nodejs-14.11.0.ebuild 5862 BLAKE2B dd587e60d5d2d7e7d3ea038bd810c53fa59965fce3256efaba3e1b11d45b10b51900494731f1b910e9ca1221fbb88d311ad10ceb36ccbfee00c4d0133ee7c277 SHA512 1e374d48b8198db55824e4267119fd997cefb9271319d098c8d0b755a52de06658a106db2cccac90481abf461d9caacc6554a829140a75488dad41635120029b
-EBUILD nodejs-14.12.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
-EBUILD nodejs-14.13.0-r1.ebuild 5913 BLAKE2B 25d3dd8ec6945dfe1a82914c2802ef3b7cf17614b8a43a81a5497b278094d256f35ce58cf159e1cc4da6abf8c6156f16a2e305a2335a72ef2de2ad80ce0dd219 SHA512 a0dc22fe39b2f3597bf7631d2de7af71a5a7b7dc4008a879be7a6d95aad3d709c1b8d39034fa2d819b91d199fe38da81c6a9c5b0c907e132fd94affe830ac6ee
-EBUILD nodejs-14.2.0.ebuild 5854 BLAKE2B b738a893013811417c3dfbc5b9a51541193c2152f60b2ea8989e59f51788be98580e3f300dcb752a89196bd1dced51bb577e63cc60ac25194bc00a3c00818524 SHA512 9f4403626435df54d28a0f0f20e10d1f90f601e9330ac6b94a4717bbd851caeb85db260c3b1967ca66778db29098056cf7641de4840976efaa38bf853083f5e8
-EBUILD nodejs-14.4.0.ebuild 5860 BLAKE2B 668d26dfe8d4c274274851f8b96e8d77dc69205dccdce38b188776ec3f72488f92790f4132a0e3da624b20a52763a67b50bf0b73804339b6a6713e4de23a5dfe SHA512 054656d522edaa005c1cf3efedf29c0cbcbd41ea2ee94aa7000b87b219ececaf4e2d0dc53f728a945b0028fcaac9c38467327f48c23e4d360c2a69a40e7bb7ba
-EBUILD nodejs-99999999.ebuild 5831 BLAKE2B ef49eabae7f794181094dd99639b59432651af166560b99f24e4a2105cdd54e92270551f60d1372f1ef03a2fb188eaeff547a08b61fc9bbf82384cbd0202b193 SHA512 64a233490cb20b53a2cffa1aa0f83793392ecef2d56a09b7665f5f02216ea09f61d3b3ba539ab4ec4e6b21e6534ecba5465c47ccf0c5bbc40c6eddc455a35f47
-MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
+DIST node-v12.19.1.tar.xz 23829692 BLAKE2B 244ca8ef29e315ce027638d9d5c66469ac8cd69abec47d5bf6370b990da0d9d2a7af812963530e5187d273d3f20638be0d23ccb1c0409fbbd678677740939f4f SHA512 7c628ca214d3b17b34658aae32e335ce863d90853c92f1cd4119e9a82b7097ddf47d0d4cc7c9bbdbfdd4b403811aa6ee08e844078a947f31a3adc78f569b931a
+DIST node-v12.20.0.tar.xz 23868796 BLAKE2B 80df641bebb3f89002ce260874adfbbd60c92eda50d28396441d7429b7bc0474fd141393c9756cd8d49c7904ea47048740c1e21071d07d083490c1b3755f27f7 SHA512 b0eb66ad64f727c8f3a0b34cadebb904afeb04709de20b2808c6a91980e079402f17e1fc8fa9ed870262508788f78e0eb5891e99aac57a9c41b92c70384bd7e0
+DIST node-v14.15.0.tar.xz 33440584 BLAKE2B dda9fb44f163b2268db126dfcda34e80064eba24921e4f8e6c14c212deb9170c79f31f7b2be272c8fa7ca992d14540df490c6cad078833514bd348825934ad95 SHA512 2a0cd1b9d95e0ac228a90aca82cb04b9f4fc4d08ab86f0286eed7a519ca6e756081b37375ad5d14d7f0e09affdd27bad658c3e364237eb3c212fe5b5e27af96e
+DIST node-v14.15.1.tar.xz 33437304 BLAKE2B f08251d2a76e4030433001fd7f062c71193de190036d1147ade0ea36350df0d65df9e1b749fbac77837dd090cbeda6c133ff88099691c932bc29e75b7bfa2acc SHA512 cbab757e370a09b73c29a9bcb310b4122e4424d6baeaeaf1b10919ed6b348bc6ddbfc0e0eaff99d8ebb4d3d74f0206f575e2656245151eda564dd2cd33ff823a
+DIST node-v15.2.1.tar.xz 33172472 BLAKE2B d63dbc138ec161253f996fb61c9f40db2eabb5a598804eca7f2446b654ae8a11164820d46ea3c2b41b6a891bb0a3f15fe67712988ed67c1344ab72e2e4749fac SHA512 b05663131d6bb458fe49cf610a7296cdd169b6e957df3e5117ad5553de9891ed4cb71c7d3dc0dbb7774153c884cf245f49faecfa308736086fe6f041f83c8a57
+DIST node-v15.3.0.tar.xz 33198460 BLAKE2B e88db9556e13b0df8f8e78a9b2673c9f1cd9445ea9d71b6cb9e674bfcdddad0ddd564d3c1323dff51e68c47f16eda3dc78cb303a3a7f6da341d0c51081bb965f SHA512 77408b49385cbf1cf168409b1eaf1d12caa97ad6c1106e99abc05e2665ea3ca6447552cfabe0cf43e90db80ecadf14ff4d9923ef34b854e70976a6fd0130d6b7
+EBUILD nodejs-12.19.1.ebuild 6297 BLAKE2B 253ee1f6fc802aeaf3b7963a743f6d5fd3655770794926bdb4d10ae088a6c0a13d61040516d2db3e3d53bcc3bb86c700a9af5790a15d0d1f9fc350be14022880 SHA512 eff8bcf765348fdd3b6a820c1a07f839a248e75e78c691caf969b42d1b92ca231ded21c41a22a56455b384c74e49c15494b8fe7c5e5d3f57258133ad147d6477
+EBUILD nodejs-12.20.0.ebuild 6301 BLAKE2B 8c00d439d226b3b5238c46fb96b92543c13fb320419e5d72a54deb3c36f921d451ca7909af877c90a238e6f61178db0b53cec83a5b61527a979393011d0f2dc4 SHA512 1503bb062d31347bff777f9b8685bd21a1416ce0bfc27e0dcf2db1c6c71f3d5cd22de1ec7d2a191895bbfcaf83f4002ce70b1ec0e551f97850d7df07f777bb50
+EBUILD nodejs-14.15.0.ebuild 5810 BLAKE2B 6690886bb45d826a0cd2c5a972fffd2d068aa6be081a46d3071835079cc9f48d9bc6d2c3d79a63d054debca9923c373aed99fe2cf1bdf95415db4602b44f5f75 SHA512 e7a34cae3c0058164d12853b95b912972f890ad24507164237ab54731cac04c3579240b1307716a70e0cbbda667b23342b58466152d577e99bae6d803899a12b
+EBUILD nodejs-14.15.1.ebuild 6047 BLAKE2B 29004ae6fb9ed1a35084812e8b0b0470b6aa9a8bf77e2d64f55634b657c935530eca2439386d9b31db1e5771df1cba12edf71ba82a6b4f5ef74f77438da8ff9c SHA512 699a8ce157eaefdbcc7080416cee5d699b1cfd619ee6c45582335eaa1f180c89fd9e881dfc1cbcb816e5f08f54b7522b1c674d90117742f88a3fea0186ffb37b
+EBUILD nodejs-15.2.1.ebuild 5676 BLAKE2B ee5597bff165760d91ed4abaf1ac46b2e4fa736fda747488f7f5cbd40761a1a78a78f07071451f4e749928ef09cc9e958e677c20b9c7b7b7108615b0d7002866 SHA512 4e3fb131d552e8e3fe67999d819b89a2f594534da85cd006bc832f0ab5ba7a5cb05a8b4c0ddeba757aff894f3842d4048be5044a550d982427c711881e4d8419
+EBUILD nodejs-15.3.0.ebuild 5676 BLAKE2B ee5597bff165760d91ed4abaf1ac46b2e4fa736fda747488f7f5cbd40761a1a78a78f07071451f4e749928ef09cc9e958e677c20b9c7b7b7108615b0d7002866 SHA512 4e3fb131d552e8e3fe67999d819b89a2f594534da85cd006bc832f0ab5ba7a5cb05a8b4c0ddeba757aff894f3842d4048be5044a550d982427c711881e4d8419
+EBUILD nodejs-99999999.ebuild 5811 BLAKE2B fa5f65bf9b29b39fab93459a01774b5237e185af99af95f0e0c51e6b282d158ee01701e216eafecd74849f991ebc4858cf527405d1e39fea1da69f19e68ac2ba SHA512 0d7f317b4fa2ecc450dd2c12ccad524be2a20ca255953b64eb012e46333b940baa3dc652353825fc7444834d8be17a33681c7d63f1d1f008fa0ab5d99f95c501
+MISC metadata.xml 940 BLAKE2B c1a7dbc678f50529afe12abaa96e87bd065d1bdb88e6ca4d7d58373b282a5d6c6920e43623ce71bc83affb54cc323e6d24df8841dce8001e1cb598dd96b0d4a4 SHA512 87c823b94b22026cbf333671f6d28928de66c5aee29fbe0d9773c4c35415ffc3f7e31559530cfda4f4f2a0a9dcb4964e0c3304c002182c4c17de785e842c0fee
diff --git a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
index 143e41662724..1061255e1637 100644
--- a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
+++ b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
@@ -4,7 +4,7 @@
     Reported-by: Attila Tóth <atoth@atoth.sote.hu>
     Co-developed-by: Attila Tóth <atoth@atoth.sote.hu>
     Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-    
+
 --- a/node.gyp	2019-10-23 11:52:41.000000000 +0200
 +++ a/node.gyp	2019-11-12 20:58:43.957881862 +0100
 @@ -233,7 +233,9 @@
diff --git a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
index c29825df3cf6..8dbf5f43d486 100644
--- a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
+++ b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch
@@ -4,7 +4,7 @@
     Reported-by: Attila Tóth <atoth@atoth.sote.hu>
     Co-developed-by: Attila Tóth <atoth@atoth.sote.hu>
     Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-    
+
 --- a/node.gyp	2019-10-23 11:52:41.000000000 +0200
 +++ b/node.gyp	2019-11-12 20:58:43.957881862 +0100
 @@ -233,7 +233,9 @@
diff --git a/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch b/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch
new file mode 100644
index 000000000000..c9c01843cd63
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch
@@ -0,0 +1,33 @@
+--- a/deps/v8/src/compiler/backend/instruction-selector.cc
++++ b/deps/v8/src/compiler/backend/instruction-selector.cc
+@@ -2808,7 +2808,7 @@
+   switch (call_descriptor->kind()) {
+     case CallDescriptor::kCallAddress: {
+       int misc_field = static_cast<int>(call_descriptor->ParameterCount());
+-#if defined(_AIX)
++#if ABI_USES_FUNCTION_DESCRIPTORS
+       // Highest misc_field bit is used on AIX to indicate if a CFunction call
+       // has function descriptor or not.
+       if (!call_descriptor->NoFunctionDescriptor()) {
+--- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
++++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
+@@ -1039,7 +1039,7 @@
+           linkage()->GetIncomingDescriptor()->IsWasmCapiFunction();
+       int offset = (FLAG_enable_embedded_constant_pool ? 20 : 23) * kInstrSize;
+ 
+-#if defined(_AIX)
++#if ABI_USES_FUNCTION_DESCRIPTORS
+       // AIX/PPC64BE Linux uses a function descriptor
+       int kNumParametersMask = kHasFunctionDescriptorBitMask - 1;
+       num_parameters = kNumParametersMask & misc_field;
+--- a/deps/v8/src/execution/simulator.h
++++ b/deps/v8/src/execution/simulator.h
+@@ -128,7 +128,7 @@
+ #if defined(V8_TARGET_OS_WIN) && !defined(V8_OS_WIN)
+     FATAL("Generated code execution not possible during cross-compilation.");
+ #endif  // defined(V8_TARGET_OS_WIN) && !defined(V8_OS_WIN)
+-#if V8_OS_AIX
++#if ABI_USES_FUNCTION_DESCRIPTORS
+     // AIX ABI requires function descriptors (FD).  Artificially create a pseudo
+     // FD to ensure correct dispatch to generated code.  The 'volatile'
+     // declaration is required to avoid the compiler from not observing the
diff --git a/net-libs/nodejs/files/nodejs-15.2.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-15.2.0-global-npm-config.patch
new file mode 100644
index 000000000000..2b0705b1d712
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-15.2.0-global-npm-config.patch
@@ -0,0 +1,13 @@
+--- a/deps/npm/node_modules/@npmcli/config/lib/index.js
++++ b/deps/npm/node_modules/@npmcli/config/lib/index.js
+@@ -275,8 +275,9 @@
+     // default the globalconfig file to that location, instead of the default
+     // global prefix.  It's weird that `npm get globalconfig --prefix=/foo`
+     // returns `/foo/etc/npmrc`, but better to not change it at this point.
++    // gentoo deviates wrt global config; store in /etc/npm
+     settableGetter(data, 'globalconfig', () =>
+-      resolve(this[_get]('prefix'), 'etc/npmrc'))
++      resolve('/etc', 'npmrc'))
+   }
+ 
+   loadHome () {
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 3e9bb1da9c02..db1b9aefa8e0 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -2,13 +2,20 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jer@gentoo.org</email>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+		<description>Do not Cc on bugs related to grsecurity/PaX</description>
 	</maintainer>
 	<use>
 		<flag name="inspector">Enable V8 inspector</flag>
 		<flag name="npm">Enable NPM package manager</flag>
 		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 		<flag name="snapshot">Enable snapshot creation for faster startup</flag>
+		<flag name="system-icu">Use system <pkg>dev-libs/icu</pkg> instead of the bundled version</flag>
 		<flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 	</use>
diff --git a/net-libs/nodejs/nodejs-12.18.4-r1.ebuild b/net-libs/nodejs/nodejs-12.19.1.ebuild
index 8b94d6f307b4..bb763d423aa6 100644
--- a/net-libs/nodejs/nodejs-12.18.4-r1.ebuild
+++ b/net-libs/nodejs/nodejs-12.19.1.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -13,8 +15,8 @@ SRC_URI="
 "
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -23,7 +25,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=app-arch/brotli-1.0.7
+	>=app-arch/brotli-1.0.9
 	>=dev-libs/libuv-1.39.0:=
 	>=net-dns/c-ares-1.16.0
 	>=net-libs/http-parser-2.9.3:=
@@ -34,6 +36,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
@@ -168,7 +171,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-12.16.1.ebuild b/net-libs/nodejs/nodejs-12.20.0.ebuild
index 29723942409f..794aecb45c5a 100644
--- a/net-libs/nodejs/nodejs-12.16.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.20.0.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -13,8 +15,8 @@ SRC_URI="
 "
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -23,8 +25,9 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.34.0:=
-	>=net-dns/c-ares-1.15.0
+	>=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
 	>=net-libs/http-parser-2.9.3:=
 	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
@@ -33,6 +36,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
@@ -96,6 +100,7 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
+		--shared-brotli
 		--shared-cares
 		--shared-http-parser
 		--shared-libuv
@@ -166,7 +171,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-14.4.0.ebuild b/net-libs/nodejs/nodejs-14.15.0.ebuild
index a96306904aee..560cce9ed9a2 100644
--- a/net-libs/nodejs/nodejs-14.4.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.15.0.ebuild
@@ -2,55 +2,52 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+inherit bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
-	system-ssl? ( ssl )
-"
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
 
-RDEPEND="
-	>=dev-libs/libuv-1.37.0:=
-	>=net-dns/c-ares-1.16.0
+# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate.
+RESTRICT="test"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.16.1
 	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-65:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
+	test? ( net-misc/curl )"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
 )
-RESTRICT="test"
+
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
 }
 
 src_prepare() {
@@ -88,9 +85,6 @@ src_prepare() {
 		BUILDTYPE=Debug
 	fi
 
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
 	default
 }
 
@@ -98,10 +92,20 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot || myconf+=( --without-node-snapshot )
@@ -140,8 +144,6 @@ src_install() {
 	local LIBDIR="${ED}/usr/$(get_libdir)"
 	default
 
-	pax-mark -m "${ED}"/usr/bin/node
-
 	# set up a symlink structure that node-gyp expects..
 	dodir /usr/include/node/deps/{v8,uv}
 	dosym . /usr/include/node/src
@@ -162,7 +164,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-14.13.0-r1.ebuild b/net-libs/nodejs/nodejs-14.15.1.ebuild
index 1b229989974f..0f1006e67884 100644
--- a/net-libs/nodejs/nodejs-14.13.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-14.15.1.ebuild
@@ -2,56 +2,53 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
-	system-ssl? ( ssl )
-"
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
 
-RDEPEND="
-	>=app-arch/brotli-1.0.9
+# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate.
+RESTRICT="test"
+
+RDEPEND=">=app-arch/brotli-1.0.9
 	>=dev-libs/libuv-1.40.0:=
 	>=net-dns/c-ares-1.16.1
 	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
+	pax_kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
 )
-RESTRICT="test"
+
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
 }
 
 src_prepare() {
@@ -106,7 +103,13 @@ src_configure() {
 		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot || myconf+=( --without-node-snapshot )
@@ -167,7 +170,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-14.2.0.ebuild b/net-libs/nodejs/nodejs-14.2.0.ebuild
deleted file mode 100644
index a46c7ef71090..000000000000
--- a/net-libs/nodejs/nodejs-14.2.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.37.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-65:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.11.0.ebuild b/net-libs/nodejs/nodejs-15.2.1.ebuild
index a1b0b0547ebe..b8481a2f946c 100644
--- a/net-libs/nodejs/nodejs-14.11.0.ebuild
+++ b/net-libs/nodejs/nodejs-15.2.1.ebuild
@@ -2,55 +2,52 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
-	system-ssl? ( ssl )
-"
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
 
-RDEPEND="
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
+# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate.
+RESTRICT="test"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.0
 	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
+	pax_kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
 )
-RESTRICT="test"
+
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
 }
 
 src_prepare() {
@@ -98,10 +95,20 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot || myconf+=( --without-node-snapshot )
@@ -155,17 +162,12 @@ src_install() {
 	fi
 
 	if use npm; then
-		dodir /etc/npm
+		keepdir /etc/npm
 
 		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
 
 		# Move man pages
 		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
diff --git a/net-libs/nodejs/nodejs-14.12.0.ebuild b/net-libs/nodejs/nodejs-15.3.0.ebuild
index 43b934166628..b8481a2f946c 100644
--- a/net-libs/nodejs/nodejs-14.12.0.ebuild
+++ b/net-libs/nodejs/nodejs-15.3.0.ebuild
@@ -2,55 +2,52 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
-	system-ssl? ( ssl )
-"
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
 
-RDEPEND="
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
+# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate.
+RESTRICT="test"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.0
 	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
+	pax_kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
 )
-RESTRICT="test"
+
 S="${WORKDIR}/node-v${PV}"
 
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
 }
 
 src_prepare() {
@@ -98,10 +95,20 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot || myconf+=( --without-node-snapshot )
@@ -155,17 +162,12 @@ src_install() {
 	fi
 
 	if use npm; then
-		dodir /etc/npm
+		keepdir /etc/npm
 
 		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
 
 		# Move man pages
 		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 87f5c52bddd6..e7a2c7c7eb93 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -32,6 +32,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )
@@ -39,9 +40,6 @@ BDEPEND="
 DEPEND="
 	${RDEPEND}
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
 
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
@@ -164,7 +162,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/openmq-cclient/Manifest b/net-libs/openmq-cclient/Manifest
index d85292ef3d64..f77279a357cf 100644
--- a/net-libs/openmq-cclient/Manifest
+++ b/net-libs/openmq-cclient/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.in-4 1877 BLAKE2B cf373e35ecdc205b92864af496c30e464e24d59dbf175396b5edfd13b04943ff61d9271eee1e616eaec5c669fcb99809bbf665980207f7e4c270a7c20efd46d7 SHA512 ea4d441035f275df31c28a05100377b40e7ae282767f74e247bfba31739b7f6462d5e94938bfc4aac6c4f2d78c792a10d941e01e5b8e0c9cf412bf7d878dcf33
 AUX openmq-cclient-4.4.1-aix-gcc.patch 376 BLAKE2B 14f7a71079468da60aa30a422d79dce2be877928d63cf4c4e802639b94df10afa37d2f41c735f4987067a1a2e564c757016e40ae03cb9612b2a97263af690d7f SHA512 c7899238b90072a26a8bf1700940d30218d59629b8acea8699f101948f2d659ea684fb73ba560adbbe171c36eec3ae244a9f1707349647213518a654d48c5725
 DIST openmq4.4u1b7-final-source.zip 6892740 BLAKE2B 0101648b1688411579b5d1133714b79af24788a548643546de80a708028a1c08af92e2534767eb0bd9f9eddbb16e77a1884880a5d4f9cbe4f0166dbce0b2045e SHA512 4bc51a3bc0a82ae41998ae3d60912d807ff069d6165ea9cfdc1c6eefc9e57b00ad91d6ed2efa032e76be744db3328511bb02023d14a64bd3b64c8667982fbe8c
-EBUILD openmq-cclient-4.4.1.ebuild 1780 BLAKE2B ca2d862e9e60f23e8edeefec5b971755ca398fab0f3a1a75d597884be6474ba61830bb175c13672c86336a01a4b547a7a6c62f53775e541820e2be80096fb8d9 SHA512 b05b4a198ea6811faf1165522df25efb37d7f555fb9972c49ccf6fd74ff453f0b3263408803a37d4a097f431a839b2734d3c1ebad04ae25f98ae2b78003901bc
+EBUILD openmq-cclient-4.4.1.ebuild 1882 BLAKE2B 4b07549794f2b2adafeebdb734a7f88df029ce0e70c5e305709ddafeca40b59c180ea587a52cc3a4d29481b776851bfb5aa544f8c016ca5906bbce4188a59fc6 SHA512 cd6110491e4fcff4b0eb3223c43f9d220ed7251d379a16f168765e4442a706c1ad98dc37b8acffac32eea4b845642c183915629bcce72b60be3570135b7d63b0
 MISC metadata.xml 864 BLAKE2B 5b7d8beccae5cf49a47e7986c9720788b8e307b48d45e9890a70dd268d31c7783fbabc2ff616ed82ed6af87dfbd25aabbfb082a220578ad73d2598700dc3c29d SHA512 beb566a77afec231f42d0f44dc4442c621a6341c40716d44f68f32ad517be715925635b721e57a714f38780afa90fbb30e85fb9f8350ef930309bfa0ebcb811a
diff --git a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
index a60d88a6722b..8fdd8ee4a310 100644
--- a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
+++ b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -73,6 +73,12 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake install DESTDIR="${D}"
+	default
+	dodoc -r "${WORKDIR}"/mq/src/doc/en/.
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 753bf6727ec2..f049ad777f8b 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -3,10 +3,12 @@ AUX pjproject-2.7.2-libressl.patch 3446 BLAKE2B 47b21f621ffd1990e276459d9692ed7e
 AUX pjproject-2.7.2-ssl-flipflop.patch 4336 BLAKE2B 999150475bd24989f64bb718d082ff1c40d5ba383103371550d2c682578a9c57d58b4029e512ac5a064fae3a526bd6e62fb645ba45b4067c47fd148bcce668aa SHA512 438a61353c0200d3f230b81cc13f565a178d078b4580aa468a9241b5b95f5a2336d039f4aaf99cd57e7b1042f4c0a1cafd00c29191e36c08f2194d984811b8d6
 AUX pjproject-2.9-config_site.h 2168 BLAKE2B 39d526e7a2ca79ea2c1e453d95d420a6245e7a93641227a908660fea553a8b66d5dfb6b7108b49dc0686de6522c2485b72a6e7511096cbfe50bdb2800d559e6f SHA512 d6456b7fa36b3256613eea515b78f0884fa6b56705817cd421a962f3c3302bf0efa69006432dffca49400ef75dc99ebc7639d270aebe5bc2d4a9a9515cc56408
 AUX pjproject-2.9-ssl-enable.patch 3515 BLAKE2B d68479ba509513828d8488b60358ba00651c87d0b39b9bc800fe0d38294f2afad43fd7f4ee5c260bd62044d17b010112c59363277739f4ae7d20940943437539 SHA512 5fd3e681801e6e2cd56ec177d71a65422ec22b788adfad3920562616c737188f71097a545d9c59bd6a3d876ba143f90f731d165d8c68da25aa93b03c009753e8
+DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
 DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
+EBUILD pjproject-2.10.ebuild 3145 BLAKE2B 3e7fd5a37a2ddf51e1673c4ed8cffd5a3a95ff9661469f2e063af91de58098d053886672939df14ae4a3bde7d880316848895116bb3259c19e63a5d194fe3a16 SHA512 a6b5079b32b697efc140372715ec90e59c7d447d907daecc9e08e1312840b8c7f7e19d80e2e6e834740936be93ab0afa6ca6d69a2caf6ba7cb6bcd67057ed08f
 EBUILD pjproject-2.7.1-r1.ebuild 2618 BLAKE2B 607df084017b04a906260d066fb28ff0a0ee11aa73430e40723c53ad87fee8298bfee203f231d4fe4fe7160521c5bcd47eff85a13a7d02c6790d42e4d29505b8 SHA512 08cfc90ac6007da1ba37c2b58417f9b71064982d818f1bf04c325501486ad8b3382d85347ddd6419ce5195539ad3c77575846eaf52ca9c92628b9bd79fa46670
 EBUILD pjproject-2.7.2-r2.ebuild 2754 BLAKE2B e26d384028d5a0211c48963100f55daa7df626b39d4d64d25d7c60adc33b2925c1f4c61af822699977a8c07cb437c227990e33a53f98eabeb058cfc111b37557 SHA512 1c1b9856f09f6bae89f3da0ed8b5a622a84402bb3f663b8fc1e9d4f435700e157511ae120fb074fa7bf02df6b031cce138c1c288649751bbc84263e39cf36361
 EBUILD pjproject-2.9-r2.ebuild 3123 BLAKE2B b46ba44852d0aa08aa43a9cb2d696b1f1065373e022224154ca49e3357ebb9e2c589b18ea00af0d65cf0270192f0c0b441bd6f723f534cd40d3a57bd796f5af3 SHA512 9ff5be65dd30be1d8b2dccf5021f1eec56e0edc348a5afea71a01ab638edbba2359f52bdd503121b1d88da8c364371556f5b52a2b47d44aa5a3081af7fe16b1b
-MISC metadata.xml 1275 BLAKE2B 6d833264ab353a9393a577f50a5241948bffe17ecfa551aebd4736fef54e7ef316c481faee27ddde3a5aab327a22bd38520e781aaeefc5a2c14cb2fd08dcf608 SHA512 563deb2cb83e6a638d9cc99b912c4ca907acd0ea133168a33d452f29d856b27ee38ee73bf27ed6147b6decfb6b4a74ef1ea40b1742e201408916fdeca9400771
+MISC metadata.xml 1348 BLAKE2B ddf0fa47ffb1701bf95f3d51d04acecfdc16980a810f5af577d9cc8a31ebed5516a95e7fa6257a0c35af7fddd391da51aefa461561e48c13af4e143e7e4d2b84 SHA512 0fd1c947edacc7a5cbf615d2afb8830d7e223a493a26b18814f9bdabf7216bf2737350f7b6ba69589852df5ee409256b60dd0e8c93f81eb696d5e2d94504d535
diff --git a/net-libs/pjproject/metadata.xml b/net-libs/pjproject/metadata.xml
index 6d51c770dce3..ebb6d87617b4 100644
--- a/net-libs/pjproject/metadata.xml
+++ b/net-libs/pjproject/metadata.xml
@@ -23,6 +23,7 @@
 		<flag name="resample">Include resampling implementations in the build</flag>
 		<flag name="silk">Include SILK support in the build</flag>
 		<flag name="v4l2">Include Video4Linux v2 support in the build</flag>
+		<flag name="vpx">Include VP8 and VP9 codec support in the build</flag>
 		<flag name="webrtc">Enable WebRTC support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/pjproject/pjproject-2.10.ebuild b/net-libs/pjproject/pjproject-2.10.ebuild
new file mode 100644
index 000000000000..ffbd59254094
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.10.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
+HOMEPAGE="https://www.pjsip.org/"
+SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# g729 not included due to special bcg729 handling.
+CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
+VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
+SOUND_FLAGS="alsa portaudio"
+IUSE="amr debug epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc
+	${CODEC_FLAGS} g729
+	${VIDEO_FLAGS}
+	${SOUND_FLAGS}"
+
+PATCHES=(
+	"${FILESDIR}/pjproject-2.9-ssl-enable.patch"
+)
+
+RDEPEND="net-libs/libsrtp:=
+
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	ffmpeg? ( media-video/ffmpeg:= )
+	g729? ( media-libs/bcg729 )
+	gsm? ( media-sound/gsm )
+	ilbc? ( media-libs/libilbc )
+	openh264? ( media-libs/openh264 )
+	opus? ( media-libs/opus )
+	portaudio? ( media-libs/portaudio )
+	resample? ( media-libs/libsamplerate )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	rm configure || die "Unable to remove unwanted wrapper"
+	mv aconfigure.ac configure.ac || die "Unable to rename configure script source"
+	eautoreconf
+
+	cp "${FILESDIR}/pjproject-2.9-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h"
+}
+
+src_configure() {
+	local myconf=()
+	local videnable="--disable-video"
+	local t
+
+	use debug || append-cflags -DNDEBUG=1
+	use ipv6 && append-cflags -DPJ_HAS_IPV6=1
+	append-cflags -DPJMEDIA_HAS_SRTP=1
+
+	for t in ${CODEC_FLAGS}; do
+		myconf+=( $(use_enable ${t} ${t}-codec) )
+	done
+	myconf+=( $(use_enable g729 bcg729) )
+
+	for t in ${VIDEO_FLAGS}; do
+		myconf+=( $(use_enable ${t}) )
+		use "${t}" && videnable="--enable-video"
+	done
+
+	[ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1
+
+	LD="$(tc-getCC)" econf \
+		--enable-shared \
+		--with-external-srtp \
+		${videnable} \
+		$(use_enable alsa sound) \
+		$(use_enable amr opencore-amr) \
+		$(use_enable epoll) \
+		$(use_enable opus) \
+		$(use_enable portaudio ext-sound) \
+		$(use_enable resample libsamplerate) \
+		$(use_enable resample resample-dll) \
+		$(use_enable resample) \
+		$(use_enable silk) \
+		$(use_enable speex speex-aec) \
+		$(use_enable ssl) \
+		$(use_with gsm external-gsm) \
+		$(use_with portaudio external-pa) \
+		$(use_with speex external-speex) \
+		$(usex webrtc '' --disable-libwebrtc) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake dep LD="$(tc-getCC)"
+	emake LD="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
+	newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r pjsip-apps/src/samples
+	fi
+
+	use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives"
+}
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index fc20d5cba9a1..54a18fd7c21d 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -11,6 +11,7 @@ DIST bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
 DIST cc-1.0.58.crate 52896 BLAKE2B 118619bbe306aef5cb83350ea04a7660a4af2c365a5f0c30d045cdca73f7d68d6646889295590dff29cbf003b44f9b00d5eab22fcde8a57483aec615278dfbb8 SHA512 0a208c4dd7700ba92337ad0044c0ae1614b105d6e799fc660d07e7745c60d8e4c8d3688af7ced77734a2a695ac2e7c565c2f2b7a886d71714c2f7675ea2a22f7
+DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cmake-0.1.44.crate 14377 BLAKE2B 5922b7dd8618e7982064fd754b1ee54941a4555961bbc832da6fb149afa1317951e4ab710f2a13856aee6af18bfd9612514dc56e795a013c8d4094c8be1fca11 SHA512 7adeb6289fb1072aa739b4f6bbe91f612fbab730c3ea67b6024a31ebfe3fadb2da798495ddabd5cbaaa1106bc4ae185b350f618eca3a72de4ea0a4d526664657
@@ -22,18 +23,25 @@ DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
+DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
+DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
+DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
+DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
 DIST js-sys-0.3.42.crate 67017 BLAKE2B a5db2a97a9cc4738d698e3db36c0a1024fc3d60a23dbd0ec4ddd7f887d04a7860b1641729ea4ac24669d98aafaff78d0a3d8a3211f8523e104cd668a11ce2af0 SHA512 5193b77f58741a7cb59ab871d5e66a2629e56c8a036bbe0cd7619e1115e9925e19a5f01f6b0f4854c22f36fcc3c1a335779f5f6923dbd6c617e850247a3c85b5
+DIST js-sys-0.3.45.crate 67143 BLAKE2B ecae52ec5f1cc7a52baf3d82915de57f9351ddf5e9fa35d279336ee2d2d5547e640ab8387d8d85ce9ed2ef02ad63d985d26db0df81b482bd021f8a2bb260dc28 SHA512 34d27c11bbdbfd7745166045ee20c578d3b4b917b5017a24d55349b5064d4f4bfba68dfaf1f16ce7df06ca88f727afd61487e96cab0e480447fdbf920a0ff7e7
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.72.crate 478292 BLAKE2B 23914e92f9ae57a023bbb9bd9cd823cf535ba14ce8d01f171d3223cd227bb9d3884f7596dc2f74c690f7de813da4783e277204dfa690fc1e4f26ee566f1fe32b SHA512 f59caec272f24b8cc29d421baa4ee4145afea8eb9e4a83d8c245602f6bd8de3c91c04008a9920f7f70c9967a3392cc44d8df141c83c6c18d1f14893b21ae4ea0
+DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
@@ -43,15 +51,19 @@ DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24eff
 DIST mio-0.6.22.crate 102782 BLAKE2B 8a088fb24797f4b16b6da28fee56a1c8bf1346959905c3501e3d78d16d169125c03495d9e21dc9da4fb6735a48af38b2883544d1c9ea2486d48542fde6ad47eb SHA512 b500b0271779942512c1d02756ee4caf4e00488f6929a06a7be8a46cc44318edaeb80abfaf6367d7201978a3529a6b5424679e07b719ee8194f0dc37aaf56ca5
 DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
 DIST net2-0.2.34.crate 20620 BLAKE2B aee9aac0deb14a13c5f90793f1e439c94362403cb329e24607c1970c117bc379049da1b173d1bf827f0e3db38740a2d2e696981daf88c1b2302d81564be5433a SHA512 136ba95ad540545165fc2e34fdb5aab7da8f6b20e7682302ad5796b86cbf3d80b5364679c82caa19151b277f9d18de053968fda779ffff8ac88024940772709b
+DIST net2-0.2.35.crate 20660 BLAKE2B 8bfbbad0c8ccd364f1be6fd67b3087a0dbd7a6301b8133bd28cacca3d32a5baa9dcbbc81cf957bf1591b20512f283e3fd441190e33c3ddc09dea3f9bd5dba251 SHA512 5a5b4ee65654fec31d820a71bc50a0d81555ab661e4d3c1dcafb048588218d6ba347f1ce5423b092f078f3bce55f7c74e33193d1924086bb1d43a5e6efc80540
 DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6
+DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
 DIST oorandom-11.1.0.crate 9762 BLAKE2B 0589af12d0ad99009655272035738a6a5f57abb47eda2f2dc3be443474cb67cf4808207f95aee0be5417714f1c72c13fca82fdde778565574d670271ee9528d1 SHA512 faf840b52a315125d5f6c80f6101fcbff6ac29217d362915ebbae4f7337c18ecd46b89da96bf67147e84d0f805edb626be0da448af12b0bf537fb0f0a3a25c0c
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49cae62cc363a3bac98938328aebd527592270ac4014f558751bcdcf7e4994da5647baf98437200a93849bc9e549f SHA512 f9d8be381ffbb853b9a3bfdb0cf5b29c23fbab9b376ab2cc9a734fb7d573a1ef1ae3a32c5b4f080f534e52505fba1d6051475d62811da01205323420f2045dff
 DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST qlog-0.3.0.crate 23295 BLAKE2B 1a4216fee65e73f72a85a4227a1765883fd121fe4d0216d28755501b104aeb80dbe5bbe493991c0a2dd635351224f345b283e18e6db2206556b7cf0f3a884c7f SHA512 76a234231b2f4ab7af9ede41525679595083b5faafb3e0e516e08968ee9294f4a0cc74b81df69041b8dcafabdb09494f9cad9a73cbbd1aac3388667d8366dbf7
 DIST quiche-0.5.1.crate 3265682 BLAKE2B 1d404317e48a62ac2cb3759aae51f0b91eb87d9c9694333331db528b79cc19a72f0f8da2b0785469ae81237c8b8afa760a4f00b039895330aa8b6e3b3d356ca3 SHA512 7f9af3f104aa788076cf7be2f643c823264cb616dbc9dbafb21afbbdfde4d74edff9e48ef79828ee47e3185215a3177131dec9b48a65e96e8ab4b6214b409fc5
+DIST quiche-0.6.0.crate 3264703 BLAKE2B f5703d86866b4ff11fba3c620e65da26050d744202bb520783c91f9925e030f0bf5ff2c75af02a015006d9b8a3991092df15a523dd316d7973df06c694927529 SHA512 c73a06d8f426193c6a0859a4a1beb453382c6dd67e70e1ea58999a5585d468442ea86457f3dbaed1d6d5dd33fc204a5c9aeed26de1072563d6951c4f386c957c
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b91fb0e4dce36401cbc653310c16393c12b73b29d56eb04846e06c04942b7fd41173cd8fcd8dc11046163f7 SHA512 176af1a8148026954e271ece820c67b215223cdf11b80ff4e3229e4871ad87ce9c21c0b5b5c9f1c9e8063102ed0722c3e5194c13bbe77d8688fdf81e0ba8a599
 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
@@ -66,17 +78,25 @@ DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017a
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
+DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
+DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
 DIST serde_json-1.0.56.crate 114541 BLAKE2B 1e393b296983b55d6f516f87ac0b3222956e3ecd7e088955f430c0957642ba59f6d7e927bd924b30f8ca989a04f611078b5c05690d8b1195a0e8b0d11f1b6412 SHA512 ee937a1449701235984a71c9e92035251019d922eccf29e1dc95cdfa008e9bae614650949d8536a5a42ae7b8decfb419b75ec5285b1f85618750efbad24cb11f
+DIST serde_json-1.0.59.crate 114956 BLAKE2B 27552d21b80d88cc3c643b25e5f0105c0d79a7c74c5bc3c2cdcc68050103ad73b75f7ee9d1d5afb60adbae33c351091b180cb1f8aa17c80f06cce4fb4c57f2d8 SHA512 2f9bf96fa770f9be9c43fc889e1671e9bb883f49a820aa69a1709d9f679f21f01cef2b771eea4d1fe7994cf850af44577710521fffdc4cc46d0dc6f913842075
 DIST serde_with-1.4.0.crate 25789 BLAKE2B d91f5fed9ef2f3a8b7a8973e69ffff0715bb0bc0e2c9e92b263139ff54f2c325926db9312d402ef6b47006ccce6d951835896893b1d27738f22f066e61e64260 SHA512 702034da0c16c57b8f66301619f9323bfdfcb4943b4a6c4df89508345b6ace57b1caa6b3b2d662eff9c9df6ddb313d2fb2ef85d7f8a79bdb986eb832cc716b89
+DIST serde_with-1.5.1.crate 49687 BLAKE2B 6acae2c78b47fd5d4d17f2111f0a14ed2d76be93c1113adfb151b3dcbfa1ec48deb163bbc020ebb230c8263bd3f7e351c1b86fad84a33788b816b59fd9d92ef0 SHA512 4b961006c59c0c8cdb70d6ce7bb99f5ffd49e6ab782e8d20125b7495f5e4425c950ed60727affb8d7aedcad6b735af6505bb1b47414f82e1c731dc79fe1a3c6a
 DIST serde_with_macros-1.1.0.crate 11235 BLAKE2B 46d45ef95ca4bf276abe5571671614927aef01c811b5eefd84801b50bf10d7ba562c42caf9ba901413962e4f7b4662e86ad3ab81e0fb4b442e3baa1a8a7f9c0c SHA512 36de2149a1a4da3162458d79518aa276517456c48cbfbcd564fb84d509b267566b2c2dcd707604b502cd9e152eeabea63234837cb1ad216fe4d9eb27c51cc288
+DIST serde_with_macros-1.2.2.crate 14879 BLAKE2B db14145d27bf1f586a2403ac80c24bf0b231146444c90a6f5cfeebbc93f3bba1cffd286326ae30109fc8a2b2aee13f5ed82ec3c4b046657d61e88815b2df1313 SHA512 aee30f8b8a48bf074f04ca7f0da180d25c523521321189830cdcd036db3f66e3305d53aedb590ca60809e6678f83f1133f7965e636fd166bcb0ad8f9752a44e5
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
+DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST syn-1.0.34.crate 205051 BLAKE2B 3d609502637038d6c2d96b11a99dc96a232ad9d68e94571838cca727dc41450148047509108d6ec3cbcf15f146286dc54023db8ac394b2443a37f55c269a630c SHA512 4aaae0369c08f9f505acc62e9c603d3f5c531f2da42308665cb3c656fb7828ec8c46dc2ee2ef0cbe6ed20c8d7482f66118e4c949f3bff3eb67ae1c93fbbc90b4
+DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817
 DIST tinyvec-0.3.3.crate 17860 BLAKE2B d3665da9e5e2369bbd68c84827ce13cd1c0afa07b8cf689b04a62e24e5bafe41e8f32b136e048ce85aad324c22ca68fb43995a5445092d1f331379366f71cb03 SHA512 41200e022e66624b45e186a5ef6e7cc05dc3e2fd28d332deb689699b17bb85ecd0d960809e4ea2a08ac1ebeb5f2fcf364f4f9626d297f23169476c8be9dc1557
+DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
@@ -86,12 +106,19 @@ DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa028
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasm-bindgen-0.2.65.crate 156753 BLAKE2B 4b68313c60c6bf1ccdde58c05cf736e1806e1115271172b2751e256eeff83b93e65d00306ff18529f02c7e5c47df89a2784334d8cf44e09ab4d4465cf85dbe3f SHA512 6fdbc50e06c0db49833b2e5a638d1dc2444b326a4ef19f640316fdbbcb83704a79a6fe0f47818bc69d271bd3791ea6945194960a5d005a3e4a823300023a35c2
+DIST wasm-bindgen-0.2.68.crate 159094 BLAKE2B eb7fa3c2f80e5ab7c0d8e99b11bfc025fd32c8347b9baee9f947570a85426dcdadd052248af7a0ab17bdfbe494f71037fa1980fc875d84c089b70a80d0321bce SHA512 a3e877a43242a35518b84852ac71f3cd6c9ca558234fc23bece38780a0abcbf9e7c6d07e20e81c1f6641835ed3b55dff8245fb75901205b0b5658f4e3b0c05ea
 DIST wasm-bindgen-backend-0.2.65.crate 23551 BLAKE2B 4aa556cd36d2b7742cc8397eab0c1e3c9e0c24433e82a516aa71dbd3a32cfa760bfba93fc4311e9b69f527dffcd39be6dd7fe81f0fcbae30ebe6fc21c5e632e9 SHA512 7043f525453da6060574cab9926023b65e1e402d10c042804ab90ada78981300fcfabb97f3a661acc9c685bbc65a29c7c5c6ac446f11705bc85b8c9488985bb5
+DIST wasm-bindgen-backend-0.2.68.crate 23522 BLAKE2B ad87e1cbfe42d6b3f6c14f793dcec31fb0f9418454e0870a3951bf5f6b0eb9f39e5363129fbbdf986aa50e1fb2c13b03bbd9e21364204ace72460856fcfa7610 SHA512 aae99cefabc91417bda499b4fe8f136a81ffd44d5122f0c13ca5711eae26f2f8b16ef55c18dd4fd3f0e71edfff8610379adc458f978eaab057671b520de9d564
 DIST wasm-bindgen-macro-0.2.65.crate 11624 BLAKE2B 010ec37dd315fa9053745978a4bbe2758904f5599c3c05195e0fab0c6bc40e671eb6f025e48afe8a0376933eadf550c1ee5b61fddee0d82f3e8f6216e4615e25 SHA512 a5a1071cd09548b2ec2bd0dce4713f00d72ede2c2be8c8e4b3a852e5b2f0456a1e87996f31604523e3e1f226b14d8e4d6e263af86bdde78df830f65fa1a37244
+DIST wasm-bindgen-macro-0.2.68.crate 11630 BLAKE2B 407ec70043b1b6e7f454ac9d986d6df98ae19c9ab8ada98f4f968520b7cd75886cdeeeb739d61615bcf0d6ca3a757ba618f0ed9abc76308c461f159ac05ec61c SHA512 c70f536072ce9bcb109ea762c6235aea7eafd37eb3faad1b50184b733d09417b02f6f75b5c29fa46691b75b449316a039b79c630387f04903f6304453f98e772
 DIST wasm-bindgen-macro-support-0.2.65.crate 17801 BLAKE2B 1c54484f3d04e4da5b5d9c0f30935420f04a3db9389190f1dfb051c283a274a9f3c37685db6e3f40f836f022c92f9613f5b1570b47d53ca1f15418c4b6e02e95 SHA512 7c12ac36a8e7295e66dc3bdddb26ba2ccef73d1d47dddc98d7416f387963a3def8e86e07dd1464703e9f06132ad1353d54f6d220fcebd2d96bb85dcf10d1f84b
+DIST wasm-bindgen-macro-support-0.2.68.crate 17793 BLAKE2B 619c0484ce4f97742972f1f6fed67643f570df3bad436cd2a93c5cd7477a8208082cafdad87e01caa1ba752bb200e65c61e49136e8037a9c52b9f06ca0c4ba9c SHA512 53d3e483a7df0a816eba308e5a9a736b5e812da9778889686994ed964888b4bb9a8b12cea448b1c68607e6a8b10596f8a81f4c85dc1311667cea5f445e7bb993
 DIST wasm-bindgen-shared-0.2.65.crate 6745 BLAKE2B 3881c8e3db5968f51490676cdfa5a06f8def5e8d6417e41ad592f506291299863342fb59984249ab2484ce6135f67df4545f1ab896bc99dc8cd60ef318223e90 SHA512 32aba8419c42b6798ebeeb57cb562251db6d37bff84b4e2f29264b5f910e8e1fc76c8989f82bd8e224dff978d1e7c25ac19e646f93474f7dd53a85ad2a05d284
+DIST wasm-bindgen-shared-0.2.68.crate 6725 BLAKE2B 891ce0bf742bb32be1549c5b8822952f5cdd15ddd73aed164f753fef211c4087269fc3a859950045bf1e895e255b6f09b6788a7a5d43387365079f106580bf90 SHA512 cf161076d07dd7e91790bb1f773a6f53cf31cc0f9ffe7a650c98d2c6c98d02ba8d1b32fc2aa15128f739c86f49baf206444516c3f8b8df82238eabb72032be0f
 DIST wasm-bindgen-webidl-0.2.65.crate 35843 BLAKE2B 444b0c2d46d6971b7bd06f9ed80fb2088818524a58aefe4b0dac7ca4be40bb3480228883feeacadae3be1b3e6c30b7d5642cdae6fd23c11212991eb26a3a9e5e SHA512 3ee204a0e7588f02b19e03c83843f773b179a07815b1c17bb814fb78e5a430ee0d3c8a58b626465709a6f62efadd9467ea9869f5d44c22e3bda2142e96a38267
+DIST wasm-bindgen-webidl-0.2.68.crate 35751 BLAKE2B 0ead30af7cc22475150d9a8c14f75606427e8d9ccaba8d566d76d32f4aa70f5f22812871abf003bb29e81891936e7a2c7f23d323e45480a806aaa6b0ba10ef28 SHA512 e28946290221b0af418f5ba75190e689e99fd67806de329a4dfa9826f389927eb7f93bc74a96f74c1b5d77f9d71373b081b06b7c047d8e0c144667e5dd19e375
 DIST web-sys-0.3.42.crate 628615 BLAKE2B 7fa7c50c8e71c6b9ac43e056f70a03ddd9532b756fda50ce2183a7f24bbf3b2ad6fbca29f10f955e0032d21aa20b966c2a292f24defc00ad9021af86c0115006 SHA512 6e0af1c1f2ba0ea63033b67c25d45ec550086ba864eea532175e4424a7073f7c2a9d006f19702cbd3369eea80bce08bc25a014911ea1d7ffcc9e3c007e711a4b
+DIST web-sys-0.3.45.crate 630993 BLAKE2B a5a72bf3785902a65a7fd65b53d696b491e9438ba4dd78d4e97f3c3d62df4144716ca09822e074f27ae5506765c7c2d547a110ccaf5c4c214da6b5a4816425b8 SHA512 d208e2271f59691b13b94b952dbce966f54ca180d09c6725964541c00684787a3610623294f81032cc931273ac655dc6163b23fda736b603ff327abd603fbfc8
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
@@ -100,5 +127,6 @@ DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 EBUILD quiche-0.5.1.ebuild 3902 BLAKE2B ddf0e620c3cee6e8d1e952881cf400168558634cd264809e72731d92cce3981c8926d3f570f717358474a7b0111d93e981857aabba544ad85aa574abdb71b224 SHA512 877d10e0b406507f867c8817db7583ab8e72d4a199b35384f4302d6efce2372bd75f73063124ba197a3f4cf3c66c68fb678d19f0ce0df5c1b1b7e1d83730e30c
-EBUILD quiche-9999.ebuild 3897 BLAKE2B 8b94983f87b46bd7d202764679ae6160365960779a8784a59702123465eb7d71cc775b0d1df9ea5f1dc11bb2df386832fda6370d4b21d9f5f6eac978872694cb SHA512 d2b27e811d50254ebdb93315cb6b3d1f2bc5b89b44c58863b16631727017dca00a885aebd07f00cc4e3aafec1ce4becb59713041a8fedef3a69bc92ce17e9ce6
+EBUILD quiche-0.6.0.ebuild 3998 BLAKE2B 6c36bdc3e5c506fd779f1f1f0ce21c578c5e96a5c695f99f01d2273b353d5a4cd62c00be9ea3eb08efe27c3cdef50083687d4da632f92aab736c2db7ca04013b SHA512 a0582b3f4e70d06bf1284724f7ff0f38b02ef633a9e4442fd42c0787f6c0195b0e697473092bc7820f30cc79d8375b35918a0b250ca0e2466b850c32e62c270a
+EBUILD quiche-9999.ebuild 3998 BLAKE2B 6c36bdc3e5c506fd779f1f1f0ce21c578c5e96a5c695f99f01d2273b353d5a4cd62c00be9ea3eb08efe27c3cdef50083687d4da632f92aab736c2db7ca04013b SHA512 a0582b3f4e70d06bf1284724f7ff0f38b02ef633a9e4442fd42c0787f6c0195b0e697473092bc7820f30cc79d8375b35918a0b250ca0e2466b850c32e62c270a
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-0.6.0.ebuild b/net-libs/quiche/quiche-0.6.0.ebuild
new file mode 100644
index 000000000000..7bd57abb4a15
--- /dev/null
+++ b/net-libs/quiche/quiche-0.6.0.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+aho-corasick-0.7.6
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.0
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bitflags-1.2.1
+bstr-0.2.12
+bumpalo-3.4.0
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.61
+cfg-if-0.1.10
+clap-2.33.0
+cmake-0.1.44
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+either-1.5.3
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+fnv-1.0.7
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+hermit-abi-0.1.8
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.6
+js-sys-0.3.45
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.80
+libm-0.2.1
+log-0.4.11
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.3.3
+memoffset-0.5.3
+mio-0.6.22
+miow-0.2.1
+net2-0.2.35
+num-traits-0.2.11
+num_cpus-1.12.0
+once_cell-1.4.1
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.24
+qlog-0.3.0
+quote-1.0.7
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.3.5
+regex-automata-0.1.9
+regex-syntax-0.6.17
+ring-0.16.15
+rustc_version-0.2.3
+ryu-1.0.5
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.117
+serde_derive-1.0.117
+serde_json-1.0.59
+serde_with-1.5.1
+serde_with_macros-1.2.2
+slab-0.4.2
+smallvec-1.4.0
+spin-0.5.2
+strsim-0.9.3
+syn-1.0.48
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-0.3.4
+unicode-bidi-0.3.4
+unicode-normalization-0.1.13
+unicode-width-0.1.7
+unicode-xid-0.1.0
+unicode-xid-0.2.1
+untrusted-0.7.1
+url-1.7.2
+walkdir-2.3.1
+wasm-bindgen-0.2.68
+wasm-bindgen-backend-0.2.68
+wasm-bindgen-macro-0.2.68
+wasm-bindgen-macro-support-0.2.68
+wasm-bindgen-shared-0.2.68
+wasm-bindgen-webidl-0.2.68
+web-sys-0.3.45
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.3
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.39.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake-utils_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
+	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
+
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index c17fa125a0c2..7bd57abb4a15 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -16,7 +16,7 @@ bstr-0.2.12
 bumpalo-3.4.0
 byteorder-1.3.4
 cast-0.2.3
-cc-1.0.58
+cc-1.0.61
 cfg-if-0.1.10
 clap-2.33.0
 cmake-0.1.44
@@ -29,17 +29,22 @@ crossbeam-utils-0.7.2
 csv-1.1.3
 csv-core-0.1.10
 either-1.5.3
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+fnv-1.0.7
 fuchsia-zircon-0.3.3
 fuchsia-zircon-sys-0.3.3
 hermit-abi-0.1.8
+ident_case-1.0.1
 idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
 itoa-0.4.6
-js-sys-0.3.42
+js-sys-0.3.45
 kernel32-sys-0.2.2
 lazy_static-1.4.0
-libc-0.2.72
+libc-0.2.80
 libm-0.2.1
 log-0.4.11
 matches-0.1.8
@@ -48,14 +53,14 @@ memchr-2.3.3
 memoffset-0.5.3
 mio-0.6.22
 miow-0.2.1
-net2-0.2.34
+net2-0.2.35
 num-traits-0.2.11
 num_cpus-1.12.0
-once_cell-1.4.0
+once_cell-1.4.1
 oorandom-11.1.0
 percent-encoding-1.0.1
 plotters-0.2.12
-proc-macro2-1.0.18
+proc-macro2-1.0.24
 qlog-0.3.0
 quote-1.0.7
 rayon-1.3.0
@@ -70,18 +75,19 @@ same-file-1.0.6
 scopeguard-1.1.0
 semver-0.9.0
 semver-parser-0.7.0
-serde-1.0.114
-serde_derive-1.0.114
-serde_json-1.0.56
-serde_with-1.4.0
-serde_with_macros-1.1.0
+serde-1.0.117
+serde_derive-1.0.117
+serde_json-1.0.59
+serde_with-1.5.1
+serde_with_macros-1.2.2
 slab-0.4.2
 smallvec-1.4.0
 spin-0.5.2
-syn-1.0.34
+strsim-0.9.3
+syn-1.0.48
 textwrap-0.11.0
 tinytemplate-1.0.3
-tinyvec-0.3.3
+tinyvec-0.3.4
 unicode-bidi-0.3.4
 unicode-normalization-0.1.13
 unicode-width-0.1.7
@@ -90,13 +96,13 @@ unicode-xid-0.2.1
 untrusted-0.7.1
 url-1.7.2
 walkdir-2.3.1
-wasm-bindgen-0.2.65
-wasm-bindgen-backend-0.2.65
-wasm-bindgen-macro-0.2.65
-wasm-bindgen-macro-support-0.2.65
-wasm-bindgen-shared-0.2.65
-wasm-bindgen-webidl-0.2.65
-web-sys-0.3.42
+wasm-bindgen-0.2.68
+wasm-bindgen-backend-0.2.68
+wasm-bindgen-macro-0.2.68
+wasm-bindgen-macro-support-0.2.68
+wasm-bindgen-shared-0.2.68
+wasm-bindgen-webidl-0.2.68
+web-sys-0.3.45
 winapi-0.2.8
 winapi-0.3.9
 winapi-build-0.1.1
@@ -117,7 +123,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	CRATES+=" ${P//_/-}"
 	SRC_URI="$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${P//_/-}"
 fi
 
diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index bbcc621d1d7f..94bb25810435 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -1,5 +1,9 @@
 AUX signon-oauth2-0.24-disable-examples.patch 331 BLAKE2B 259170e4ef75d002dbdcb8494cd0a3e6ea7fb77e5222db600c8d7a5d731af147cd5c7149b7e15e724607018331a29a53d589c2e6f60f614248e7badff5e63056 SHA512 a12e14d59987925dc0c14d407455c95d49751fc3bda66211898c1308a76d4f910b7ba4fdbfe98902a457980f7037f9853c5a007ee82df690375e5e430afa587d
 AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f0178947414dee97ab22a34e366353a7b5b07e166c426a5b86ab418faf31a8bcd868d297ae4b92d10a8231f403810f66d6f4dbfd31a0afeba4165a SHA512 af1908f5e2549182823847df5ef80b933adc6d4a15f39c63d4a82cb8540e97a29c60c7056f17fb2db314ed92d51594d5f76687862018a70f1de592ecb3a928d1
+AUX signon-oauth2-0.25-cxxflags.patch 795 BLAKE2B 6dfd833830d7344f962fb97bde7c54f976be2c41988e90837225f3adfc0cc4b651aa670f35a95dc481ce651d10942a0d386e03f86dca117d4145928cda965111 SHA512 94dffe79441d5ea90acc29e1d457bdec2e762c18a169ae8873963ed612709d472ac55985ca21c41298557eda4e65879d70a595eda635df75a46c7bdea3ab675e
+AUX signon-oauth2-0.25-pkgconfig-libdir.patch 455 BLAKE2B 787c03ead028ff9e7980deb7eb4e2439864a1307e60dfa34b3e7c18d9f2b753016aa79208651624f10cebdfd89b672eb03097a8c7482389e7bb128bb16189e58 SHA512 b0589d51b4d5c7c51754752c7159e501620d782916fcea8aeb7d3eb8b33121372517be4babce48c90e5abd2e1fde9d3663deb66a8d2065e8cdbfedbf938b7a6d
 DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
-EBUILD signon-oauth2-0.24.ebuild 1119 BLAKE2B 90c0f1275b8562bb4847e73f1ab6261d5d4e180f507ca80e58b151561e63e98e68c7d2ef9c00672537070d50faebdd9854ae2d899636913523c42076a3078663 SHA512 b51f3c2d641239ccef7d51524b60ef6944c0942ddc617a0b147bb5a6acdc3c8600bdae2abc653be40511a29c11d92155eae15f06e97206ce7dfdbb0a79b9c15c
+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
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.25-cxxflags.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.25-cxxflags.patch
new file mode 100644
index 000000000000..ea64d2c8b642
--- /dev/null
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.25-cxxflags.patch
@@ -0,0 +1,29 @@
+From 94e7cdbe1b15455e932a2272fdf2284fecfb9204 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 11 Nov 2020 22:35:06 +0100
+Subject: [PATCH] Disable -Werror, -fno-rtti
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ common-project-config.pri | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/common-project-config.pri b/common-project-config.pri
+index e149d90..9c7801a 100644
+--- a/common-project-config.pri
++++ b/common-project-config.pri
+@@ -17,10 +17,7 @@ UI_DIR          = ui
+ UI_HEADERS_DIR  = ui/include
+ UI_SOURCES_DIR  = ui/src
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
+-# we don't like warnings...
+-unix:QMAKE_CXXFLAGS += -Werror
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ TOP_SRC_DIR     = $$PWD
+ 
+-- 
+2.29.2
+
diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.25-pkgconfig-libdir.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.25-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..fd61e4c2aede
--- /dev/null
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.25-pkgconfig-libdir.patch
@@ -0,0 +1,14 @@
+--- a/src/signon-oauth2plugin.pc	2016-06-02 11:44:21.000000000 +0200
++++ b/src/signon-oauth2plugin.pc	2017-11-03 10:57:35.659278702 +0100
+@@ -1,9 +1,9 @@
+ prefix=/usr
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib/
++libdir=${prefix}/@LIBDIR@/
+ includedir=${prefix}/include
+ Name: signon-oauth2plugin
+ Description: Signon OAuth 2.0 plugin
+ Version: 0.0.1
+ Requires: signon-plugins
+-Libs.private: -L/usr/lib  -lQtCore
++Libs.private: -L/usr/@LIBDIR@  -lQtCore
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
index 6afc4fe8d209..5317e17cef7b 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_PN}-${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
new file mode 100644
index 000000000000..76e60e083a28
--- /dev/null
+++ b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=signon-plugin-oauth2
+MY_PV=VERSION_${PV}
+MY_P=${MY_PN}-${MY_PV}
+inherit qmake-utils
+
+DESCRIPTION="OAuth2 plugin for Signon daemon"
+HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2"
+SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# downstream patches
+	"${FILESDIR}/${PN}-0.24-dont-install-tests.patch"
+	"${FILESDIR}/${P}-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-cxxflags.patch"
+)
+
+src_prepare() {
+	default
+	sed -i "s|@LIBDIR@|$(get_libdir)|g" src/signon-oauth2plugin.pc || die
+}
+
+src_configure() {
+	local myqmakeargs=(
+		LIBDIR=/usr/$(get_libdir)
+	)
+	use test || myqmakeargs+=( CONFIG+=nomake_tests )
+
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-libs/signon-ui/Manifest b/net-libs/signon-ui/Manifest
index 62212e67d633..76ff8c8dc7a4 100644
--- a/net-libs/signon-ui/Manifest
+++ b/net-libs/signon-ui/Manifest
@@ -1,5 +1,8 @@
+AUX signon-ui-0.15_p20171022-disable-tests.patch 518 BLAKE2B 6e15293f2f402db0193a5c25be03a62c93999f05ed889973d3058d4de143193f3e0b3d51f869c4b58fd56c963454fef537bf4bd65a22470d32f08020e2038264 SHA512 18ec01616e468a11c30b2a98689b2a0eddaee3ffe7073e7c1a035f210b70f5ccc0f5b5feaa95ffc608875bf3a68e17c60760f4008d179c5e722afc4068b7e256
+AUX signon-ui-0.15_p20171022-drop-fno-rtti.patch 758 BLAKE2B 6487c7b5e6365deebc301fba24422775f7c45805af734cc0f234cac69734d93cc0a80c9ff2c9456560fe797f1185b91c1e973288a208148d20cffc396d78b632 SHA512 d3d19046e2ccd55f6921a8ae75f970b36d552df3dd789857f9657e5ddd0501c4547960fbbce3ca7849ee0081f351abbf04faf859827db2f7e2dad0d3a4957904
 AUX signon-ui-0.15_p20171022-fix-username-field-reading.patch 4338 BLAKE2B ef44759dde1e1f393ce6a6e6a30528049ef1ce480ae9721f006dd4a37ebfc0c0a36937472fcc74731072229894c1a280c2b50e92e059d000d1de5e91435d8fc3 SHA512 2414ffaacb13224bd4edb4beec1cb6c8e576401d2a3b3677b5aaa9140eeea99077c37fcb0115c2400987722d23f822844d3f4cc901adbc85be6d4e098072d28d
 AUX signon-ui-0.15_p20171022-webengine-cachedir-path.patch 925 BLAKE2B 5ead2d7a75d2dc011d84a476f0cd1b80c72a54dbb9d06a6d151f9940bbdbcb20494a2ad388aa0590b2148cf0d5d2e455d50425d0292bbeda7e41de366172227e SHA512 e21aafb1cb79033619dc50ee41a81efe8e02be7ce71382ab532beb48d720a514bb7d4abe588c117685b4b643865c4a11eb304a8e0107104393de08afa1d162f7
 DIST signon-ui-0.15_p20171022.tar.bz2 55849 BLAKE2B 6b97b3f673fb4494c7e32dc345f6c4697acdb19305b9459fe954d88983e4666211926921dac70829435706cdd9a41f36d36241a73905b2a795873c2894ffa8d7 SHA512 d0a4ca222de00abf4000905d917799fc6f9e04a2c3f49d0d0882dc4e90fdbcde14da91f355d10f8a3feac03661febd321ea6de1df227fa5a3c404eaefa7c2d60
+EBUILD signon-ui-0.15_p20171022-r1.ebuild 1158 BLAKE2B c93891250a4e8daf9d1ca62b26d0c8b52387c09f93b1dc9a7e176a367f281e5e21ba8ef3c5615633a771b5323a43a91f3d494dca3b40aa3683469f055a2fed1b SHA512 5e85657024c075f90d825bff15aa05033614936f530ddeb5a7a5bea6d91ce377370a5a1e3565781af043898e6e45b222e9b5adfacce73e5dd00de28519e017e5
 EBUILD signon-ui-0.15_p20171022.ebuild 1165 BLAKE2B 732d8910aa71a29bbe660f349182d550dc40b315f0b8275e6b430c9348b6a9dba84ffadd133fce014b54975f4b909f0267d346458d7419c09808ed909ee9ff79 SHA512 3c5749bb6224881b2ecaaed13d47bfa12442051de91f6b4dd7ae049aff31de51f312fa7814b56762997914e3e2461a5e34936cc925ac57e102bc98c8ea47735b
 MISC metadata.xml 326 BLAKE2B 896ee331ecb5fc149dbd576756e92fd439e6e5b3364e487de418428eb47502cadbb7826c433ce8bf348a7c70e5215dc073aa75a93b8a853920dd9fbacc139927 SHA512 5fae353739749bdc5a688a5819992063f045818006124b8cefbb4ef6a3452d91122931aae8286627b9121f893b97e66a44caa732edfbc2aab9301d8d039b0a7f
diff --git a/net-libs/signon-ui/files/signon-ui-0.15_p20171022-disable-tests.patch b/net-libs/signon-ui/files/signon-ui-0.15_p20171022-disable-tests.patch
new file mode 100644
index 000000000000..dc818cd15266
--- /dev/null
+++ b/net-libs/signon-ui/files/signon-ui-0.15_p20171022-disable-tests.patch
@@ -0,0 +1,24 @@
+From 468e47402334ce1a0eee9ce30c2e55951877d668 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 25 Oct 2020 00:11:12 +0200
+Subject: [PATCH] Disable unit tests
+
+---
+ tests/tests.pro | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/tests.pro b/tests/tests.pro
+index 6b37001..c711f56 100644
+--- a/tests/tests.pro
++++ b/tests/tests.pro
+@@ -1,7 +1,5 @@
+ TEMPLATE = subdirs
+ CONFIG += ordered
+-SUBDIRS = \
+-    unit
+ 
+ CONFIG(medium-tests) {
+     SUBDIRS += functional
+-- 
+2.29.1
+
diff --git a/net-libs/signon-ui/files/signon-ui-0.15_p20171022-drop-fno-rtti.patch b/net-libs/signon-ui/files/signon-ui-0.15_p20171022-drop-fno-rtti.patch
new file mode 100644
index 000000000000..5360fd5b1ec7
--- /dev/null
+++ b/net-libs/signon-ui/files/signon-ui-0.15_p20171022-drop-fno-rtti.patch
@@ -0,0 +1,28 @@
+From 4546eeb26b79975259819795466320fa53676801 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 25 Oct 2020 00:06:03 +0200
+Subject: [PATCH] Don't use -fno-rtti
+
+---
+ common-project-config.pri | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/common-project-config.pri b/common-project-config.pri
+index 3206471..c05522f 100644
+--- a/common-project-config.pri
++++ b/common-project-config.pri
+@@ -4,10 +4,7 @@
+ 
+ CONFIG         += link_pkgconfig
+ 
+-# we don't like warnings...
+-QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
+-# Disable RTTI
+-QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ TOP_SRC_DIR     = $$PWD
+ TOP_BUILD_DIR   = $${TOP_SRC_DIR}/$(BUILD_DIR)
+-- 
+2.29.1
+
diff --git a/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild
new file mode 100644
index 000000000000..3c1b0ad1f913
--- /dev/null
+++ b/net-libs/signon-ui/signon-ui-0.15_p20171022-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=4368bb77d9d1abc2978af514225ba4a42c29a646
+inherit qmake-utils
+
+DESCRIPTION="Online accounts signon UI"
+HOMEPAGE="https://gitlab.com/accounts-sso/signon-ui"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="test? ( dev-qt/qttest:5 )"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	net-libs/accounts-qt
+	net-libs/libproxy
+	net-libs/signond
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtwebchannel:5
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	# thanks to openSUSE
+	"${FILESDIR}/${P}-webengine-cachedir-path.patch"
+	"${FILESDIR}/${P}-fix-username-field-reading.patch"
+	# downstream
+	"${FILESDIR}/${P}-drop-fno-rtti.patch"
+	"${FILESDIR}/${P}-disable-tests.patch"
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 1eb9acc51d3f..86ef7a99c7ae 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,9 +1,7 @@
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
-DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
-DIST srt-1.4.0.tar.gz 1293647 BLAKE2B 93edaa8b1d2b59776bc3efc851a5216e0acef3766b47100646306bb04e3054d4cdf612da07bc5d1124380abe595733393d7e47f1885282a75e24f34b688ddb1e SHA512 b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248
 DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
-EBUILD srt-1.3.2-r1.ebuild 1134 BLAKE2B 2d404965078d1e53c5ca23d9b6d864ea3937948fdfd60fa9f997b137235924ee413666fbcaf3c3d7f6c26060ac3fbdb743737f27d8423af3f8a96d754b609619 SHA512 4f9acfd1628531a3f3445498e0c01e1fd7625bdcfe054c41d81e4ce4719e1c6fd2f014a6c21a562a71a14b28db10bfb09094449d1bcfc8192ff61c887bcafaf2
-EBUILD srt-1.4.0-r1.ebuild 1146 BLAKE2B 8a932e5bfcea685d4cc80c8c845ed734552be15cdc433fc2abff80624fa384186965c7f77cb877529cf6c2be325ff23c35164ccfbec7743e59162981f2d7bc70 SHA512 a9db72f8162529b48fc64fbf67f86fdfeb153c74b2e3dd97699ba0ab0aaee65da8a99bfc5d7ce20b50b101c934a20648572f6ee2d9110f743622b66063b7011a
+DIST srt-1.4.2.tar.gz 1538231 BLAKE2B 1b3f625bb5a6436d6c35f957796217ed8c7f9d2412e96cbb2b83b8372f0738b5c9219b218b644e74f6f16457d1b8606fedc238310e800cce84fe127f86b33be1 SHA512 4c978e3898737e566f47222a0095df1b49591d79927850cc94c838b7eaccf401faf1c5d038fa45b6fd30c85f980e7c212a79c07ed6f9008430e8a5a594a31ffe
 EBUILD srt-1.4.1-r1.ebuild 1140 BLAKE2B 643b796689df72bfcf0204f9d2d2d6188af0e41930694195077732029b509cd38be328e1ff06c275cf97f565173a1f3c131d53aeba0d1d0c3e1ce2e734914cb7 SHA512 fa989a6e99cd15746d51b9043038f0cf1c7b0623d0e51aeb3a6e1b94302267902c9b8b72991d30dd1299f33ed26aff68dc7787ca99b20d30e9845aa7dd7cd137
+EBUILD srt-1.4.2.ebuild 1146 BLAKE2B 8a932e5bfcea685d4cc80c8c845ed734552be15cdc433fc2abff80624fa384186965c7f77cb877529cf6c2be325ff23c35164ccfbec7743e59162981f2d7bc70 SHA512 a9db72f8162529b48fc64fbf67f86fdfeb153c74b2e3dd97699ba0ab0aaee65da8a99bfc5d7ce20b50b101c934a20648572f6ee2d9110f743622b66063b7011a
 EBUILD srt-9999.ebuild 1233 BLAKE2B 16dd649f1be2cd66e8890a31a745607a8dda568c8f3fce6901fb67011dc3760a60dd1843e14b99364b89112233e7ba670e2b981462113cbc70b2715566fed813 SHA512 f8a0cd2696a8b99e7ca375c151e98d69a35c93847cbd7f08b7a7e6ee581419820962b6d5af4fea1efe636c037bade749fb4ad079990dfaeebde820eceb12cad6
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/srt-1.3.2-r1.ebuild b/net-libs/srt/srt-1.3.2-r1.ebuild
deleted file mode 100644
index 44488e22d283..000000000000
--- a/net-libs/srt/srt-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
-HOMEPAGE="https://github.com/Haivision/srt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="gnutls libressl"
-
-DEPEND="
-	gnutls? (
-		dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
-	)
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATIC=OFF
-		-DUSE_GNUTLS=$(usex gnutls)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/net-libs/srt/srt-1.4.0-r1.ebuild b/net-libs/srt/srt-1.4.2.ebuild
index 6ae97e60aff7..6ae97e60aff7 100644
--- a/net-libs/srt/srt-1.4.0-r1.ebuild
+++ b/net-libs/srt/srt-1.4.2.ebuild
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index 473fb5589c3e..6b0497b38c13 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-logger-qt-17.09.0.tar.xz 93480 BLAKE2B f516ff58b64a59ba3b51c0daf0c871fd0e03b7860fa94f2139175cccb3e5ff4f108b09db22366bdc2e4031556ab06712d1d935b8db7b1ed9b08803f047c943c3 SHA512 1524673a7dcba0d65c57e49d6e0dafd1b826b6444faaabc1dc482b29f6515374a1beb09a9bbfb115097e10fc18722ffe0187dc1bff9be06dc56a95ef32d805e3
-EBUILD telepathy-logger-qt-17.09.0.ebuild 732 BLAKE2B eba5b05710b784329890daec558e66b74a910a0c84fa8fc7689178fd3d46c276c5f18f751c04394ebf955f2eb978d4d9cdaba84bacae132cc5025db6217bc204 SHA512 b920e128e48bd6d7e5410e02c370503e60478be43c44e16f7639c2f44050e169d12624de0d8b11b4f324670c9baa7b57da37265b32fb9a843b93e8257f2194c6
+EBUILD telepathy-logger-qt-17.09.0.ebuild 734 BLAKE2B 057d9290cfdc65eb48b9a5daf2c0422871bd87a6e6b65744c49901a9d11c546afe57e0b27777363140a7adef79de99b89d8ae5673de1f72706b63d7d93165c9b SHA512 2da7b81e51d420aa76ddfc6cb274faf6bafe1790ceedc266944ec9c722c2106dea37a9ab6a3a555254b55201ed57f4c0995eeb9afec0812205aaefa136a2052c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
index 4e35bad1f858..d36180904b1f 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 QTMIN=5.12.3
 inherit ecm kde.org python-any-r1
 
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index feb1eab1f3d0..fbcc2b846bc5 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
-EBUILD telepathy-qt-0.9.8.ebuild 1499 BLAKE2B d6bef151f23c1b567c2be6c1b1a9a947874c5cf67a42a8d110be2153df688a9da06379ba99d12a9361d9a2612410aa8938db971d1f6c59b10b11d81d41f410be SHA512 4187ee5851b9726319abd5f44b1ced861dc59569a11a9f5f87434d88b6691e27ce76c149a51e686479116ba2b212d10b137a096a0d47295f0963a306a181518f
+EBUILD telepathy-qt-0.9.8.ebuild 1501 BLAKE2B 6d19f56310f259faecccba5230ebe7c3236769b8a4da0b8a9d534086b74665f62ad422755b2f316ee524c019e4be49b85e7e0ea2b853b0e904e0c78f68e54821 SHA512 930347ab3e940c1e06c5046ce2e9f96afc4e4023adb50160619f1f14bc18ed1e93c42067b18894c54d513dfcceb737cd2c16e8aa469cb8d17becaacee9a1e273
 EBUILD telepathy-qt-9999.ebuild 1627 BLAKE2B 40204d9df84e51fca902c110515047f6bf61283939554455c1b47e722016ea395a3b9e77dcf81644598cbff4a779c597bf84652dec419f768711b6b5f070a70f SHA512 1f11ecc8ed3d82d38be52cc1cccfa21c95e26469c45705902639acc7a2eb2e5784348cf48dca5751dd31d831a3e3ea47df6e66d57aed6977d7fabeb9f963491c
 MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
index 03ba4e008414..936f3c5ead96 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit python-any-r1 cmake virtualx
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
diff --git a/net-libs/usrsctp/Manifest b/net-libs/usrsctp/Manifest
new file mode 100644
index 000000000000..93a8a872f039
--- /dev/null
+++ b/net-libs/usrsctp/Manifest
@@ -0,0 +1,3 @@
+DIST usrsctp-0.9.3.0_p20201102.tar.gz 770742 BLAKE2B 94c7b0417a076d627065c625726eb214ec58be90d0965748610f63c076f1c172cb114dc8162af5604751cfe5e86ebf5444f002d07e43c94e461e21f6a3a4819a SHA512 a4bb4dd0ec81b2314e8590cfe5386179697e64d82915a0ef7e8f7a0baf67f88e3da89329ea73b38e8c417668f971f6580e120ed5be8588761b4b334a65ab4120
+EBUILD usrsctp-0.9.3.0_p20201102.ebuild 640 BLAKE2B 7d2ea129e798ba74f2ea6d7c42cfca30c547f98cd3e67882589c679c7267f748719370c423582dbe950da131a51fa4d32bc525d4c97d509b84b23ce28005132e SHA512 9279d6e369cce5d3dc980aa96c92f96fde8357a20ead93c3e3d8a5f3f9ce2d9553e1368b43bef497a74bf5bf32340b4982d97bcf66743b127816ac4f2447f3a3
+MISC metadata.xml 444 BLAKE2B 94ebd1b5ae52b5af59e7b1ff5596001b1103a3d4d34cac46da1269604e3de2898cdd19680757b862657526800845bbf15cd8e7b98659cf8d48e4cd0ebe723217 SHA512 e18d2cafa5ce0e2860f3097e79ac84d66289cbb55a6b9e8649747921a6004e7d6306dd32df9b633edf847ee49476708b27f77b38f6708715cb3848b3ee2774f3
diff --git a/net-libs/usrsctp/metadata.xml b/net-libs/usrsctp/metadata.xml
new file mode 100644
index 000000000000..fb02cc43963d
--- /dev/null
+++ b/net-libs/usrsctp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rion4ik@gmail.com</email>
+		<name>Sergey Ilinykh</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sctplab/usrsctp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild b/net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild
new file mode 100644
index 000000000000..3f61a85db62a
--- /dev/null
+++ b/net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A cross-platform userland SCTP stack"
+HOMEPAGE="https://github.com/sctplab/usrsctp"
+USRSCTP_VERSION="a3e76b281ff5e3469e1c216d47533a73b3b03fab"
+SRC_URI="https://github.com/sctplab/usrsctp/archive/${USRSCTP_VERSION}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( LICENSE.md Manual.md README.md )
+
+S="${WORKDIR}/${PN}-${USRSCTP_VERSION}"
+
+src_configure() {
+	local mycmakeargs=(
+		-Dsctp_werror=0
+		-Dsctp_build_programs=0
+		-Dsctp_build_shared_lib=1
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index bac8c0e92908..acd81099947d 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -3,5 +3,5 @@ AUX 2.28.2-opengl-without-X-fixes.patch 1656 BLAKE2B 85b825f0138a40f6647ceba693d
 AUX 2.28.4-non-jumbo-fix2.patch 1196 BLAKE2B 735a58a9ccfc9fa61a7d8e649262404d3a1b1b3aa257181f026ceb6b6dfd602679d1add974d6930ba2033643cd9cf8bbb3fea0bf87ec85f769d55de5635d6828 SHA512 78c1426f34dacb65090356157963ae0be4a59c4c7905cfb9a59cc5cde766d2931b68872cb55369a74a871f88f4244f3db8ef8d30ee74d8e75acaaa8893ce7989
 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
-EBUILD webkit-gtk-2.28.4.ebuild 8915 BLAKE2B 7e326805f4a7e26f0dcd8ce407921644fe2ce2ee98ea9d0567c73324a9e631221062b940c110eeae1f175b57f2835099f6c6ff2490aeafa0a9d7bec47c07be83 SHA512 70fb22670660db11e1ba1502cd07ee4a273dce7c0c775e1dbea6ea96cf1c9e2fe84f91abcddd0d94f6b895d1121c7a25db406717d0cbd59a48ad79f936aea833
+EBUILD webkit-gtk-2.28.4.ebuild 8914 BLAKE2B 63f6e796093c76450cef123857e6e65205bd66e5161d380d7ac577322eccf280066484be31c47196762065c5285911e678b1d5a39ae5eec7e839a13cc19208b2 SHA512 ad5521cbb22a5efe8cb055d5e966bc155d290cc1c8a0edf66e569025d0c1c4ad04c5b88f33b54662bfd587e3e6c412ca955f0c4d09fe1d6e0f66fe545892f76f
 MISC metadata.xml 482 BLAKE2B 4ddea1fc3fdb0a18e8b6d04197bf34d93b596661d2b3ba563ea0bcf72f1a7db6529caf75f9ff301fb8d21037ebe44541294888f9a5b1d3b00b6fa5950a0c7243 SHA512 c0c614c5141d24a8b280973aa56364a8b451c88b35b4fadff111c232a6b7cad11e9273658db655d68cccc9fc59bb1158e98f806ab02d13896a67aab31a5b43e3
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
index 27ed996c0ab0..1a0c147ba35d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..8} )
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 CMAKE_MIN_VERSION=3.10
 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 4a5c2999076e..f21512611cc2 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -11,4 +11,4 @@ DIST wvstreams_4.6.1-14.debian.tar.xz 21124 BLAKE2B 2af6ec180c3130dd7def733e5ea5
 DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
 EBUILD wvstreams-4.6.1_p14-r1.ebuild 2279 BLAKE2B e0eaac5509b28f0fe5091ff87bae959eb5e23e312e22ba67fd938e3a9f30eace1fc3bc95bc162a8187f61814c9b3f3c2a78f5c5f60363b0dd83e724aee581c54 SHA512 714dff120d673caa3f93a6db3ea3946c5c15b29ee6f087a397bf055b4898481fb71429ee8b727259d1fab485756a10e7ac2b1d417ee6802d912aa5cc1156e100
 EBUILD wvstreams-99999.ebuild 1994 BLAKE2B e18ee55f383342113ea3e7015a209bb1ba13baa8dd300f9393c463c379a5d656a595ba3a3efc1fc19fdbc05b18adc03b95c9002c06f8a29b69bee2eb3de8d15f SHA512 a6346862fd514dc5d320c233c85f1ae90111d285ad6e2593546c69f91aeb65b8d753ccbdf8b663e9787a98a81c0e560ef2709cfb5a7c91ea156c96475e704445
-MISC metadata.xml 567 BLAKE2B 75e97c66b9091dd12ae8cabfc3f1f80b772e7cc835d5fe6fc4399dc837ca0576d567af45186bfdaeaefb862938f82d0b75c339ec73fcb0a5f6abe2b81ce8ed83 SHA512 11ce01ce8844fa3c43e8175c36a0f76266ce43acc9d6ed86156bfddc0b8e5f5ede6ecac9518e329c48fa46a448e57021496e46f9282d6d0cc81133ac9488c437
+MISC metadata.xml 523 BLAKE2B 3e0995913beec728b71c7c7e160f0a43719cdb6a47ab9d7c5ac72262098a8519e3b273bb20c0485e8d2cbce122c34b3f825bd6ee947bfbb6d793ed32af6a838d SHA512 e882c00a8c9148dbe7c1a2cb1fe8b56b78c9821bacb9ae0541322bd535e03a3074696a285d975a823570e0f09822ff0108340c12ea31aa3226bcc4ec8bf1f993
diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
index bc7e48187998..d49958fba1ef 100644
--- a/net-libs/wvstreams/metadata.xml
+++ b/net-libs/wvstreams/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
   <upstream>
     <remote-id type="google-code">wvstreams</remote-id>
   </upstream>
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index b3e20359dc4c..058683a15451 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,7 +1,9 @@
-DIST xrootd-ceph-4.12.0.tar.gz 80601 BLAKE2B 05e31ec3a03d50f36f7ef368705ca8ad064d1d9da4fc3815aaf96ce358da07348aaea264d82884da2782cf7c1069b584269fff9f2a3140057b2d4d2929639f77 SHA512 de55cc923bad3629de6428dbc4e7c7e2cb802512f03f49bcfc79f12221828cd9702f1c9a1bc28b599dce801c937146cf381dfd589c85f4f5721c4fbf13f6ad34
 DIST xrootd-ceph-4.12.4.tar.gz 81253 BLAKE2B 0b3d0e347e02b6948550c44487e0edb1c65075407b444b6242fb3e647e3fe91ff2d03ca10f13b5ae05ffa931eaf0b73a75055999a55b74ec20d8e6b853865f67 SHA512 cd793d18f6162a98f50f605177aae1421227226540fe3e632adae3632c053e78f3b53b1e09f6f60a9c64a5a5e5d019aceaf1ab1c11dde81e5c36512b47ac0ac9
+DIST xrootd-ceph-4.12.5.tar.gz 81838 BLAKE2B a61a814741abd04723755122606eef4544769d5cbe3828977617384a8eaddcfae4591f1ac2515020f300feff5cb11b7af362c15719313085e0f76b5157ab862c SHA512 db0fe7f8713ddf91ce200b364d460206ecf2a08153fb561a99e0780db84ad9d716f9f9fbc3994258e9269fce08d16326c4473bdae200c644cbf4d3bd1144a6eb
 DIST xrootd-ceph-5.0.2.tar.gz 81255 BLAKE2B 529d2c361cc7660cdbb481cdbae1fbf4cd706f29df868c645775b96efa7efaaecd9ea8b7d915c15b5ff78ad1395bb8271a3f1c1105ea0b42dced77efa33acaa7 SHA512 9f8de694a9a864ee0a963bb47c603d2cd3a77b4e13efacdd7f35674016358ce3b0a3fc5850098a29774749f54fa82db12c0e56b55d814873c124d9e19c7c23c5
-EBUILD xrootd-ceph-4.12.0.ebuild 679 BLAKE2B 6171c6bf61a24f633fbb774d23b398160fe9d00ae797d6c40fc2058ce33c4216e6a1a79846d38e6cf489fa3655772441505b30cf372a19e25f6fe5c2398d4948 SHA512 72c4e43a05aee572e139050e2428046f70e1ce2199698998cabc1f3f391f5dd8369a8ed081a39fca733999ca4cca102a2f7a4baf8de9605b127f2d14f5df2dfd
-EBUILD xrootd-ceph-4.12.4.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
+DIST xrootd-ceph-5.0.3.tar.gz 81835 BLAKE2B 1be45c78dd0ec4b20451cfa4a8a579e076e718509a47fa04027207c12e433338decefb9f82749cc15cae3cad75d97485fe0a7d6582cdcc0739bd222bc1d97b6b SHA512 3338a0ab0446e4c7ee3d232f5cce8f93c49e040b4792aa52f9dcf6f27f6767e6ffbaff17eb30a87c5b3ff713e1b0c4edb24d8d116c91351c4ed0c13963f80fc9
+EBUILD xrootd-ceph-4.12.4.ebuild 679 BLAKE2B 6171c6bf61a24f633fbb774d23b398160fe9d00ae797d6c40fc2058ce33c4216e6a1a79846d38e6cf489fa3655772441505b30cf372a19e25f6fe5c2398d4948 SHA512 72c4e43a05aee572e139050e2428046f70e1ce2199698998cabc1f3f391f5dd8369a8ed081a39fca733999ca4cca102a2f7a4baf8de9605b127f2d14f5df2dfd
+EBUILD xrootd-ceph-4.12.5.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
 EBUILD xrootd-ceph-5.0.2.ebuild 954 BLAKE2B 7a80536c0f93bd17977c5dcd593a5657378d5c61e22a94865dbeb9b5aafab7c5b0e82a0ce7cf5bbdb4b42e61bc158eeafacca49f61abf04d8bbb94e7a8548ef3 SHA512 a5313627b4adc03f9fd895b447ca57cb083ce2f7547752c8413d8ae28016d157ecab4ee49ae1690abbaef2a7c62275eba352101bb18d74c8703a9e0bec53710e
+EBUILD xrootd-ceph-5.0.3.ebuild 954 BLAKE2B 565b9a4620ff0000655371303456753cd5f55cc37915f52f1a89db7c41d63a2fc372ab0f3774b7078cc170e877d1700d2f1f92643d8ee7b14989f0cf7fe509fa SHA512 f0885ec159300aa1fd2da04a611105097cecb4511847ab917e7da111ee304f20db7a02115c365203103e41a3129460030dd038359e5a98e54d7f8cb8497a80d5
 MISC metadata.xml 496 BLAKE2B e2a202798936cfc2061b2660ab7ad32a4a4c02aab9789e46bdd5981795815505da531ab2891c9022447d2154b6070ddba3e1daa68f25b2373757cbe17d960a6c SHA512 43fa4446767cb279125fdedcaf415af260c42871460fd1144aff7bf47769070da9e9c4fc0e8b32c87fdd879f8dca24586a0764f0ad8a3ba715e1d95e07d60f70
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
index f701427b94c7..9936f476eb33 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 
 DEPEND="net-libs/xrootd
 	!<net-libs/xrootd-4.10.0[rbd]
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-4.12.5.ebuild
index 9936f476eb33..f701427b94c7 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-4.12.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~amd64-linux"
+KEYWORDS="~amd64 ~amd64-linux"
 
 DEPEND="net-libs/xrootd
 	!<net-libs/xrootd-4.10.0[rbd]
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild
new file mode 100644
index 000000000000..873a3d79a050
--- /dev/null
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
+HOMEPAGE="https://xrootd.slac.stanford.edu/"
+SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=net-libs/xrootd-5.0.0
+	sys-cluster/ceph"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-util/cppunit )"
+
+# xrootd plugins are not intended to be linked with,
+# they are to be loaded at runtime by xrootd,
+# see https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so
+	/usr/lib.*/libXrdCephTests\.so"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+		# As of 5.0.3 the default plug-in version is still 4.
+		-DPLUGIN_VERSION=$(ver_cut 1)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index f7ac2e291aa9..7d75eb5ffbb7 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -5,10 +5,12 @@ AUX xrootd-4.12.4-http_secret_leakage.patch 1339 BLAKE2B 47ff77bbc2c5a4d2ef0dafb
 AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
-DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
 DIST xrootd-4.12.4.tar.gz 2577360 BLAKE2B f2e4413bcbf02dccb1ac7b0ceec8fbc2bb8b1de838cd9753c9d61f76fc2d68e845a41075b63a4afe56b1a434cf89ecf4f4b8571fa9ae866a19e6bcadcc5dcd9b SHA512 8cbc5e5f270f39c48b7c75a15e2721ebb793f13419608834777f39bc0ee7dd8c4fad481367f997172dae5029d9e5e4e9d7870843bd5c9957fa9fe439592c4364
+DIST xrootd-4.12.5.tar.gz 2580794 BLAKE2B 217abb8ad332b3eb0cbe2289f4fa7c31abce7c3122ef8d23f409a3a03b7691f0e8a1939a42c831774e6902bf0f3242a2583bbf010478a66f5a2e634008799c5b SHA512 c252866ccdc4465c9ffe3f5cb4bb83a2a70e775db5ff3a55bcd8ac70c72d280ea41fb31501f30550d8ac61b6d474ce602e0ee8a02485f1f2722617aeb25aff0d
 DIST xrootd-5.0.2.tar.gz 2764503 BLAKE2B 35bc642d3601738135ff24a77f9bc8795568553856284ebe80d90315039d04109353d2e00310f8b8168f6b1176ee295c9116a7e6adaff33ca23383da9deecf17 SHA512 e58b5484c0fa9f83643e252eb8228f2061130b4f97964283a6adb8a81560841f3d44814572136023d944be6bdd97cff551e75bbfb04e6c9aafaa779ecb051255
-EBUILD xrootd-4.12.0.ebuild 2517 BLAKE2B 80d5848ae7082e174e89e877d468929fb95ffd8663a74d1aec792ecbc533c7d3fbebd8405e78b2987aa055345dea02a4d6d60cd34657ed72b2eba0509adfd003 SHA512 56e62ed7a09bdd941a01bcac483e852cdb6fb12f241266af3e004361729bbda789299b32077bfe48116e69f9b87bebdec4ccea79bf4ae2f017f43c705d3c524d
-EBUILD xrootd-4.12.4.ebuild 2603 BLAKE2B d1a63f322e8b1ac35560cc8a0b4769fe10c83556171a2c434af40d6d70787b6a6356ce100fab44d5e202db11806737d7037357d2fb4db1395c34f7ba18afb4f0 SHA512 d18c1fbad414b4cf4f94f6123749880d4d3369a7479aef27554ce03b0ff0f61132f5c1ec79a169112cb7cf1d547ec515ba178ccff7d5de5c784b8613037c88bc
+DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
+EBUILD xrootd-4.12.4.ebuild 2601 BLAKE2B f611a35164556ebe4a73b94b5bdf1a95c0d7c2babb35f7db432a73772c4c0344e4e4296f159960157059ae78bc8b73c50caa545ef0c2aa429dbd044b0f732a3c SHA512 091c283618469e7f247d0ac83c37be8c231c13343159fba60a3f45f95a700f26a8c5ee3790d7cab18503d4c4704aa30a3a018e5ef05a60614d2e0da2e00f8bb5
+EBUILD xrootd-4.12.5.ebuild 2603 BLAKE2B d1a63f322e8b1ac35560cc8a0b4769fe10c83556171a2c434af40d6d70787b6a6356ce100fab44d5e202db11806737d7037357d2fb4db1395c34f7ba18afb4f0 SHA512 d18c1fbad414b4cf4f94f6123749880d4d3369a7479aef27554ce03b0ff0f61132f5c1ec79a169112cb7cf1d547ec515ba178ccff7d5de5c784b8613037c88bc
 EBUILD xrootd-5.0.2.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
+EBUILD xrootd-5.0.3.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/xrootd-4.12.4.ebuild b/net-libs/xrootd/xrootd-4.12.4.ebuild
index 105a4611edcc..89ccb0b92650 100644
--- a/net-libs/xrootd/xrootd-4.12.4.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/xrootd/xrootd-4.12.0.ebuild b/net-libs/xrootd/xrootd-4.12.5.ebuild
index 3974f5488b24..105a4611edcc 100644
--- a/net-libs/xrootd/xrootd-4.12.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline ssl test"
 RESTRICT="!test? ( test )"
 
@@ -42,12 +42,16 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-4.12.4-http_secret_leakage.patch
+)
 
 # xrootd plugins are not intended to be linked with,
 # they are to be loaded at runtime by xrootd,
 # see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so"
+QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so
+	/usr/lib.*/libXrdClTests\.so"
 
 pkg_setup() {
 	use python && python_setup
diff --git a/net-libs/xrootd/xrootd-5.0.3.ebuild b/net-libs/xrootd/xrootd-5.0.3.ebuild
new file mode 100644
index 000000000000..b96f560be940
--- /dev/null
+++ b/net-libs/xrootd/xrootd-5.0.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+# Upstream does not support the building of Python bindings
+# via CMake for more than one implementation at a time.
+inherit cmake python-single-r1
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="http://xrootd.org/"
+SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fuse http kerberos python readline ssl test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="acct-group/xrootd
+	acct-user/xrootd
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:= )
+	kerberos? ( virtual/krb5 )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		python? ( dev-python/sphinx )
+	)
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+"
+REQUIRED_USE="
+	http? ( kerberos ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+
+# xrootd plugins are not intended to be linked with,
+# they are to be loaded at runtime by xrootd,
+# see https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
+	/usr/lib.*/libXrdClTests\.so"
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CRYPTO=$(usex ssl)
+		-DENABLE_FUSE=$(usex fuse)
+		-DENABLE_HTTP=$(usex http)
+		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_READLINE=$(usex readline)
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen Doxyfile || die
+		if use python; then
+			emake -C bindings/python/docs html
+		fi
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doxydoc/html/. )
+	dodoc docs/ReleaseNotes.txt
+	cmake_src_install
+	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
+
+	# base configs
+	insinto /etc/xrootd
+	doins packaging/common/*.cfg
+
+	fowners root:xrootd /etc/xrootd
+	keepdir /var/log/xrootd
+	fowners xrootd:xrootd /var/log/xrootd
+
+	local i
+	for i in cmsd frm_purged frm_xfrd xrootd; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+	done
+	# all daemons MUST use single master config file
+	newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+	if use python; then
+		python_optimize "${D}/$(python_get_sitedir)"
+
+		if use doc; then
+			docinto python
+			docompress -x "/usr/share/doc/${PF}/python/html"
+			dodoc -r bindings/python/docs/build/html
+		fi
+		if use examples; then
+			docinto python
+			dodoc -r bindings/python/examples
+		fi
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /net-libs
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)