gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /net-libs
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
105 files changed, 2129 insertions, 459 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2f6e32c53300..96368716adf1 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 911c8cabbf13..4fac38b6bfbf 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
-MISC metadata.xml 342 BLAKE2B 0bf9cf1a12561f8866abed7cdc86bcd8c7d669455c45124a7fa75245b5f824a43c12ebb32a068e941a34bf592555f400dc8d6564c498823038c9579a1fbcbedc SHA512 f31c89fe2a274397cf78c5b95f019090fcc80bb898f29d8beadbb3615425ae960f2d779329e96a2dcb0645021c8fa102110b82df8b353de28d1c9a717b44f38e
+MISC metadata.xml 293 BLAKE2B d7d3b8ac438d348201f1ed95a571b9a6caa6d0790b5cb10b0517e1bc0b4c0865f95c9405921c8591cb9919042c6d187ba907961db76608cdd7639bc83db6a3cf SHA512 acb2e6fd914b139a5ac76ee86b966fdcca5a51df6e343b47180937321d0d5bf2269cf6acf515596e7e88297af54a7dd09c5274c8c3468d96f916d53ae25cbc00
diff --git a/net-libs/aqbanking/metadata.xml b/net-libs/aqbanking/metadata.xml
index 917a7c0d65ea..37b6319e1ff4 100644
--- a/net-libs/aqbanking/metadata.xml
+++ b/net-libs/aqbanking/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hanno@gentoo.org</email></maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="ebics">Enable support for Electronic Banking Internet Communication Standard (EBICS)</flag>
   </use>
diff --git a/net-libs/balde-markdown/Manifest b/net-libs/balde-markdown/Manifest
index 682ec0dba587..9779b0a23e58 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
-MISC metadata.xml 618 BLAKE2B bd728fb80f8f1fff6eacec83f961bb67ed301a494e77de40b31846a69385febbe7bc4a690c517a209d02c5923605e5d814b98887aad931538b5b6106316ba04a SHA512 daeb67e040a4de1d728268acd0ce8bb013c4b055d8cf5fdb7bb2985a6de42df2564195d4a2abb8eff49a464c7f69c610612a5a4a66e576f03a1293160ecd7662
+MISC metadata.xml 521 BLAKE2B 6afb26701f579fd511ef204d5c9da2cb22b8aac65a72932603fda2cca522afb2584f2a36cb6908d303e42953a677653fb0946d0f3de613d745271be7dfc17c72 SHA512 0abb67c78d16507170e686c71c08adf4749e19549c7c7a02fc391f8df69fa3973a98aa805c3436a3beb97e4b7f37e353f548e19027115b41542b255384e7873f
diff --git a/net-libs/balde-markdown/metadata.xml b/net-libs/balde-markdown/metadata.xml
index eb24f7a037d2..ff927b8ddd52 100644
--- a/net-libs/balde-markdown/metadata.xml
+++ b/net-libs/balde-markdown/metadata.xml
@@ -5,9 +5,6 @@
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
-	<longdescription lang="en">
-		A balde extension that adds Markdown support.
-	</longdescription>
 	<upstream>
 		<maintainer status="active">
 			<email>rafaelmartins@gentoo.org</email>
diff --git a/net-libs/balde/Manifest b/net-libs/balde/Manifest
index 044f450f9e9c..566e526ad31f 100644
--- a/net-libs/balde/Manifest
+++ b/net-libs/balde/Manifest
@@ -1,3 +1,3 @@
 DIST balde-0.1.1.tar.bz2 360412 BLAKE2B 88f25e7c409c61f45d5fca0664d3602fd206caade28977d7d38d5626fdbc423c76cc8dda2c5829ea2b6b2f79dd9897b3a890b9a5a862d6defad4e11808edab54 SHA512 fafb9e9344ecb1caf6a4451b99adb3505fb728015e2bcce3d81162f679a70267e49a0dc194c6c977a7a155f9b5ae3318fdfcb63fb0223e43943c0fc5e8503acd
 EBUILD balde-0.1.1.ebuild 1039 BLAKE2B 9f6ab738553a7e8562ba8f4e0f34c057229e9b7e5b5036b48052bf1c0ef1d446be15431f216c0d1b15fba3eb77c75f6e1d1db7e902d07027ceb7f8438ad8b785 SHA512 5a8e8338b705666e0a099e69e5f31fbc32d1329c82146c89319a8340f2c9fdf60d59c2ca63e73515088045296e81c6a46a5093eff4f0cb8927d8903dd98db074
-MISC metadata.xml 620 BLAKE2B e5eaf49ef174cbe142d71db5c1355ad0437fe74a25eda55be063a9dbc9e535325519df4f64b89dce4aaaed03ee8005debc1dd4bafc080bba538ff0890749dbef SHA512 3b2647198c171ec5a7a58d03c8312eca6fe5cf5011b3472a28cdff2e934fd69df78fc80ebb6b6d78d651b6a326750dba3156456680c048ff3e4747aff7c20b23
+MISC metadata.xml 512 BLAKE2B eb6736eb63356f1f1be268f5dd71d933e2ebebce1cd1c66447c66de64f302c6a20a597c495dd25c3183a75f4538cbb4d4410f2a032ec4965fdd6999dffc7e8ff SHA512 f4055a7446a1b9e258e7cf677280ddc075c45f5c2ae88dfe2ca10a4408b7f8692fb6f438d872dd4aade82bf15e34b9e868a3558ad42a6abe7124b57d6def1ea0
diff --git a/net-libs/balde/metadata.xml b/net-libs/balde/metadata.xml
index 77a6a96e754c..0f38d300d55b 100644
--- a/net-libs/balde/metadata.xml
+++ b/net-libs/balde/metadata.xml
@@ -5,9 +5,6 @@
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
-	<longdescription lang="en">
-		A microframework for C based on GLib and bad intentions.
-	</longdescription>
 	<upstream>
 		<maintainer status="active">
 			<email>rafaelmartins@gentoo.org</email>
diff --git a/net-libs/biblesync/Manifest b/net-libs/biblesync/Manifest
index 3862d93181d8..96718069f0a3 100644
--- a/net-libs/biblesync/Manifest
+++ b/net-libs/biblesync/Manifest
@@ -1,7 +1,3 @@
-DIST biblesync-1.1.2.tar.gz 86620 BLAKE2B 05ae9aa155a7cfd277e1f1a172ae3551c51a34cf09c7acae0821f08146179f4726173b8a26d4bac1a82aebab89f4ac105a73f7ef2a2d36b7939fe73d4e0749e1 SHA512 7725c8228e2dff79edaf065ff4d4816a6cf214d1d874817345cc4154142144bce479ca1ae871053886bff4f6610715a27bce81c25c2a636444d5873e93bfdc62
-DIST biblesync-2.0.1.tar.gz 89139 BLAKE2B 065b65d3f1f288b8a5160b5feff56f152db47eb5c03596c192b904f384e11e24a3846cc6b154d351400c6e252188f126d37281278acfbd8b47321cfc25e1b0f3 SHA512 92c86a503dbcc22542e6f15d5fe1b5c282f209b9d4208e82bcf5207b05ed7ca33b6223a496f50108d7c28eab6e14ee14a37ccada6d0b08315ea31c0aeeae2508
 DIST biblesync-2.1.0.tar.gz 87868 BLAKE2B 2a136e4840f6f3cb3f03aa127adc978f9f5f189d48be198e4cb5b0ec654ae4a28f3fac30a10640d6fd2b1c3555c6bd88527e51e34287424f953cd599c5915521 SHA512 c6637954c0d9cbe9ba03048d92288d52c3675eaa9770749690222bd76d45ec7f138d67a4e416c33dbf9864f623f919f117aea58b1bb35feed8bcf59daad94e8e
-EBUILD biblesync-1.1.2-r2.ebuild 610 BLAKE2B 5018274824eab67f8d066c05dc4964d54b0c3f1813bd43bfc645ec517c0ea0b0105165b1c92ee6be321b016a2c6bb779884eb6de0e4c74c09bab36395bb41b80 SHA512 d2d451f5b0014e29a80eb719bdb74ac092280c951fed07280da64160e5b0ff76449da8bad649f09a049f5a35379fb1c548287a43660bdd779fc62f6f04aeced1
-EBUILD biblesync-2.0.1.ebuild 595 BLAKE2B 0b483df4320c0cf251f29e20e8fe02a6a03ba133bf0f4b72935f267e9f03d6f9522c6eaf730d41c564550784955e6d1a2658af82a4a2039562f692c2786dbd3f SHA512 23a66d4acb098cd6d1605ff42685c196364d30852276e85bd877ef632246d43b59437adbd95f67f8b4c99665ae21470e6f88147b0ace2cb346e969b2242e5a7f
-EBUILD biblesync-2.1.0.ebuild 598 BLAKE2B 10f0f44a976f9390c7bc300467611f3cf902e2e809de31284432587f1558798791017f48dc813af1a1c76eb9a57c91e6f3b82100c68f91bf0e04cb8c017c11a1 SHA512 8c41e055267a6dcccd1cfe0941f8122cf81ceb2e2f4bf689192f795e550844646373b01ba933171de0d14484f4efdad3b0561c06e84e4f36a16bafbe592f2d36
+EBUILD biblesync-2.1.0.ebuild 597 BLAKE2B cddd837727299f2b460e7de1fdec91db1593f952c2573fba3cf7355394f12c91002ebdd395157e24008d2a7a5926176ab20d5877e9bb5a106a0a8efa4fdbda41 SHA512 3e80e735138b8a892e11ed4da1a3380cd1878c9002868a3154991f1e755ff5ca2b2e6c9e92484f0b4f31fdc54e5bc78c01d195517d8f942c84ec951c336a179f
 MISC metadata.xml 446 BLAKE2B 3518b88c0fd0f6318378d06fec9b17effe4345e097663847dec7aeabcb5bbe3c50e61c2120c20751eaae84b0fd0f45ea166be5143091f9c6e757504bf9ed6e69 SHA512 1290c95a6b91a71efcf56c8d70b4d5ea5948930e5e5ed6a8adf146f314c6b5e01f202485509d9bf7120431d9550844219e37be39b45d4bec853a78baa4ec8db6
diff --git a/net-libs/biblesync/biblesync-1.1.2-r2.ebuild b/net-libs/biblesync/biblesync-1.1.2-r2.ebuild
deleted file mode 100644
index 88b12f465aaf..000000000000
--- a/net-libs/biblesync/biblesync-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="A multicast protocol to support Bible software shared co-navigation"
-HOMEPAGE="https://wiki.crosswire.org/BibleSync"
-SRC_URI="https://github.com/karlkleinpaste/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="static"
-
-DEPEND="dev-util/cmake"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_SHARED_LIBS=$(usex !static)"
-		"-DLIBDIR=/usr/$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/biblesync/biblesync-2.0.1.ebuild b/net-libs/biblesync/biblesync-2.0.1.ebuild
deleted file mode 100644
index 4dea0979995d..000000000000
--- a/net-libs/biblesync/biblesync-2.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="A multicast protocol to support Bible software shared co-navigation"
-HOMEPAGE="https://wiki.crosswire.org/BibleSync"
-SRC_URI="https://github.com/karlkleinpaste/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static"
-
-DEPEND="dev-util/cmake"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_SHARED_LIBS=$(usex !static)"
-		"-DLIBDIR=/usr/$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/biblesync/biblesync-2.1.0.ebuild b/net-libs/biblesync/biblesync-2.1.0.ebuild
index b77fac3247e4..67b9adb4d38e 100644
--- a/net-libs/biblesync/biblesync-2.1.0.ebuild
+++ b/net-libs/biblesync/biblesync-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/karlkleinpaste/${PN}/releases/download/${PV}/${P}.ta
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="static"
 
 src_configure() {
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 6fb601393b03..d4c272672b73 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,6 +1,8 @@
 AUX courier-authlib-r2 978 BLAKE2B e49effed437cc9fd76404054e014a87bf2a207c68c1a440293d73da748d423aca137031a2b043e832f5009f2384f3f7ae352c2d10dfccfeb6082fd42aa1513bb SHA512 8681f041431150027f41058ae8dd5fb2105a74caecb096aef42b1f0e255026c2f8509d9f688f2725ab1e12b792604cb481a95a6eeb177967c16ae5e3390f44d4
 DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
 DIST courier-authlib-0.70.0.tar.bz2 2183323 BLAKE2B ebf58f8c4e7b58766edc684ced590ea7bfa692eff19a483f4ab7748a73e96e1c66858985ac89e281205838660a72e9a33e3b3c28fce3f94d981b61ca56b1e2b1 SHA512 61ce62860cc7ceb51f255a0659bf9b8f4172d0c1c8aee06d9821144330f9526f54e6bdb0158f2fd754d6ad92fd4cc84306b949d46c92e8aed47a397023b36b65
+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
 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
new file mode 100644
index 000000000000..b76a874e6b5b
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+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"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+		>=net-libs/courier-unicode-2.1
+		gdbm? ( sys-libs/gdbm )
+		!gdbm? ( sys-libs/db:= )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( dev-db/mysql-connector-c )
+		pam? ( sys-libs/pam )
+		postgres? ( dev-db/postgresql:= )
+		sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index 00b86fb33e3f..f446e42aae62 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1,7 +1,4 @@
-DIST courier-unicode-1.3.tar.bz2 394011 BLAKE2B 5d5c2a9cf04976819f2bf1d01c9193fd5ef441461cebeaec4b53d9a9402fb97b605d6ac08d4e7339f56d39d4bdd85693990eefd90c4b5a20788d8b5fd9413156 SHA512 4384874f0f2298ff5034d7541ffd3155a3aa6a6b2d73fb108b5072a0dd0bb8236389b83161625bed7f923f724fa11bbed42af28234d5c6e5b6d370c407e8f677
-DIST courier-unicode-1.4.tar.bz2 434338 BLAKE2B 6274fe8a73b19e9e3694219aadb192f73d101cd3966d67b1c0e28c0271001a5b263a43385b73a473b6a263bb6ab7ef94faa453fa9a7f0c15bba4691b6ab421f5 SHA512 1d9cc3efbbafa88631e37de0647d2e873a8264a02a0ce588687b90e15dedb60c23058312abbc771ed1ddf824ba7c81b16adebfe9db69da953b9856eb66d31264
 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
-EBUILD courier-unicode-1.3.ebuild 475 BLAKE2B d44f8fb295bdc8df8bc64dc4cc86aff458b7c28bc44028450f78bb64cd491b3127e7ee7386b800eece89318d46537b5e414b839b478849060caf8453a3872180 SHA512 6876e3ba2222a11f0a916367366940f31c909fb74403a1cf0f9d3866d0f297d7218b1d1168b5c85740f4c24ba2e0d66f9ed6857d2bfb9a5e98b694ba34daa35f
-EBUILD courier-unicode-1.4.ebuild 489 BLAKE2B 00977d1e1bbf92321dbef743cdb1d7a516fcd9fb29d406fac5239d73fe3cc2bcba80c0a90d482a6aced8fad4361488ce3375f0c4bfdf7d3ba14ed6315c1219ee SHA512 0a08a41e9ea98b052fbd3cb422fde2528443ae521ab9f2b28e9f8944ede4d17221223ea9cca2ce516f30064d1e9e613354ac476fadfa2668281932d064e8c06c
+EBUILD courier-unicode-2.1-r1.ebuild 531 BLAKE2B ed1d91d72c3f3250d915c81815ef41c2a20230cf3f864883e4f040dcb01c59f6e2ad2cab0120eb128f5ae6b17706606a84ff3287709888c65136005e984bbb80 SHA512 5f2c5d1bf5ba7cd72848274d9c25888e84effe36660351b3509fb8b4cb0d3e963584746eab443e81e05febaa80d2990f2725664315e073fd803d567bd7d6f4f7
 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-1.4.ebuild b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
deleted file mode 100644
index dc8ad633e81f..000000000000
--- a/net-libs/courier-unicode/courier-unicode-1.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils ltprune
-
-DESCRIPTION="Unicode library used by the courier mail server"
-HOMEPAGE="http://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"
-IUSE=""
-
-src_install() {
-	default
-	prune_libtool_files
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/net-libs/courier-unicode/courier-unicode-1.3.ebuild b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
index 56ea09b29057..c1fa20228287 100644
--- a/net-libs/courier-unicode/courier-unicode-1.3.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="Unicode library used by the courier mail server"
-HOMEPAGE="http://www.courier-mta.org/"
+HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 	dodoc AUTHORS ChangeLog README
 }
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index 7f48f01d954e..570984668523 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -4,4 +4,4 @@ DIST daq-2.0.6.tar.gz 518013 BLAKE2B 702ab20c776b9047230bb1ac36574068e461a850ed5
 DIST daq-2.0.7.tar.gz 520287 BLAKE2B 799a8e240c9e359a08ac74ef4fe0d92882d4635f270beaf5f5077bb20cc200d6cf8c55e2c68a59ecabac361ce00619d66ddeb4d7e9a25094b16b3a858673099f SHA512 9bedddbc2d952526ab4e1d65f4507eb914507f8b3b5702ecf7137f8a210c690703469162a117a76cb8376a5639db46bd767fc48789ba7294a0bad26d4cd0ede2
 EBUILD daq-2.0.6-r1.ebuild 2053 BLAKE2B d47824d0990ffbf3d91ab7af37b72716983bf491f465c48169b6cb87bd3ebcb4b08a25514262dc207b6bcc68586119c84ae63f9d1274d09d75197a9a521edf35 SHA512 2131265fcf2b167b6d8b2f51edcf614cae22090feda1e44bb42167ad3f5b5b6f81c8892a0d3dac7bcdb75c187caa156eab8e17232268c668c33c510f43b490ef
 EBUILD daq-2.0.7.ebuild 2055 BLAKE2B 0590830a5cb57f6c89cbda9d8de1cc239a2eb7b42d05c27ca03b640529659681d0e4f912649b49f5d681f6275e4e158cc2987bdb2e18c5083b8e14ee7a8b4f62 SHA512 8dbbd565bb209bad4cb947ae6534529a8212769420cd6a81d3cf06ca19d9db5aa36a78a75ad5cef7a7c08b082487b00b09fec1f51d45d537acdf666f0ccc1066
-MISC metadata.xml 1416 BLAKE2B 33ab28e9bac28d75031405b2ce3b47f2b797d244853bef86f586330a1bc7558a21edf325297e0aeccce08e5eefdd29fad45cb50da6f6e6d62ee82c56d7c17b81 SHA512 77a8d9f238958948d3582b3d9a9bf859c03bae5d544728270a18a5db1c221745c4fa7044fb1959e4b0811864f33de5f9bae67bcd25aa6c74d3ca74f386e6bdaa
+MISC metadata.xml 1314 BLAKE2B 167ce20e3e0130835e68309dedcbaac8313455fe7bdf680b00975ebec436d554c4c9d44c71e5b42b4af4b0aa7f7ea5eb7a0d1993c0ee37a0cd1d5267107cc9e1 SHA512 8eddd30b83bd5f03280d208ce11df9e388adb7df2fdb9420bc7fadf6956b85012e0ed6a5fdbace36c5c5f65ff8e711a749da2eb17bf585c6223cfef95218831b
diff --git a/net-libs/daq/metadata.xml b/net-libs/daq/metadata.xml
index a114c5f02043..eaf9ae2dbbb0 100644
--- a/net-libs/daq/metadata.xml
+++ b/net-libs/daq/metadata.xml
@@ -9,7 +9,6 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
-	<longdescription>Data Acquisition library, for packet I/O with Snort 2.9 and later</longdescription>
 	<use>
 		<flag name="afpacket">
 		Build the AFPacket data acquisition module. Functions similar to the PCAP 
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index 701ef0941e77..bc87301a3042 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,5 +1,5 @@
 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 538 BLAKE2B 7d9784a0bdccf0a5014b9457844dd57df260a6b3202c24ceacc319624c8f5c942a217101585fbf92acb52fbee1c01983d713e6defee97b330c92413d47809c61 SHA512 24ef576735bdf29c847af34795ee3063782f7862799405aa3babccf6136fb21e8a66aa411174c1e753c5e5d174947a4422676e3f7b8ecb59a6573a6784639026
+EBUILD enet-1.3.13.ebuild 545 BLAKE2B 7430ea25eb67c8a54555fc53ce0359648599c57ea5f9f30755c84a3de70a2f589308a383fff1fc2c3feb825526db09c9ec3f3d0173b364b91eea8142e2a0b024 SHA512 81cb8b631b1ac0f3970ee3579ecda67be7a57bdd8111a5344e0527a1c24c597d3e7533c3f8b934589cd3aae5b70f5598f3a09c761a310e2df508beae4fe03c62
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/enet/enet-1.3.13.ebuild b/net-libs/enet/enet-1.3.13.ebuild
index 2ab311079d9e..55c0fcdcfa0b 100644
--- a/net-libs/enet/enet-1.3.13.ebuild
+++ b/net-libs/enet/enet-1.3.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.3/7"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="!${CATEGORY}/${PN}:0"
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index a0079a0a89e0..9eff62550a28 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD glib-networking-2.62.4.ebuild 1740 BLAKE2B ac40d8d2c90eb77fda52322bdf85449b5329f65bbac4f87330e1370eceb03bc0418a810deb32b86b816d3c31f32dab1a09f1d9521edfa4c74202d9dc4ee19deb SHA512 a7f8feaf0c269a4f4093da2d51f866199aad8ec5487ce6eb4b340674d26f7aaaf2db737faa7635e343a2e253b2b22f63b641e2505d603c784d8780df3fab9d44
-EBUILD glib-networking-2.64.3.ebuild 1744 BLAKE2B 5cddcdf4a6ac2cb7c59e93bd0fc4a05ceb6355ff281c571f3df40d8c5344afc8a9b4520b77998dd7e0d4ec0ca6dc56189c24bfdfee5599a39b32a10e9d282adf SHA512 a6fe537e5b403837c39e07f46a8de3042d55335adc5981a85908caafa30a67c82ed7030332a0a9b7c254e82b6ce31a8559af660371992ca2a9af9a29c95cb0b5
+EBUILD glib-networking-2.64.3.ebuild 1742 BLAKE2B 0b882825f79cdb2dbf018b7af7180bafab84c47202d18fb79ee1dd4a7ab5d0f5d62487f9d94a55991fe108d3d0bc28876dd2092492cff798764c51fadcd5475b SHA512 755ddaa5650d1d557a2e0144637aec3e937247e840aaecb44236a357f475fb9b47fe8af7a741aeb1776887b065c77c431bdfe2d5d4c1dcfe7b18fc924978dba8
 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 9dd87ae168f3..aa91a71dc296 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/gloox/Manifest b/net-libs/gloox/Manifest
index 3e16a4d508b9..5d64eb306df1 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,3 +1,3 @@
 DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
-EBUILD gloox-1.0.22.ebuild 1117 BLAKE2B cfe30d6bac3e249c88e6825390c504405eaaea78442359d4297c6a0a3cc4f167dd5c1eae12c6d34856a833b4a83247c16123e740b637dd2e7bc6b6c546c16492 SHA512 37ee7375502d50d168b2f79b4d8656424094741fe11c6c9b8d50ea8512fdd0218516c2644d57bbfe6aef4cfdd2f635539bae2c9add09a3cf0f2a0addb279893e
+EBUILD gloox-1.0.22.ebuild 1124 BLAKE2B 5dd191732bd7ee3c09bbb262189a5ad2d6fe73a4f6fa8834f804072771a5e3624f4504a1678b02fa8c3957502d7187a7832dfcabc878409a9c6f6f15dec6f65d SHA512 a12832ab6146e042f88bedab8c53ad683c46379fde248f61da2d103b90e06977d27ad32fded46eeb32fca873e156ad5b794c0e126110e76cc3bad594dbdcf2c6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/gloox/gloox-1.0.22.ebuild b/net-libs/gloox/gloox-1.0.22.ebuild
index bf7eb1980c80..683420569f62 100644
--- a/net-libs/gloox/gloox-1.0.22.ebuild
+++ b/net-libs/gloox/gloox-1.0.22.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
@@ -10,7 +10,7 @@ SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug gnutls idn libressl ssl static-libs test zlib"
 
 DEPEND="idn? ( net-dns/libidn:= )
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index bb06d49c0735..c5222caeea4c 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,3 +1,6 @@
+AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0b579d77483b9fc0f779bb24e3ba50953c2ca2b2bfc7774861085da3d9709fdf250c450cc77aa312095f816bf67748b5d2b5bed4f43ee SHA512 6f2dc20dbdd27875a964aa806380556f4a3da1d2c0c4f7337e0845fb304319b5b9ad94ba519982a4db75486f673a717e20c294487b2d3e339bf7d144a0f33803
 DIST gnutls-3.6.14.tar.xz 6069088 BLAKE2B a1cd88a7c977f3a94a49e4187878560a8d9589a6fd32d8ad41b84c33534597fb85a88cf6b260a4a5e8b1a100790a7ba701acac2368f1ad42dcaba7e5c90b6758 SHA512 b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604
+DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
 EBUILD gnutls-3.6.14.ebuild 3985 BLAKE2B f8800a3883fbd2f04ac22f51d6486558ea48aae6393acde4361e1f634a74dfd0b9dbc1311fb8813725dfd14f45ad8f33e3338189fefcf554540c85df244181e2 SHA512 235d6a4c22ec21768d6feeb05f83cd7fbbe31ba78c20380cf7530ee17aa82d50d1465959fd62d5bcbd8c3cda4394600820f94a34c95e70b36592c778a8da6a61
+EBUILD gnutls-3.6.15.ebuild 4058 BLAKE2B 6544afa7351798f110bd2583fca628277fa06c28ea1d745387ae2c013eb3367b0e736d4ff2672ac42215ccbf4a61a117266bfb88f29f90f867bcc4ffcfe95635 SHA512 ebb218b617a5b1ffc31f7b19272504a65f4ec167e69e5dae4da803bfb07892880c412d626f6ce477a2f36b72748371d245c26f6518f74e51d3f28eb3cdf7fb65
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/files/gnutls-3.6.15-skip-dtls-seccomp-tests.patch b/net-libs/gnutls/files/gnutls-3.6.15-skip-dtls-seccomp-tests.patch
new file mode 100644
index 000000000000..dad6cec8d3df
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.6.15-skip-dtls-seccomp-tests.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/649396
+https://bugs.gentoo.org/711104
+
+--- a/tests/dtls-client-with-seccomp.c
++++ b/tests/dtls-client-with-seccomp.c
+@@ -27,7 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#if defined(_WIN32) || !defined(HAVE_LIBSECCOMP)
++#if 1
+ 
+ int main()
+ {
+--- a/tests/dtls-with-seccomp.c
++++ b/tests/dtls-with-seccomp.c
+@@ -27,7 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#if defined(_WIN32) || !defined(HAVE_LIBSECCOMP)
++#if 1
+ 
+ int main()
+ {
+ 
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.6.15.ebuild
new file mode 100644
index 000000000000..a9afddeafef8
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.6.15.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen:= )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+#PATCHES=( "${FILESDIR}"/${PN}-3.6.15-skip-dtls-seccomp-tests.patch )
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	local libconf=()
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	local myeconfargs=(
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable guile)
+		$(multilib_native_use_enable seccomp seccomp-tests)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test-full full-test-suite)
+		$(multilib_native_use_enable tools)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+		$(use_enable cxx)
+		$(use_enable dane libdane)
+		$(use_enable nls)
+		$(use_enable openssl openssl-compatibility)
+		$(use_enable sslv2 ssl2-support)
+		$(use_enable sslv3 ssl3-support)
+		$(use_enable static-libs static)
+		$(use_enable tls-heartbeat heartbeat-support)
+		$(use_with idn)
+		$(use_with pkcs11 p11-kit)
+		--disable-rpath
+		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
+		--without-included-libtasn1
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
index 27ae7bf35940..ddfdccf737dc 100644
--- a/net-libs/google-cloud-cpp/Manifest
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -16,4 +16,4 @@ EBUILD google-cloud-cpp-0.10.0.ebuild 1619 BLAKE2B 6fbec550d4745ac11f9cd61f37812
 EBUILD google-cloud-cpp-0.2.0-r1.ebuild 1692 BLAKE2B e140396a1b9dfe47a282733c8b50961a2f820e728556a0a26c4ab66769c95bd3af5b63484af7b7034939a62731d190717d21225df6bab8c41034fce04bb847ad SHA512 d121f5d5c913f740652440e7583079aad68b1a1d03ce79145177a0ed9ff8117e7d1354c116be50623b7b7a60fd58279385b3e40181bd23eeda82b7697d140b5b
 EBUILD google-cloud-cpp-0.5.0.ebuild 1668 BLAKE2B 07e76db614ffc35f1accc059f6cfefdc7f75009618ccfe04a69fb017babc52f9177d7c6bf8c44b64f9787b16d82c3776e56f0df7978c7eec42284bda1318fc97 SHA512 da75dae85dcfbc839b95dd00bcf42f65d31bfd4d315605cbe09db9971488a5347327e3f8b71563800ea16e3ac94309b7131c3ce4ca147b026e1ad611982e78bd
 EBUILD google-cloud-cpp-0.9.0.ebuild 1619 BLAKE2B 6fbec550d4745ac11f9cd61f3781220994dc4b57322b71949fee3ed4b44b561c4730ca81df959ea665fa247a08915b961e62468fbaf50d60e91ae1bac9784cf6 SHA512 7309088ff54ba12a75388b50a208c6d8d37e9ef8228c8ee0dc2f3fc00d7ed8a079b6bcd64c2e2fe77c775f2f3736d5acf57849423d0f1c1a9fdd93f49c385aca
-MISC metadata.xml 334 BLAKE2B f6f86d6b9621c1f6bb8a540835936ba0eb3ebc9ebee743cf3fdd0f236477378acff8af6528ba194cf1ba74273d3df99eeb012add242471af810afbfbe587321b SHA512 3ddab1ddecbb3f976ed02c450094873ec200d3a42faa601a10a3089d76faadaffa3fa59e48013b471e735a919502988da149f4d19e7d1d7054947462c71581a9
+MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-libs/google-cloud-cpp/metadata.xml b/net-libs/google-cloud-cpp/metadata.xml
index 19a918bcc964..76f45cdee0f4 100644
--- a/net-libs/google-cloud-cpp/metadata.xml
+++ b/net-libs/google-cloud-cpp/metadata.xml
@@ -5,7 +5,4 @@
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
-	<longdescription lang="en">
-		Google Cloud Client Library for C++
-	</longdescription>
 </pkgmetadata>
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index fa1ccedacb45..3247b976d4fb 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -1,5 +1,7 @@
 DIST ignition-msgs-1.0.0.tar.bz2 315469 BLAKE2B a481f740ffb0795e64d1fa222ea4925e09839d56212f5218b4849c6f49a3e3a899af757ac1ad1997a95b57a401bac831a754ffa351cd142e6e9cbf07e7bae0ac SHA512 3ec16d68c35b1c7d77373eb3ed72304f5a990f57fc15a91f49af49bf0c6b43e6f31e888e4b0a8308cc63840aa995dd423d5b23d28a98f132b4be13c46f5d7d6e
 DIST ignition-msgs5_5.2.0.tar.gz 390042 BLAKE2B 733f57aaa91d6a34201e247c34ace74653ebc7e23df03f89a4a2ec76361e5ea0270f3b63d6452abb15b1380acacfe87294cbb9f0c01655707481300a34aa8408 SHA512 b1c6017da39c79ebdb2d76e960c6b60d0b82af7f5c09144a1f25c6e7b7b06ec5a7922e6d0bc08951baf0d4797d6ea061cea11b703238c954445d67762f2bc983
+DIST ignition-msgs5_5.3.0.tar.gz 390136 BLAKE2B 947336e79f54f384d8cdeefdc6be5cfe360c4ae9fc4e894cc08252e801343c4a9d507957df1ffb05a80e55ac24bddcd57f4e4e90d8e0b2f346bc55aa8f64c3c1 SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e
 EBUILD ignition-msgs-1.0.0.ebuild 653 BLAKE2B afcc192b543a7ae2fc9f859943708e40ba36e2e0f260a729927c9d38a651e078995879e3c2cef643b342c35b1d3fe4fa93c8e2b8526579261adc91c427b3a20d SHA512 4c769905c78b7bf5b91c80a2188ba5e29ba91aaca55ceaec0434347858b2fe8d657521382380881ab455c98897bd911ced6425e5749047caadb10a916914b869
 EBUILD ignition-msgs-5.2.0.ebuild 727 BLAKE2B 2e4d124127e3d7af8a935788a2c5310c42aca5cb7fce7c2a3c0c0e9427cff2a7ea8ab3128245a4ddb2f2bcda934a619691ec8ddbf7f9fd6a79189b1d72a2a886 SHA512 8877dc70ac3f0650c521e2fe098625c9c5ef9fe3bdcf7960a840f913d21e630392e22df59590164f5675d036f9f729ad05fbfccad799fc70a26ccc0969f0064e
+EBUILD ignition-msgs-5.3.0.ebuild 721 BLAKE2B 22be3ba2cb7f504bc0428942a0f8df051b9b8ab158ac317a81ab5ebda45a441fd97e7846fb912bb8fcba493ed927f34a04b024643711db4e4eb2d5bb19af9ed8 SHA512 c63d570831eddf989495e8029599598025b6957d262b23f9081971bdaa1839f1201c0b6a94aff736dd1fd5ff624fd7330f743924f6791a9e6132f70d67673805
 MISC metadata.xml 342 BLAKE2B 8d111972a5a99679d9ad258649ea0308bc682663888b6228e92948dd88ee3e6d19bf04d940801f5d3ca069ba9173f248d557c2d44f304c86c074c3f68b0d9341 SHA512 4ec21d1b2f7525d07b3bbc624ec55edf1282652c74ee548e77c1b25c0242b0f01f846bdbe2203dca8c0217f25e5fc50ad6ff57f33694ea223941c8aaa8bc35fe
diff --git a/net-libs/ignition-msgs/ignition-msgs-5.3.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.3.0.ebuild
new file mode 100644
index 000000000000..72fb7b12fabb
--- /dev/null
+++ b/net-libs/ignition-msgs/ignition-msgs-5.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Protobuf messages and functions for robot applications"
+HOMEPAGE="https://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs https://github.com/ignitionrobotics/ign-msgs"
+SRC_URI="https://github.com/ignitionrobotics/ign-msgs/archive/${PN}5_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/protobuf:=
+	sci-libs/ignition-math:6=
+	dev-libs/tinyxml2:=
+"
+DEPEND="${RDEPEND}
+	dev-util/ignition-cmake:2"
+BDEPEND="dev-util/ignition-cmake:2"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+S="${WORKDIR}/ign-msgs-${PN}5_${PV}"
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index e083ef812fa1..608a42091f46 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -4,5 +4,5 @@ AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-1.7.0-r2.ebuild 2249 BLAKE2B 9e2df8aee72acc1adab2f9ae23edf8538881e97d2d15a092ebb83af1479f24d460e5dbc4c02dd31708dc3d12e5b860b25e93b855b63747e9555d06dd6782a565 SHA512 30dc0b7d5b0f8d8e644ca66f8ab4870dc6b3bb60baa90e243297dd6480817028a5ea783a8e20088f50d72c659c279ebf7c8a75becbae725566c22e8e17c7cd08
-EBUILD ldns-1.7.1-r1.ebuild 2747 BLAKE2B 179adb5a5210721b9cfe86e63ae2fcc39104c57a438aeba9ca2628209ef8f7abdb18fab7fbd01590e039a4a3054308869c510021f3e10acc16b8cfc117b30159 SHA512 ee074557740485a44beae54b23bd2d3c595c969776cac5212af1dabf928831a3e5315405dada1a8d1142948f54e604dabcbca5dce258e5ba5c4244189066153a
+EBUILD ldns-1.7.1-r1.ebuild 2743 BLAKE2B 930ef54c6483238aa0d52f16396bd74edd2bcc82d86fba6be5203ee8b122eb4204dce91a70a91b69299a6e88a6440c27b439fba272ce75cf3278b55f32b6fcac SHA512 0dae14d12743d374b0dbaf11f41a3bae4cd2a1994d741327ea08521ef65fc2ae17be6f2a2cf5a1c0f77123940e48e95fbc56c50db8c741cf1d6aa87ec8715789
 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index e4224bffd2a9..fb249bb22ad9 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 77a917c57616..bc8d48005f95 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,4 +1,7 @@
-AUX libgsasl-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
+AUX libgsasl-1.8.0-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
+AUX libgsasl-1.8.1-gss-extra.patch 855 BLAKE2B 68eb983dee51393b4d871b71932a61c880bc37f6ead9047472215f8388833efea85db9ab4282bfcb700d0bda366623935bb487652dd334c4bb87dcb188b30d8f SHA512 97922b23fb967ee0110076913ac1ad89b3720be5d9883bce3762b4e41d95375ae1602470eeaf1551cb7ef7d46952d3dfffda64ef6ecc51149cd93dea681ad988
 DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
-EBUILD libgsasl-1.8.0-r1.ebuild 1305 BLAKE2B 38d44088ef08bdc061239172004216cf93c032ac1614c28891c77b4842a2451158c42611ab87bdfa635b3ad6f027733943898fc0f24d3485e5898a3ece29c04e SHA512 6659399dc66eac3c109429e88683196bb87b3e343a2eb675a02cbd02f8b56e709ab70fe82f8d1caebb66c6cffef3bd7bd4d9d88e220279c765e90c9c014798c3
+DIST libgsasl-1.8.1.tar.gz 1791261 BLAKE2B bd8b954f9d950fe449fe140baca840a14f12ef6318e74a6fd070b35504b8c3a7002f13fe93142bce992e4a1df773ebaad4ec01d04c01c63a7374187a8142136b SHA512 52bda3a962a2cbb598009fd02c547a4f8b5b9a4243511aa8104df97b4737023281ab57dbbcf839db3cad73c64cbc72bbd89b49da8b0379dd635220ffb642aa22
+EBUILD libgsasl-1.8.0-r1.ebuild 1387 BLAKE2B 131b327007cfd2b3ca71d38da504b93a7fca6b9bd4a986b57edac157529d561852bc2881d927931d82b75678875a269aa70a0c2ed38eb9c2f70125f8e1896197 SHA512 634b59ac8efe01d93c0f15f1794c122e608f7b2427bd61f3b93413d301cb5b908c0162a652c8d3dc9a4745eed8630c6bc94a907a12b0f4d4da5ad35f6f92ab7d
+EBUILD libgsasl-1.8.1.ebuild 1395 BLAKE2B 69f4650c846152db363d81cd5a9700dd4fdac1808f95f12dd2bcf989cd06505a21436e3d7ffb6deddc34d1ee45392ebf37d1544a52224263ddfbdaaaf11772f5 SHA512 77f725be69b8f8841cd70c1419d02854413b90d84acd4b402d441dcdd0949b15bfecb31ef81000a025fba153428dd128c8803a526e69ff53b8e382d49765070b
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/files/libgsasl-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
index e9ec10d183c4..e9ec10d183c4 100644
--- a/net-libs/libgsasl/files/libgsasl-gss-extra.patch
+++ b/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
new file mode 100644
index 000000000000..15350a87d51d
--- /dev/null
+++ b/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
@@ -0,0 +1,21 @@
+Gentoo bug #359005
+--- a/m4/gss-extra.m4
++++ b/m4/gss-extra.m4
+@@ -19,7 +19,16 @@
+     AC_CHECK_FUNCS([gss_decapsulate_token])
+     AC_CHECK_FUNCS([gss_oid_equal])
+     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
+-    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
++    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
++    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
++    	[#include <gssapi.h>
++	#ifdef GSS_C_NT_HOSTBASED_SERVICE
++	   hostbased_service_gss_nt_yes
++	#endif],
++	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
++	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
++	    AC_MSG_RESULT([yes])],
++	    AC_MSG_RESULT([no]))
+     if test "$gssapi_impl" != "gss"; then
+       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
+       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index 5b146866adc3..7550115ea3ff 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -1,20 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
+
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
+
 DEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	idn? ( net-dns/libidn )
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	nls? ( >=sys-devel/gettext-0.18.1 )
 	ntlm? ( net-libs/libntlm )
@@ -23,11 +25,12 @@ RDEPEND="${DEPEND}
 	!net-misc/gsasl"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-gss-extra.patch"
+	"${FILESDIR}/${PN}-1.8.0-gss-extra.patch"
 )
 
 src_prepare() {
 	default
+
 	sed -i -e 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
@@ -36,8 +39,14 @@ src_configure() {
 	local krb5_impl
 	if use kerberos; then
 		krb5_impl="--with-gssapi-impl="
-		krb5_impl+=$(has_version app-crypt/mit-krb5 && echo "mit" || echo "heimdal")
+		# These are the two providers of virtual/krb5
+		if has_version app-crypt/mit-krb5; then
+			krb5_impl+="mit"
+		else
+			krb5_impl+="heimdal"
+		fi
 	fi
+
 	local myeconfargs=(
 		$(use_with gcrypt libgcrypt)
 		$(use_with idn stringprep)
@@ -47,6 +56,7 @@ src_configure() {
 		$(use_enable ntlm)
 		$(use_enable static-libs static)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -54,6 +64,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		rm -f "${D}"/usr/lib*/lib*.la
+		rm -f "${ED}"/usr/lib*/lib*.la || die
 	fi
 }
diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
new file mode 100644
index 000000000000..c23abb24fb4a
--- /dev/null
+++ b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="idn gcrypt kerberos nls ntlm static-libs"
+
+DEPEND="
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	nls? ( >=sys-devel/gettext-0.18.1 )
+	ntlm? ( net-libs/libntlm )
+"
+RDEPEND="${DEPEND}
+	!net-misc/gsasl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.1-gss-extra.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's/ -Werror//' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local krb5_impl
+	if use kerberos; then
+		krb5_impl="--with-gssapi-impl="
+		# These are the two providers of virtual/krb5
+		if has_version app-crypt/mit-krb5; then
+			krb5_impl+="mit"
+		else
+			krb5_impl+="heimdal"
+		fi
+	fi
+
+	local myeconfargs=(
+		$(use_with gcrypt libgcrypt)
+		$(use_with idn stringprep)
+		$(use_enable kerberos gssapi)
+		${krb5_impl}
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/lib*/lib*.la || die
+	fi
+}
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index dddaa6fe09fb..2b83ba104a42 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD libhubbub-0.3.6-r2.ebuild 1222 BLAKE2B 44cab1f6dd0d4f8f0dd2146aa39556ce95237ed89059616e7f5e7593941df515daed7f4e0f0f9b9ca9cd32b85cc547b2bd47108a10f90e438a12ca069a5c415e SHA512 2d8fb1530149475142b1f256a4b191b7407609cd107a0aa19c33cf06e7d086e84d17c1d569ad8d4b9dd047eb237d2254c906dbbde62cb44dbf44e0f721d9ee0e
-EBUILD libhubbub-0.3.6.ebuild 1184 BLAKE2B 46be9c562a28e3ee7f93a54b108a745fdfe8ebdee68c1927a810a0016b8f68c2acae92b27953abee7251cc274c3d8513139e2faabb475b983d8d49f805963505 SHA512 bd94104437b4b4799115d15e2b36c3684c235773bc3bbd2b8b4fed74fc9ef987e0510a51e860ebbe99c292c2c54ceb2f7476e2ae4681299a7954540166f6288e
+EBUILD libhubbub-0.3.6.ebuild 1183 BLAKE2B 7dbd73a667caec5118a780cc6a0f2d7a019809062d352d9b9586eaf61c72a5012b6d12c8108aeb3c16ee4900aa23d882b0cc56c8657f28b348c124f4455b7c72 SHA512 03eb4253108cff134ce5a4b5c69219f3d52591b79c898841f469c1186a8f385ef874ae9900248962ab86d852629e26d0168d4108ee721bf8e9f63156afc13364
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.6.ebuild b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
index 8de3705c4ae0..0b1536967117 100644
--- a/net-libs/libhubbub/libhubbub-0.3.6.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~m68k-mint"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~m68k-mint"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libmicrodns/Manifest b/net-libs/libmicrodns/Manifest
index 21b20533d07f..c70984a3a535 100644
--- a/net-libs/libmicrodns/Manifest
+++ b/net-libs/libmicrodns/Manifest
@@ -1,4 +1,4 @@
 DIST microdns-0.1.2.tar.xz 49420 BLAKE2B 247a82c3bb038487390ba967387e9d4cec638ee5315290387c5b8863afbd45cc0700a3ee6c0308db253a161b5c1d345f77808de96df3f31bfaa2ff74e8fa3c05 SHA512 a6b15c65c74560fdba8973c63ffae9cdde4445f54196bb2d7d6348f6c15f8f162ef0a4e91b969ea3f2a60c701c3cc72799fcfba2fbf08c37f71ba8d5e3409702
 EBUILD libmicrodns-0.1.2.ebuild 725 BLAKE2B dd81aad3f6e4d6522791f1e0fa7860f6caeefa713ebf2535f39c5dca977e8fd283f0f66f778159e128ee74ed04b53c40a875e054a56a4aeed5b1d5c2f76baad4 SHA512 1423533662f14484827d02c23392e5df339f9474f14ac106ea380a8b54b7ba2370062a2014d783358850fb4a7502a2494c40db397e68d288987d5888508874b6
 EBUILD libmicrodns-9999.ebuild 730 BLAKE2B fc009b288958e4452ae2ce696582b16852f47ead90c13f8626a316b3eb67eac6f85ab784fa3ce10267befe6bdc12bbbd17b3958c55707a63da0fa86471e4726b SHA512 7438da9899534764cd8325b80b54be10107162663426ad072f6aaeda422f9a22bcd8353fcb27c6aa33ac6aa59f1cff6cf4b06b26ea5d1f02afce76e6efca839b
-MISC metadata.xml 430 BLAKE2B 94c8e7b19ca9899428db5b67c33d492423ab83f354e878271bdc6ce9b6602c78892b5069ce38032e837e68285c2979bfb43ea11650d734ae6061089a3f2d1232 SHA512 7ca90565928898c788ac8b87abff3909c5d1c0947c57e4ba30b0929a794ac943c20f2002601d2614dca35c2e3b09432653378bd66eaa6f53881c8cc6f86b892c
+MISC metadata.xml 333 BLAKE2B 0f3fc0a6fbc0a01665682e8476ad50797ba07395af2dea30183508fcc2ce52bfd7433908ed98f197a75adadcfe89ecdd58438ebb331f3dbbdf426b5f40a75a3e SHA512 ad45172e29ddcb372a24c2d116e89979d4050c8b79d37c303625667b486692c8e3cb08a96cdf0cab76278644656df2987b752194eaf81661e9c230db356188ff
diff --git a/net-libs/libmicrodns/metadata.xml b/net-libs/libmicrodns/metadata.xml
index f6508cd87852..d6ab47c58160 100644
--- a/net-libs/libmicrodns/metadata.xml
+++ b/net-libs/libmicrodns/metadata.xml
@@ -5,9 +5,6 @@
 		<email>NP-Hardass@gentoo.org</email>
 		<name>NP-Hardass</name>
 	</maintainer>
-	<longdescription lang="en">
-		Minimal mDNS resolver (and announcer) library
-	</longdescription>
 	<upstream>
 		<remote-id type="github">videolabs/libmicrodns</remote-id>
 	</upstream>
diff --git a/net-libs/libnetfilter_acct/Manifest b/net-libs/libnetfilter_acct/Manifest
index 1207efed275f..4ec7f65517cc 100644
--- a/net-libs/libnetfilter_acct/Manifest
+++ b/net-libs/libnetfilter_acct/Manifest
@@ -1,5 +1,5 @@
 DIST libnetfilter_acct-1.0.2.tar.bz2 292718 BLAKE2B 502261b12c76d24cd67ff79ae72f7aee2ae48f9953df201bc34e7a28ded69501ccf3493ce441b733e4ec5b40b33ccbadf4c0e2cc46971bdb4bf3b9b117683347 SHA512 6bd299d509736ce3335e051137851d7f1a3751eafa380b55e9c73a25afb5d45c904ce9acefd4f934f1d21f2ff85b06faed4b072dc74d74e3a8b93342d59f5cdf
 DIST libnetfilter_acct-1.0.3.tar.bz2 296999 BLAKE2B c696a5830c2445fd8369182c413a8144f4b0d669dd8ef57e59d54bd8ad406e15bec72ede8d2ee0d7bbb61fbc2218380168e03ed62daaef9e026cbe83e79982c2 SHA512 5ca332840663941182343fdc0d5e45116bba71a97a913db0b385ea37ef31a04f8267a2279b7a2862ce338c6eeb093bb3ef9908f57770e64acf5d2b2266d3bfe5
-EBUILD libnetfilter_acct-1.0.2.ebuild 1129 BLAKE2B 89c004540f87b8b300a1889d02b05226b0f1d2d2d352db0c2f78280d9c50863ac5215bae9423ab9eccc2631410011255f2524a64bdb4c9b67d97564b3c6e362a SHA512 d5ed7ac6544851bd5878c3c6fab437a0dc78a940d5ae3569dc59723193d2f08e3cae6a31794bd1e48c87fabf311762c2235b11a406dcee5b3f8dbd5bfd614f8f
-EBUILD libnetfilter_acct-1.0.3.ebuild 1138 BLAKE2B d9fea85c00f47b4c2ce10a3295ddfba2d5bf57d6e6366a35ea8e28ec6c45c78fd9fd1c4934f2527f1099c1ea6e8b24870286a8755ab75a5dee3087d321c155e9 SHA512 4da3e32cfda90f95068d5db35059bc18001d8fa8d6cbf1fda6beaa8eeb62612be4649550e669215be293e1a940c9be8c9fab920cdb884a4904b82ed55036b382
+EBUILD libnetfilter_acct-1.0.2.ebuild 1106 BLAKE2B a828d15fbc4e5cd6efc7bcacf34a239c79aa521ef87b1d82acc51603d847a50011546ef7d5487ec9752bae410009b624ca36f0ccdcc1faf1573e75a75a23c67e SHA512 4da76e74cd60b0821ff890872864dd817deb71e5ffb3267b3480daffbfc1cae30ef5fbe156f9e3cb8c91e05f3e0e505aaf04955e55638fe6d521104b716c40a2
+EBUILD libnetfilter_acct-1.0.3.ebuild 1115 BLAKE2B 88762faa0e079a62602544df5affcf1f3e5f3a954c2cecbf5013d9ed12d9568357eb883e1e595f021e63ce0bc37aa94ebd2319b2413aeb7ab22fd76aad9bb3ad SHA512 01f579c80f02830fb0abc51b30714a0e73f5c42793e6ba3630710ec0f8221f06c528e9f4e963bc8db7d199c996e098c654dda239383bc43337a18a0c392c77d5
 MISC metadata.xml 519 BLAKE2B c8eb1d1dbfb4a13be05e1f2b811cad7df8c2a71d49c2406142062da78e7a2fe40dff4c13f92de3c5065daf517e4fd9d637882f1f8456cd40b2ea42966c74620b SHA512 74ed6a2a7992dde7e6061489e378e2aacc5ce4b39fa7b09c31ffb06cdc3b75c75f880d3ee2a5caffbd0523a00c4fc12572f6c3343deddc0be2939a392b893f75
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
index e4ec341dadec..1cea6cd972aa 100644
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils linux-info ltprune multilib
 
-DESCRIPTION="Userspace library providing interface to extended accounting infrastructure of NetFilter"
+DESCRIPTION="library providing interface to extended accounting infrastructure"
 HOMEPAGE="https://netfilter.org/projects/libnetfilter_acct/"
 SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
index 63312579c64e..1d5ac92d8978 100644
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils linux-info ltprune multilib
 
-DESCRIPTION="Userspace library providing interface to extended accounting infrastructure of NetFilter"
+DESCRIPTION="library providing interface to extended accounting infrastructure"
 HOMEPAGE="https://netfilter.org/projects/libnetfilter_acct/"
 SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index b926b8d32d2e..0591f6dbff81 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -8,6 +8,6 @@ EBUILD libnftnl-1.1.3.ebuild 1193 BLAKE2B de38ffd4dd0740b905ae7736201550806cac86
 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 1194 BLAKE2B 36f57ef4cbf46a224c6fe44d188725e7eb34d8a20191a4ac030b83bc33e3078763e0a0a012825444736ad0db8d11207c00838af53947d9592ab032d340da86a9 SHA512 3c641bad38bc162463b62ee2d361169c5ebda19249b7538cb026aa7aa099a2d7949c7a2bcec896845910b1d3db0c08a4a76e41c7f22bcd9acd189134a7285101
+EBUILD libnftnl-1.1.7.ebuild 1192 BLAKE2B 5ce9550c836a983841de0197da1579e3c8259462334c6df811dacb4f66ec26d5269bce714a671e560c2b5048d085672912db9e33a58678c0e2273b7c35f877c8 SHA512 4b0acb69ff0f60a69ba115c219ff5d55d932739a4b7ee278b2e97e80144113d8ca3dc14a66e7e623f993e5d554594e301398595a260977f754d55f241345253e
 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.7.ebuild b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
index f0c5e98a2468..935d07ddbb44 100644
--- a/net-libs/libnftnl/libnftnl-1.1.7.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="examples static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index 467a719fcc65..b83d739a3fb0 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,5 +1,7 @@
 AUX libnids-1.24-ldflags.patch 422 BLAKE2B 407953c925cb226aa324e22ee5fa7d68022633b751a94844c8bc29ae0e741775f50eeaed10af06c25c493acae58aa881df4e66de359fcfc2b0e9e28ee55a9e69 SHA512 080a982ee45d69419fb45f8fc35eb53febfc098d24f5c52476933dae1333a11ffe3bffafa5dde302af308840ce17a4ed8fa210a87d6c65e16f78993d23492481
+AUX libnids-1.24-libdir.patch 1614 BLAKE2B 7fd082ee26ba798bdc61049c65b7e7a50118c7eaedc23c5a70a34cf592081ba559e2b03ab4684bef7d6f8bf4c3d640374e516e466721a3e75d7ae540f5e28949 SHA512 de76de95ce3f10e36c15cce31c9743a3caf96445a9d38e7d922710d5d482d9f09e73fccefa75285f200086bd0d2476a4f59a1bbcdfca807ed84873d8726554da
 AUX libnids-1.24-static-libs.patch 1018 BLAKE2B 6e3e691ca350233074e662d04b269d710a6d85d51de138072d021f96319ec7a3853dda117075d0eea07e913bf11280d93541848e592f4e0a34656c0ed917e9f1 SHA512 975354be03729c54f33340c7aa8ddd7d6d4f1eba19ee6096433a7e69b90ed84ab20f654ee28877b6db3b7f07cbdf29a20229784f69f1d7d8a29a81128554179e
 DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
 EBUILD libnids-1.24-r6.ebuild 1106 BLAKE2B 6a94bdda1380505cda1129cbafc79431714a425b962b6ac06fca7661c8f036beb01551deef3aebb48c543b2e74d6d0003f28b54c5e532e446bfdce0ed0514635 SHA512 4adc9b043dcd077cab15ad56997900ddf076b51d1f5519c9022838d5417f0885baa43490986cca202e21a94370b71befde01a488451cd06a134ffe3ce987bd7a
+EBUILD libnids-1.24-r7.ebuild 1160 BLAKE2B 3a5e38755f955a94650d554faa6c62fc004438d1111122f53275ede692446bd46639902fc031e3e00fed514ad708e97036230813d3b0c68f0816cfc7cff81e37 SHA512 88f6a0732ce70037dd946dd62e4bea07ca760d24ce0a87a27bf18d253a4837c727088ee45643e6af2aa71113a69ba1c829ece1e93e6cc9909d75f79043cfc7ff
 MISC metadata.xml 688 BLAKE2B 1e9f6acc429a683a0aa1b8e14d0f2d9b03cb004c387b0b8582f8056c767af6511ff480f895d715169ceabb4c0722136e624d853819a2ea48f1fe8a6cb77829db SHA512 c70e24c21ba36ff9acff4d4b4290c8087a56e082ca520a7aabf7f0ffca5f03ee49f1bb5ac093304a2cb744241ad749e39022fce7c1a20c28ef08b65da911791a
diff --git a/net-libs/libnids/files/libnids-1.24-libdir.patch b/net-libs/libnids/files/libnids-1.24-libdir.patch
new file mode 100644
index 000000000000..578d9001d16e
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.24-libdir.patch
@@ -0,0 +1,44 @@
+--- a/configure.in
++++ b/configure.in
+@@ -69,7 +69,7 @@
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	PCAP_CFLAGS="-I$withval -I$withval/bpf"
+-	PCAPLIB="-L$withval -lpcap"
++	PCAPLIB="-lpcap"
+      else
+         AC_ERROR(pcap.h or libpcap.a not found in $withval)
+      fi
+@@ -77,7 +77,7 @@
+   esac ],
+ [ if test -f ${prefix}/include/pcap.h; then
+      PCAP_CFLAGS="-I${prefix}/include"
+-     PCAPLIB="-L${exec_prefix}/lib -lpcap"
++     PCAPLIB="-lpcap"
+   elif test -f /usr/include/pcap/pcap.h; then
+      PCAP_CFLAGS="-I/usr/include/pcap"
+      PCAPLIB="-lpcap"
+@@ -146,12 +146,12 @@
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
+-	LNETLIB="-L$withval/lib -lnet"
++	LNETLIB="-lnet"
+      elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	LNET_CFLAGS="-I$withval/include"
+-	LNETLIB="-L$withval/src -lnet"
++	LNETLIB="-lnet"
+      else
+ 	echo "A working combination of libnet.h, libnet.a and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
+         AC_ERROR(libnet)
+@@ -163,7 +163,7 @@
+   else
+ 	if test -f ${prefix}/include/libnet.h -a ${exec_prefix}/lib/libnet.a ; then
+ 	     LNET_CFLAGS="-I${prefix}/include `${exec_prefix}/bin/libnet-config --defines 2>/dev/null`"
+-	     LNETLIB="-L${exec_prefix}/lib -lnet"
++	     LNETLIB="-lnet"
+ 	else
+ 	     LNET_CFLAGS="`libnet-config --defines 2>/dev/null`"
+ 	     LNETLIB="-lnet"
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild b/net-libs/libnids/libnids-1.24-r7.ebuild
new file mode 100644
index 000000000000..09d5cfe6dc05
--- /dev/null
+++ b/net-libs/libnids/libnids-1.24-r7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
+HOMEPAGE="http://libnids.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+glib +libnet static-libs"
+
+RDEPEND="
+	!net-libs/libnids:1.1
+	net-libs/libpcap
+	glib? ( dev-libs/glib:2 )
+	libnet? ( >=net-libs/libnet-1.1.0-r3 )
+"
+DEPEND="
+	${RDEPEND}
+	glib? ( virtual/pkgconfig )
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-libdir.patch
+	"${FILESDIR}"/${P}-static-libs.patch
+)
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_configure() {
+	tc-export AR
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--enable-shared \
+		$(usex glib '' --disable-libglib) \
+		$(use_enable libnet)
+}
+
+src_compile() {
+	emake shared $(usex static-libs static '')
+}
+
+src_install() {
+	local tgt
+	for tgt in _installshared $(usex static-libs _install ''); do
+		emake install_prefix="${D}" ${tgt}
+	done
+
+	dodoc CHANGES CREDITS MISC README doc/*
+}
diff --git a/net-libs/libnipper/Manifest b/net-libs/libnipper/Manifest
index 42c11454ed6c..c16438aa0ca7 100644
--- a/net-libs/libnipper/Manifest
+++ b/net-libs/libnipper/Manifest
@@ -3,4 +3,4 @@ AUX libnipper-0.12.6-glibc-2.10.patch 418 BLAKE2B f981208efc23c3eb37aef0ee75a6e0
 AUX libnipper-0.12.6-multilib-strict.patch 523 BLAKE2B c59c2e2a9b3a09be2a17bb7d6839a03bdde7981a4bed0c761809ab9e024dc764cbc7bf7e61bd47a56669e3355980aa67c2eb479e8793da8fca44a4cbf06dad20 SHA512 4290a1b5afdf3215d25d1eb173a0dca421f209335cbe413aa3f051df31c132e85dcafaec89eee52709ece258aba37b507cc4499369e9ad403aa7ecb2b7ba04a6
 DIST libnipper-0.12.6.tgz 444578 BLAKE2B 66a9d9158a132a447e5acfb2da51618c2be09f51a8bea3b47bb953a8734e5be5666a6d330e20ec9b5ad6455ac98fbc651a673dd4c47045f916cc3894ff40f5c2 SHA512 eb6eabce06a71463f8dad59a2aca13583e9ae8113b6997a7946b9bbafe54cd0668189c915f917ffcb7ffe3b5dc6dbbf7d37874ec226e5bd8cdd3c8999f9e10b0
 EBUILD libnipper-0.12.6-r1.ebuild 468 BLAKE2B c4399a7aa526117ed3197c493e7dff0a343c21306a74a88150877a7826214d275ef4962aa5064b6fbf87fd9b4e8ef74ba660b48e9e79c116379249f145667ec1 SHA512 7a67d1cab29df68cafe09c4549c6426316f6181b888040ebee8abdaf2c3d3554d7f223cd439a499cf2a361cd9930b6efc3c90e58b7121d009e1dd1f781b71b90
-MISC metadata.xml 446 BLAKE2B 4523e04de310150a2cebdaf625214c1db2dd15c55d3372c0921eb2c8ca9b866ba07f0a2379eb1ef4af60227aa033ffdd3457e3608df65da198c083522648c726 SHA512 fce909775e84b475f504f9aea14ed5090b1b849ec65b4d3013893d3aca2d8ab4c8e074e1e5b632d0f92313e003b6c70f138b63985e90565f4c283964f47b87c7
+MISC metadata.xml 318 BLAKE2B f5c07504aa2c9809ffa2798644d13a73383500e16a25f5e2e47502e71b27019badbdffb08d91c705e69708d56154070b82c9d1eb5a07f23c540eefb185e01480 SHA512 8b02dbd54b036d2aa1f1bebefd77ae6a0caf5747a99a00085ad9aede3dafbb62d1c81f276ba8f758999c9f9c84d3f0f15aa3ba82b9c2246f3db7505ffa33e81d
diff --git a/net-libs/libnipper/metadata.xml b/net-libs/libnipper/metadata.xml
index 5b93ff141c8f..fb98633af89b 100644
--- a/net-libs/libnipper/metadata.xml
+++ b/net-libs/libnipper/metadata.xml
@@ -5,7 +5,6 @@
 		<email>ikelos@gentoo.org</email>
 		<name>Mike Auty</name>
 	</maintainer>
-	<longdescription>A library for conducting security audits of cisco and other firewall device configurations.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">nipper</remote-id>
 	</upstream>
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 62509fa00c0c..a3cc655946fa 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -3,5 +3,5 @@ DIST libnma-1.8.28.tar.xz 1366584 BLAKE2B 598c2d310844930a5ed8b8d4b8bc0ae91193a8
 DIST libnma-1.8.30.tar.xz 1386248 BLAKE2B 7021e85595819b0cbd44b8c62087f49a5ecccc4bb230820d9a0159bf33b904df4f5c8021a79822c37d0933bdcde790a44f6d960b7f5f504e7506849aed35d54c SHA512 4d8f93d035fca4252e5c5dafc756ee6bc8f1d302aaeca77c5c0acb5d7f6cd4214224fb48e2706e69084c5a714aafa7837769be17d0642cc29eded9eb175a1107
 EBUILD libnma-1.8.24.ebuild 585 BLAKE2B 14955a958ecb2ef65e729f46dc4cabbedf020ca1ede426efd0291101fed11d8dc5ef70051143c4ea5f638cc1a08aeca5426f09595fcdc67d8127228c98af247e SHA512 e67925f59d07a5cba47cb44ec50721e8c365b5ec9d73882b31c2ddfa82ee5daee1241e152a7f2fe7a7f4035a8aa9ea563594d8722ed3e0bc340c9c8fe8e15c95
 EBUILD libnma-1.8.28.ebuild 1689 BLAKE2B 6da4564ecf1a70c90ffd4b9f46b67a062eefc031961ff05b702465065f6637da500ac4dc6bd41590d975c953ccac5fb2650068fc53d9334d43248ab37ad2e727 SHA512 194b9f092912f8a5df01b0f64962f87ca9b613984fe2b8ff8abde42e525dadd2c35411ee0311cccdb40d84486e5f1b2e2170d79dbd1a12c0b952dc8b9d83f4de
-EBUILD libnma-1.8.30.ebuild 1631 BLAKE2B 5cfe9d797202d6316215ec891ad1f5bf6e55124427f65f8fee090645e5ae25b1aaadb85e1f3367a6fdb7fea00be48f3bbdf2e106adbd0761774a927a1cecb561 SHA512 45ae9e208cbb0808e8c57d2e67de0d2841669be47490c17e5e7e3fa5f35c00400f9fd0719d0dacc7d22d5c940c6bb168ccb36bf3502000343031bcc30d9ab7be
+EBUILD libnma-1.8.30.ebuild 1630 BLAKE2B c8b91e6e60370693dfe9b702833023d978c191479db5f7a94189f92e67d38690c6e37a81c6601695482cba7ff109dc810be5803c371bfa3a02b1159c58104371 SHA512 1462973e84cee0b09f88aa07b711c5bfa877ee2610dd9a3621e7a9e9b373a833b9131a28d6c8ec043014f0b6a4270523e182e34ff025a42f7284179809b54f08
 MISC metadata.xml 372 BLAKE2B e55e51eff966d0806e416c520f700ab28219271b0b92cbab359e9b894813e0cf48b978279a4c3d0b460fe5477e12bd016cf2d401b22134c609432284d1e01ff3 SHA512 b644f5bbd965ea13b9097aec503e0d9448bd013feb1abc24cc2bf9b2b4612a984a4ec6b36b67bf0c8b920c82c812e79afcc9dceccde4b37652a61e71c6cdf16e
diff --git a/net-libs/libnma/libnma-1.8.30.ebuild b/net-libs/libnma/libnma-1.8.30.ebuild
index fed0d7b63798..88d64f8e23bc 100644
--- a/net-libs/libnma/libnma-1.8.30.ebuild
+++ b/net-libs/libnma/libnma-1.8.30.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 
 DEPEND="
 	app-text/iso-codes
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index 42ebf3e7c22e..977d45f73392 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,7 +1,5 @@
 AUX libnsl-1.3.0-rpath.patch 479 BLAKE2B e500165f8ad8af21f64eb570286d8eefe51547e56e07ab70dbdc7a6824cefd010edf99c6c0b8fdf9f00ffe5e0feffab01cecc6a96dc7444536371adac7157eaa SHA512 37457cae1ed15dbfc9d72bdd6701e20abb027da1e01e48a5202ac209654a014a0f7352701790a643aa7ff12b7be0abff998596a5e09afb6f1f76eb5458f600e2
-DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
 DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620de4eb102f464bc1919b8f6d82f7b02a6108260122000bbac0307d9db05d406183dc533dd1b97683d08a7fc5f5 SHA512 a5a6c3ccb2d1e724c8c1f65e55dcd09383eb1ae019c55f4c09441eadf23ffbc2196cfad259805b0ac40ddf3a10af0da453e4d739d67d46829c64d0995dab4e55
 EBUILD libnsl-0-r1.ebuild 564 BLAKE2B 20dd0a9847b571117f74664778ef7b21906c5f7b822af15f05644789e41cc33b7fd924b5dc6bb76e98811148d8d592da75d805ff6610d712ed898ecb1662de19 SHA512 c243edc4f9f9ed5e7a98b7063dc8401495e5f9f821b5ae13008ce05cebdc4ffb79f5ed1a8dd8b0a13dd55e74f62f18c9566e74a3a09418647c2285c2519fb707
-EBUILD libnsl-1.2.0.ebuild 910 BLAKE2B c79c866bbcee794929c8fb4c596f5db45da92fb62e888b761afe95665f67be12402fdae74e973901ad89b38743c7fbbad7a763e4e7b9dd0c492025119c3d3bf1 SHA512 45259a766144a673674f01bbcec425952b7aa3cff3a4556564843a560c59c0f9f436055b046cd893fa8f1c5eac9ef9d10abdbb920a1edcbcba5ee9d28ee734bd
-EBUILD libnsl-1.3.0-r1.ebuild 918 BLAKE2B eea3d7b23c40aa58a5f57745df4fe273bb3cdcfe98d0ec27a5df45e746bf5bdee13c0096514da3d92820204dfc5aab7b0883f1bcae6b2cadaf64a715af3f6c2e SHA512 17ee8ca1b471b0551425a47c97aaca13ae5359e2130755931fed1341895189e04ed609171cb11a7a0921ccf404c74ed8ab097b9944310eb52174edfdf0e404a3
+EBUILD libnsl-1.3.0-r1.ebuild 917 BLAKE2B 1b528f58e7c9af79bf49920f1e30c691503e39c02620d08393ad9346e96f0f3563d8dd785e08c91f99fc8997857c6c05d5a9fe7f8df43bf05fc293c812058d39 SHA512 aebb22b6488cca26c6f1815a043eb0a602a0356e8bdf8dd6d6d0d6f788d633c017a316c625034a3a889f485488cb21c1bd856d3cb3d5f9dc2ed3d322a4ab4ca2
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
deleted file mode 100644
index 9e55d5d548d0..000000000000
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
-HOMEPAGE="https://github.com/thkukuk/libnsl"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/2"
-LICENSE="LGPL-2.1+"
-
-# Stabilize together with glibc-2.26!
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="
-	>=net-libs/libtirpc-1.2.0[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!<sys-libs/glibc-2.26
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--disable-static
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
index 3e2d6a38bf98..812614e3944b 100644
--- a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index 2f62dcaafe62..9b6f1936fcaf 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 1815 BLAKE2B 97d3e4b5beadcdeaff4967c524749730b9570c5aa59e6da2c4fb6d01ca8cefab26ac255cc8a60bfe62e85d3311c5295ba1e1f2612a63407ece806665c7cbfba2 SHA512 775b77007f1818095cf73b0da207fd3c0f94814aa00e4abde1d015f8b9236cab6666b86c931a82bb9621258afa738c5261bfdee62d0d3f2b12abf84cf72605ca
+EBUILD libsignon-glib-2.1.ebuild 1893 BLAKE2B fa1c048403ec4036b0ec82e8ac1a7558ea84e1bf9e1c79ae36ae9f2a7be1b977d9f59ff59c0d66d1239eb09c0b400514085b953462bdfdd8c24770da25be4953 SHA512 c42e272817f6a07e39292c7d44998c6fde7db9b7ad3e6a778881d5b232cda2d440d333f0eea415d630f81a7884cacaf85a998ea6c678b1169b60a5e7eff73ebb
 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 a07adeedb261..33de3ed28b3b 100644
--- a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-inherit meson python-r1 vala vcs-snapshot
+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/"
@@ -27,7 +27,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
+BDEPEND="$(vala_depend)
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	doc? ( dev-util/gtk-doc )
@@ -37,9 +37,10 @@ BDEPEND="
 # needs more love
 RESTRICT="test"
 
+S="${WORKDIR}/${PN}-VERSION_${PV}"
+
 src_prepare() {
 	default
-
 	vala_src_prepare
 
 	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
@@ -87,6 +88,7 @@ src_install() {
 
 	if use python; then
 		python_foreach_impl run_in_build_dir meson_src_install
+		python_foreach_impl python_optimize
 	else
 		meson_src_install
 	fi
diff --git a/net-libs/libsrsirc/Manifest b/net-libs/libsrsirc/Manifest
index ef780b790e45..dcf41077d2b0 100644
--- a/net-libs/libsrsirc/Manifest
+++ b/net-libs/libsrsirc/Manifest
@@ -1,3 +1,3 @@
 DIST libsrsirc-0.0.14.tar.gz 431916 BLAKE2B c588c14906e9cd76c95d6f5cf2fb63444836c3e1d6599a8976b1922f1eff2f2d9fb45334e658460f657eece04b441e9980879ca153ff06c54a9355d16f2a6c35 SHA512 cc529f3ab6817cf8c87a24ed5f33b7ffdddd4a9c38f66dcb6be0ba9b0b2090861d1ca9232c7b217d20560dfc1361ada92b6a68e5157689ed37f1baeadb2ab767
 EBUILD libsrsirc-0.0.14-r1.ebuild 589 BLAKE2B 194254b10612d513c812fa4f25c77381a93033d9747490ef719c22665d9ca1ebf4c8ce95279ff2cdeefd6e8d03e22402bec44c8200290140858b58c420041253 SHA512 46ed35810b7c678a348b9f56968fb996ced6301b27d01d6f0a374fd103839977aa8fd64141cf99b570f01a01f5dc5c73c42abffe3ef9a95d8f873c3255058374
-MISC metadata.xml 575 BLAKE2B cbff4765cb5c9dcd1a20d8275fc0a1d47e0827e3534bd18ce69d250c50542f92cbcc0e7fce4b02d3c49f19f455e82dd8304334cc83ea04f305a5689ad2c22901 SHA512 5bd0c2b6ddece6ce2620f864e7bcae7b6027234829ec6529b10b6548f1ab522d951fefe4f7be44a452dc53c7c9c4d2cb49465d14c92057a0e5296ca781be973c
+MISC metadata.xml 443 BLAKE2B 4d4ab6dae6aafe49c509b6e42c45310e32511dbc54a2e02deb101e5050272ba3a8cdf2e725eaa64c767ab56e8d4cfbeda710f029b03b5e6fd2d8f7ebd83d7928 SHA512 7f307306b6a495e6eada4a9beebeda909823a724e274311a6d05dc19a1986495f80bb0c2846e3eb239b97fe88086b8e0552d68ed5ee54c5b3cbdbe4bb37ac0b0
diff --git a/net-libs/libsrsirc/metadata.xml b/net-libs/libsrsirc/metadata.xml
index cdff1c333bc5..5c6e5895bd2b 100644
--- a/net-libs/libsrsirc/metadata.xml
+++ b/net-libs/libsrsirc/metadata.xml
@@ -9,10 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		A lightweight, cross-platform IRC library
-		Written in portable standard C (C99)
-	</longdescription>
 	<upstream>
 		<remote-id type="github">fstd/libsrsirc</remote-id>
 	</upstream>
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 636db5749d21..2280c5882194 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,5 +1,7 @@
 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 3198 BLAKE2B 7c0c30d1201aa21acc97be9d08529232c9e9b075dbe861e37b987307f7cfacb7540b59f99682fe1582b6dde44fea98740c4547cdaeca81c1861ad33a9060c48c SHA512 b2ed19610d62456c42d38544aa58a7ffc48b60ebc6424b6006e1eb3b668d3ed98bf05228c23cea8806bdc92a9bac0f4821fca2a7eb7f182b9489d840a45bc81f
 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.5.ebuild b/net-libs/libssh/libssh-0.9.5.ebuild
new file mode 100644
index 000000000000..8496b7dfd382
--- /dev/null
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -0,0 +1,119 @@
+# 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/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index cafca887a867..008ff3365efa 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,7 +1,9 @@
+DIST libtorrent-1.2.10.tar.gz 3586008 BLAKE2B 71971124930462feb5f5083fed38ccadcfd1a2aed0d000a06cd7e0898b40a1451722cd79fdf0b1da3477047b26c7f7e3c1f74086a141770a7d143c916e96b6bb SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d
 DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
 DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
 EBUILD libtorrent-rasterbar-1.1.14.ebuild 2331 BLAKE2B a127a6db0a7266fc6f8ac0797693166aaf0104f2fa22b964d3630e1f09a0a2713e2e6b0bb089e8589033113432fdb0ec17e526e973bc224ee3c81b59984d88fe SHA512 dad2f1bfc68595be30c72a67eddc439e07bc394567144e6d81da407f5b3c115f0885815dcf5e4081264aa97a1161fb5c762285b3eee1e54ba8809adfc58ce6ac
+EBUILD libtorrent-rasterbar-1.2.10.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
 EBUILD libtorrent-rasterbar-1.2.6.ebuild 2499 BLAKE2B 6d231b994347cfec324e0d7ccd754af3855903d2cba91d131ec748ae600fed32208d0f2d0836e38232e85ea1bdad9c34e0d07e42236d9c5fc525f1ce3a88adf0 SHA512 7e324f71303f21b936fde171c3cbfbd1ec56dd4f53dd11eaffdd133e1fa2c0e07469a4d55cd1389e326caca358718a7d7b215a847a180d265c38eac66d0269ba
 EBUILD libtorrent-rasterbar-1.2.9.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10.ebuild
new file mode 100644
index 000000000000..1500e4416637
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools flag-o-matic distutils-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/libtorrent-libtorrent-${PV}"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	mkdir -p "${S}"/build-aux || die
+	touch "${S}"/build-aux/config.rpath || die
+	append-cxxflags -std=c++14
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-boost
+		--with-libiconv
+		--enable-logging
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+				# git rid of c++11
+				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
+				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index f7c278462d05..b85251671bcb 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -6,8 +6,8 @@ DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1a
 DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
 DIST libupnp-1.8.7.tar.gz 786079 BLAKE2B 5f7764c1392f881f420f27e21084f5c98a6fce711f82a3e83dd21e22bf01f25348cbea377b2fae2d69133e4926ae3f8bffcd870e31c4f29b0fe20214842765d5 SHA512 c02b82e33e4c4d85257f0d282e3c4fc1b14a9f42eebdf12318ce6fb75e620bb0c103f9531e87be744fe70898aae9f67db4b5a187a23bcace33427a5fe7d3293d
 EBUILD libupnp-1.12.1.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
-EBUILD libupnp-1.14.0.ebuild 1025 BLAKE2B f5e4b37576f658b94afcbc5c3376f976ed460a3a3d96fcc94b466a962f29183b16a965978129b630d1e0d76d3cb01cbf5dc6c82fe192d803d2f9891d01b092c5 SHA512 fba199e78cbcb6ba2709267cd84a6245478e7a64e5d452cbdfa63095f26b51842f860f159581685ac0373810e49e631ebd68f1b0ae6db8c8628345fedc01b27a
+EBUILD libupnp-1.14.0.ebuild 1082 BLAKE2B 7d3b644f5ea6ca34d6d9dde99b60970402b23ee5409401780af533ef3f2aebf40e6bdb77c9db70226eb7ec6a9f5217b35136086aaf35654e9626d36e5770ea59 SHA512 ebcc2ca451bb68cbe7cea299d5b018a5e453944da74940d7a066f5d10dd0b195a3dfec5a591e34f4eeb9acfec47a833605a727d3b597633146eac166283e58db
 EBUILD libupnp-1.6.21.ebuild 1044 BLAKE2B c83d4cf4eb687836b5f77b61aa7544f1fc1efb7b0ee751874801b0ec5ce0d521c7fca9f994d921e50d6d521017e0cce5dd90c39efc7facbed09b913bab2992f0 SHA512 c00b0d9075ef638590f7bd88a7fca1ddaeea7b551be515fd8795ef31075ae420fd07452c51712b0a4af7b1141d019a646ced3e67fb9badbebed6e35b0d215b4d
 EBUILD libupnp-1.6.25.ebuild 1045 BLAKE2B fec4de0cd91eb2621093f2e781c69a156a80c31cb84d625f2ff11cb9ae0ec7ae3f50d21e9a43d617c2ea9d89839feea1cc7b14559fbe87039f1d646793d3a144 SHA512 ed91708822c127df4d44ae12c48e7865cfee01baed2065ef86be50e3dce31c4a1ae83de0477f743a63c112139943a018b16a66f8c48d49765e78b2dc85a5ee18
 EBUILD libupnp-1.8.7.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
-MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
+MISC metadata.xml 703 BLAKE2B d58f26b13f9fbb325262d2e1321fd1fb9ad2d5a9197d513d6be56cbca8dbf4f0d62f035fa08122c581949bfc99efe6b40f309b7ab640c3be6e254958ce161077 SHA512 138228cb53146848897306aa3a398655dd0cf8a3d52b16379de4c5a9c7e302602533e1abe4fa111bb6c870a9e5758a2f3cbb5f45e4a9b5820c6e475a08dfb6cf
diff --git a/net-libs/libupnp/libupnp-1.14.0.ebuild b/net-libs/libupnp/libupnp-1.14.0.ebuild
index 79c4ade3f905..05679fa6236d 100644
--- a/net-libs/libupnp/libupnp-1.14.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.0.ebuild
@@ -3,19 +3,24 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic autotools vcs-snapshot
+inherit autotools flag-o-matic
 
 DESCRIPTION="An Portable Open Source UPnP Development Kit"
 HOMEPAGE="http://pupnp.sourceforge.net/"
 SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
+# bug 733750
+RESTRICT="test"
+
 DOCS="ChangeLog"
 
+S="${WORKDIR}/pupnp-release-${PV}"
+
 src_prepare() {
 	default
 
@@ -39,5 +44,7 @@ src_configure() {
 src_install() {
 	default
 
-	use static-libs || find "${D}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
index 2c151ee1ce2b..e588f8be883d 100644
--- a/net-libs/libupnp/metadata.xml
+++ b/net-libs/libupnp/metadata.xml
@@ -5,6 +5,9 @@
     <email>thev00d00@gentoo.org</email>
     <name>Ian Whyman</name>
   </maintainer>
+  <slots>
+    <subslots>Reflect ABI of libupnp.so.</subslots>
+  </slots>
   <upstream>
     <remote-id type="sourceforge">pupnp</remote-id>
     <remote-id type="github">mrjimenez/pupnp</remote-id>
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index 61cf95971545..8543b6bc14d2 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,3 +1,3 @@
 DIST libupnpp-0.17.0.tar.gz 475725 BLAKE2B 568ead87791db1a41a4e5f93280cc8560336516cf676e1b64c35d0835579501ba61b75ee41e1dd1e58024d771f6f077c3c85515929be1c059a51ca314756fbfb SHA512 da7ef2453a8fad1e226c6252a84d76bf874128d306d4f9ca53e77e64734d113f3ad6dcd79549b2fe2a3cfab22243b5dceb1b7bd1fffeb512ed996b8fc680667e
 EBUILD libupnpp-0.17.0.ebuild 452 BLAKE2B 55b83c65a1b5bec4a5bca172acde911ae00c91aa6a5e8d44bdef1e6cb52ba3a0a96e6f60addf614e07fa2d998c258e8e4edcc9b65091279f2b189283b51c6664 SHA512 9514fefb30efe8737b99700ba7820e5ac094efd51cb008e576d5b92b7e7b7e7d60fc16ffc83973885fe3c065b5fed60e6d5be2ca3ee33ee6ffcbb5d63c84cb5a
-MISC metadata.xml 332 BLAKE2B 7d198d8b62aacf867ddb819dfeaf466ce052ae797b0d512fc14c294a2b7bb0adf9514ab0ae0055a38b5eec6d79ffa4b4e0970d5438b9d9b38a29ca8ea7022cc6 SHA512 1fc1d07c136b613f42418b92272c3d4093c9a3691fa9ad8a96ed0dd09639f50a5f55c2d41584511f64e4675f075fdd74faa33922b0b75a1ae6451250dacda682
+MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/net-libs/libupnpp/metadata.xml b/net-libs/libupnpp/metadata.xml
index 1f3cd90af099..411334230662 100644
--- a/net-libs/libupnpp/metadata.xml
+++ b/net-libs/libupnpp/metadata.xml
@@ -4,8 +4,4 @@
 <maintainer type="person">
 	<email>stasibear@gentoo.org</email>
 </maintainer>
-<longdescription>
-	The libupnpp C++ library wraps libupnp for easier use by upmpdcli and
-upplay
-</longdescription>
 </pkgmetadata>
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 5e4bdc6726f5..ad3eae368997 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -2,6 +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
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
-EBUILD libwebsockets-4.0.20.ebuild 2402 BLAKE2B 3dc60c949de66936dc3b0df93fae8d9a9b14d626c4bf0dd2921d3f6a0abb877714d11e416859e834a06639fa870366976bb76e0bb732261d77a65cb0e8709cb3 SHA512 9c0242e0fc993af6f7d39ab9dda80f0d9a3e2d7eec4b79a65489978c72a7d7d2001e9e6835cbfe8553a7e9f90f02fe4e3bc341717233677f6fa26f1431bcfa8a
+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
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
index 70b507a93cd2..b0d538ff9060 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/16" # libwebsockets.so.16
-KEYWORDS="~amd64 arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 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"
@@ -82,5 +82,7 @@ src_configure() {
 		-DLWS_WITHOUT_TESTAPPS=ON
 	)
 
+	use dbus && mycmakeargs+=( -DLWS_DBUS_INCLUDE2="/usr/$(get_libdir)/dbus-1.0/include" )
+
 	cmake_src_configure
 }
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.0.ebuild
new file mode 100644
index 000000000000..7ff883e7d82d
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-4.1.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A flexible pure-C library for implementing network protocols"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/17" # libwebsockets.so.17
+KEYWORDS="~amd64 ~arm ~arm64 ~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"
+
+REQUIRED_USE="
+	access-log? ( http2 )
+	generic-sessions? ( smtp sqlite3 )
+	http-proxy? ( client )
+	smtp? ( libuv )
+	ssl? ( ?? ( libressl mbedtls ) )
+	mbedtls? ( ssl )
+	?? ( libev libevent )
+"
+
+RDEPEND="
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	http-proxy? ( net-libs/libhubbub )
+	libev? ( dev-libs/libev )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	sqlite3? ( dev-db/sqlite:= )
+	ssl? (
+		!libressl? (
+			!mbedtls? ( dev-libs/openssl:0= )
+			mbedtls? ( >net-libs/mbedtls-2.0.0 )
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DDISABLE_WERROR=ON
+		-DLWS_HAVE_LIBCAP=$(usex caps)
+		-DLWS_IPV6=$(usex ipv6)
+		-DLWS_ROLE_DBUS=$(usex dbus)
+		-DLWS_WITHOUT_CLIENT=$(usex !client)
+		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
+		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
+		-DLWS_WITH_CGI=$(usex cgi)
+		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
+		-DLWS_WITH_HTTP2=$(usex http2)
+		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
+		-DLWS_WITH_HUBBUB=$(usex http-proxy)
+		-DLWS_WITH_LEJP=$(usex lejp)
+		-DLWS_WITH_LIBEV=$(usex libev)
+		-DLWS_WITH_LIBEVENT=$(usex libevent)
+		-DLWS_WITH_LIBUV=$(usex libuv)
+		-DLWS_WITH_MBEDTLS=$(usex mbedtls)
+		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
+		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
+		-DLWS_WITH_SMTP=$(usex smtp)
+		-DLWS_WITH_SOCKS5=$(usex socks5)
+		-DLWS_WITH_SQLITE3=$(usex sqlite3)
+		-DLWS_WITH_SSL=$(usex ssl)
+		-DLWS_WITH_STATIC=$(usex static-libs)
+		-DLWS_WITH_STRUCT_JSON=$(usex lejp)
+		-DLWS_WITH_THREADPOOL=$(usex threads)
+		-DLWS_WITH_ZIP_FOPS=$(usex zip)
+		-DLWS_WITHOUT_TESTAPPS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 1e4e025f2738..8cef855d84c1 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,9 +1,13 @@
 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.8.ebuild b/net-libs/mbedtls/mbedtls-2.16.8.ebuild
new file mode 100644
index 000000000000..6114da3d948f
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.16.8.ebuild
@@ -0,0 +1,94 @@
+# 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.24.0.ebuild b/net-libs/mbedtls/mbedtls-2.24.0.ebuild
new file mode 100644
index 000000000000..d8a0317d15fe
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.24.0.ebuild
@@ -0,0 +1,94 @@
+# 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/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index f179d79784a1..caf4317e272a 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,6 +1,5 @@
-AUX nativebiginteger-0.9.36-asmfix.patch 588 BLAKE2B 5bfc18fad9965210068df8cc86ddfd3f99af9f5db9e39ec5eda9b51f357c0f41d6649bc92f3d1c15bbfcbb88210986ceb2a60cfe03f1c48ef4b5f3b4ae0b57a2 SHA512 70ee208ba6342633ae9cd81b38fc71024583933a4da5317d3407aacf5112672be0abbb872e1a7f617a4eee43c96fe9a64f09b9d315ad97519a6feb34755500f1
-DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
 DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9
-EBUILD nativebiginteger-0.9.42.ebuild 1597 BLAKE2B 92b144c717a511aa85491e72204e2522e901d37cbee29e2323fc8dd4afb3d798cdce5edda60f36d5ba9d78a0adfad7ed88c8dec603a5514620d26f54b032532d SHA512 548eea57016ca6100587a8521cc8383b999f5299a99fd577e54542e46f46254cea00ed009a568d906374a6e81a8072242855a1ee86abbaa9c937352e0c9a550a
+DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9
 EBUILD nativebiginteger-0.9.45.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
+EBUILD nativebiginteger-0.9.47.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
 MISC metadata.xml 367 BLAKE2B e6ae176d14b1c47214343a27d2fe27d22f354879bbe3e27d01fd9fb06944ad57ca6791765dec8246e6a1583e9f66cfc72867b0f85a66f4d0752a64344d9fb5bc SHA512 a568f5918a48ac57cebe1bc19c22f8e7ee2f2e1e9710b088ae7411ae1435bc170a7e81307da909bea3781e2e3217f8791623e3b0f4a50658232af9b000bf4f2e
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch
deleted file mode 100644
index cdb8c7f64cbb..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- c/jcpuid/src/jcpuid.c	2008-10-06 09:44:53.000000000 -0400
-+++ c/jcpuid/src/jcpuid.c.new2	2010-12-27 09:41:53.000000000 -0500
-@@ -19,6 +19,7 @@
- 			mov d, edx
- 		}
- 	#else
-+	#ifdef _LP64
- 		//Use GCC assembler notation
- 		asm
- 		(
-@@ -29,6 +30,20 @@
- 			  "=d"(d)
- 			:"a"(iFunction)
- 		);
-+	#elif defined(__i386__)
-+		asm
-+		(
-+			"pushl %%ebx\n\t"
-+			"cpuid\n\t"
-+			"movl %%ebx, %%edi\n\t"
-+			"popl %%ebx"
-+			: "=a" (a),
-+			  "=D" (b),
-+			  "=c" (c),
-+			  "=d" (d)
-+			:"a"(iFunction)
-+		);
-+	#endif
- 	#endif
- 	return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
- }
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.42.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.47.ebuild
index efe1d0774d35..e0d376b7aa6d 100644
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.42.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.47.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index b23ab165adce..d7d241d3871e 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,4 +1,4 @@
 AUX net6-1.3.14-gnutls-3.4.patch 943 BLAKE2B 47b21caeb130001c44a44d84bc9a6fc459f3e5fbd5c6e19762e41dfe0b8ce04cde049d0f596f4c05d767f0ff0fa76ce56c4881753542bae4ec215cb4b4769a62 SHA512 8fe45b816d21d5542aedcd88cde8013815a9035c51174c6f6f5ecd90eb75380a68c4d376d2c5f45280fab38f662bc0f7a97815e8bdcb335030cd0534c30c542f
 DIST net6-1.3.14.tar.gz 483549 BLAKE2B 171251fbd24eb76cf06999d64ad818817e92abb190b9df71a75c7f68e04a5012e555767b49d99cba8dcbb060e70830bbf47d8fd046381ffbd23c036258e56a7c SHA512 6a604d51da32b13d61a45d3927e937c2fc5dc83061ea4312df363a57ba1a9830215e0a1b794914790d4606411cc71211675ceca86609614718aaeb998598c5c0
 EBUILD net6-1.3.14-r2.ebuild 775 BLAKE2B 204d9d62e812cd2d80c0bf64e45910827ec1075db75ce9b7a2bd812542301ea7bd53e7b5108b82c203eab952147ca41df5602c22ca6995402268a6c9160bd932 SHA512 573f3f3327411f23c957b37112c404a0d73a121779d1ed72c869b36a43380d66a1885cff56b6498b302e0dbad7d66f23ed9eed17494f3fb96b4d83e2b0b36071
-MISC metadata.xml 280 BLAKE2B fc4453c2c6dae8a8498a1d710188f672df33e721eb4c4417864a55cb8df99aa02b7a7b1fdf2df6af175c89296af9892f016e702b816b2915c425452a70f1b6e1 SHA512 8c2fc8a9ab4a6238579c31fdea68d3ce9d2189adbe26b1e60cad36231082c01683ceefc5aa975816066870f0af04f666bb0f9850938065bc805c18130eabdefd
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-libs/net6/metadata.xml b/net-libs/net6/metadata.xml
index e6b34d908066..1b2becffa26c 100644
--- a/net-libs/net6/metadata.xml
+++ b/net-libs/net6/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-    Network access framework for IPv4/IPv6 written in C++ used by obby
-  </longdescription>
 </pkgmetadata>
diff --git a/net-libs/netwib/Manifest b/net-libs/netwib/Manifest
index 2196f708fd38..1ebb47c86481 100644
--- a/net-libs/netwib/Manifest
+++ b/net-libs/netwib/Manifest
@@ -1,4 +1,4 @@
 DIST netwib-5.39.0-doc_html.tgz 139572 BLAKE2B 4680ab22206fee6f09dec4bbd9d352bdc8e30db2cd7080278586eec81ee9bf940aa98ab2d9180a9f202a10578064cea966968616ec4f33e51be5380194fdfbce SHA512 0920642854f71b4c20a8b0844d152aa1107b7cfe927524391626bac97185024261e0efbcb681b978fa612d04cb71a804c7ae604d2040c87d27d118c004940345
 DIST netwib-5.39.0-src.tgz 641757 BLAKE2B c5c17f971888b292e78d65e2b437c58e53040951a727f1d37b556f9ed9b28a67d9d2756d69754459ee531cedd48d3ec24e92c2118b69ee50bee99fa7f791a210 SHA512 eeb3c51c48ed22762fa0e4215dfd239fb97fc0b34f28382d77ad863ed1f2f4a1f26195517fcd26c4b1a96195c895bd7b7ed121af975b5dc49b1bc378b11ef234
 EBUILD netwib-5.39.0.ebuild 1297 BLAKE2B 9bac482c4b594f83b82e482265da51b7395632f82d525f711b939c324f26fca62fceb3339e7e7c020591403ed34361bb834c80eb4dcd1b72df68d7bb0c0c40de SHA512 e77d5c23492e3c4dec2bb23215a45bd7234c4b4752dfb24c74a3b2a18acc1e2d5f7230704424ebe8add528fda100eeaeb485a3bd641f8a4247374d275df665b2
-MISC metadata.xml 455 BLAKE2B 8041f4434e1aad2d8148a64433e965c9134b757ac8046825097d02045eb84210aa5d4b53003ffe0f56680379ede7c34df09c4d4b1e7184b7bc4edb9746eb699d SHA512 53c688f1fcf0890a479df90aa567b0477983b1e613cd05b1845aad32fcb4652e1a6b7a68b87de005af423db89095488574a6188556e70d9af8e4455f9049a07c
+MISC metadata.xml 355 BLAKE2B 3563c4a792658f34b58f27edb214d1733a5fc4a344ffdc0769b3a1e4d53806702fffddc5208cb40d070f11aceef6b4da2f1b3605654f9ce60951ff136ebc90f0 SHA512 884bfc276baec0ea55e92393965292685f3fe929577b08911d6726efa714891c5fceaf2fe61b4eb31ec9c030aee3fad9188e38ba470f42decd454a77ab3f5acb
diff --git a/net-libs/netwib/metadata.xml b/net-libs/netwib/metadata.xml
index 3bf3deb696de..1be36205a85c 100644
--- a/net-libs/netwib/metadata.xml
+++ b/net-libs/netwib/metadata.xml
@@ -5,7 +5,6 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
-	<longdescription>Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ntwib</remote-id>
 	</upstream>
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index ce7eb6bbb6b8..3e7f77efe0f8 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,10 +1,19 @@
 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-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
+DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
+DIST node-v12.18.3.tar.xz 23679596 BLAKE2B 496a8fa0f0368634a900c5961b442cb9ef9e0cf7cb0fc974a9e29624fc40077a61bd6371851d5487b9eeeb50ebf6a238e5db5c801fef000c7cb15bd990cadae2 SHA512 a1c72d4664fbead4e63736abe46417b13dcd0581c7c9f8a94ca5c5b2bd782fefabac63e63f824dda6a771c3b5e647749e3156a611dcb100aad11c3f23e17ed5d
+DIST node-v14.10.0.tar.xz 33377228 BLAKE2B fc2e0b38c0cd56fa524cc01dd262003ba0dbb4f755b9b95079a4aedea75c75b1e588de8cee4503a9699b1fed9983db8827828fe622c1ea32f9d3ee21aeabc3e4 SHA512 902bfe3b142f11ef48076c4af6f3107fb20f617ef1f12a564fc3ea1870e6304458dd30fb9af67c3431b850caa496bbb55cb1d760e46c882603543685d316c733
+DIST node-v14.10.1.tar.xz 33383116 BLAKE2B 68959ad1ed576af327b53080099d8f1e520658f9c7aeb342ba4182f6f058e48d93b1c443e2a91348a221224bfa430a16cbe13b33f339b41eff4a6e41fc1e85db SHA512 fd094fb3ff1f94e913ee876de4365ba1f6d26abd33b60e964fbdf8a205ab8a44885bd69576ec997aee7b36b91a342daf3654bec41377d0ec66e752292aab4319
 DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2
 DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3
 DIST node-v14.8.0.tar.xz 33342288 BLAKE2B 4f8129beb16ece09f14c234395b29bc53e84896fdd9877821a27c80d88a0740d42ea4dcf65a0a5c52a98129262be236207f4c07d81f76cc5e4471f21227083e9 SHA512 ebb20f7163e20e8074dd9cc5d3ee7f3cbc536c55a7753d39c482ea90e9314d8fdfe1a88203be7f250f6d77b9f13da04d32d99770d300c2ab0dfdee3d7582f068
 DIST node-v14.9.0.tar.xz 33356264 BLAKE2B 61e4ad33ad5a80862730a89dbfab5c59395750f38d093944bbedc9ef167e09008e5f5f1545be3e01090d452eee3ab2ce6af9bb0455c731a0c6332c7d7b797e18 SHA512 2e628f4fea9d228e4e13d16166ba4e38a53d9a33edf0c26a63f55f61e99fd9069583613859e9b3ddbc87a6efe70803b723c310d064f9495359b450127b0c01b8
+EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c
+EBUILD nodejs-12.18.3.ebuild 6203 BLAKE2B 67947d6dbb631fa2534eafad1192f53d50985da88153a86e072843ecb6e9431a66c19fa587b746052a9e652cbc176e39495ac16a5d0a0e433d8287d06e44eabc SHA512 2c72ba3340dc906bbaddab7fca35dd0730d327af710b5d2551c974dc389c32b82e46ba281a848e68894000822d0d755fcffe2c9bb7c23c2354d1f91cb2790335
+EBUILD nodejs-14.10.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
+EBUILD nodejs-14.10.1.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
 EBUILD nodejs-14.2.0.ebuild 5854 BLAKE2B b738a893013811417c3dfbc5b9a51541193c2152f60b2ea8989e59f51788be98580e3f300dcb752a89196bd1dced51bb577e63cc60ac25194bc00a3c00818524 SHA512 9f4403626435df54d28a0f0f20e10d1f90f601e9330ac6b94a4717bbd851caeb85db260c3b1967ca66778db29098056cf7641de4840976efaa38bf853083f5e8
 EBUILD nodejs-14.4.0.ebuild 5860 BLAKE2B 668d26dfe8d4c274274851f8b96e8d77dc69205dccdce38b188776ec3f72488f92790f4132a0e3da624b20a52763a67b50bf0b73804339b6a6713e4de23a5dfe SHA512 054656d522edaa005c1cf3efedf29c0cbcbd41ea2ee94aa7000b87b219ececaf4e2d0dc53f728a945b0028fcaac9c38467327f48c23e4d360c2a69a40e7bb7ba
 EBUILD nodejs-14.8.0.ebuild 5864 BLAKE2B 7ee566dff438cdb6e865e7e850baca0abbf3eed480d60c673a1e8cbbff652828a602561a4658b6923c328a1ce872cd4bf08098123329372ff2e811e854f689ef SHA512 cc2a1cf7b04a767e7cfa71b8308bc52763fe6ed8aca8fbab44e161048e59d5f45d946953c7f71d58b576b9c995b8d95fed5ce147988833f7560490ca1f3c12ae
diff --git a/net-libs/nodejs/files/nodejs-99999999-llhttp.patch b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
new file mode 100644
index 000000000000..1b6eb9fb7fa1
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-99999999-llhttp.patch
@@ -0,0 +1,20 @@
+--- a/node.gypi
++++ b/node.gypi
+@@ -169,11 +169,15 @@
+ 
+     [ 'node_shared_http_parser=="false"', {
+       'dependencies': [
+-        'deps/http_parser/http_parser.gyp:http_parser',
+-        'deps/llhttp/llhttp.gyp:llhttp'
++        'deps/http_parser/http_parser.gyp:http_parser'
+       ],
+     } ],
+ 
++    [ '"true"', { 'dependencies': [
++        'deps/llhttp/llhttp.gyp:llhttp'
++      ],
++    }],
++
+     [ 'node_shared_cares=="false"', {
+       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
+     }],
diff --git a/net-libs/nodejs/nodejs-12.16.1.ebuild b/net-libs/nodejs/nodejs-12.16.1.ebuild
new file mode 100644
index 000000000000..29723942409f
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.16.1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+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 +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.34.0:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.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
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --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 mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-12.18.3.ebuild b/net-libs/nodejs/nodejs-12.18.3.ebuild
new file mode 100644
index 000000000000..6148cf5bb503
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.18.3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+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 +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.38.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.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
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --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 mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-14.10.0.ebuild b/net-libs/nodejs/nodejs-14.10.0.ebuild
new file mode 100644
index 000000000000..43b934166628
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.10.0.ebuild
@@ -0,0 +1,200 @@
+# 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.39.0:=
+	>=net-dns/c-ares-1.16.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}
+	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 AR 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.10.1.ebuild b/net-libs/nodejs/nodejs-14.10.1.ebuild
new file mode 100644
index 000000000000..43b934166628
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.10.1.ebuild
@@ -0,0 +1,200 @@
+# 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.39.0:=
+	>=net-dns/c-ares-1.16.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}
+	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 AR 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/obby/Manifest b/net-libs/obby/Manifest
index 893e752ef378..3aa43def613b 100644
--- a/net-libs/obby/Manifest
+++ b/net-libs/obby/Manifest
@@ -1,3 +1,3 @@
 DIST obby-0.4.8.tar.gz 530525 BLAKE2B 81a309763a0720139e91670e03d5107da13ab097e2443b7882c774cfcea1c1a9f8a084e7214590fadc1402c490dcabc9db36a8d9d7090955617980c0732f2b5f SHA512 39cd01e74f8df805bd6f077afab023f70f6da16d421dd0d12abc82972a9ec3e2563cc4ef6bf99c74b59f1c96e18eb3d5065f8b07add8ecb56c26601715f184d0
 EBUILD obby-0.4.8-r1.ebuild 767 BLAKE2B b90c9873c0c2552c9afcca4fb21e605114698bb559faadb9172a445b9d212a5daf4a66dc30011b9d569899086c49dad8a49a21ed38c253be5f0fbfafaa18c049 SHA512 a0ec62111bbc20b8c3bd82a63899af50000c7468fddf1e634c1f754d3ec7ef1f9cda9f95d356b0bc88d762dca11446dc1691030c492952dac511f7845f338974
-MISC metadata.xml 297 BLAKE2B 8aef71e73b288ed76acedb890be16de99f28528b39f5e6bf2e08133479e4d9cd28d452dbd94f8c44e9cdba3455a877813b9c86d4f7ceb6f7bec1f4db11f1de47 SHA512 810966e0a53c4c53c9629904ae40a753977efcc43d468c1b356ee63e0c4b4e47eb34f0fa31cf184adb3ad5eb529727ec04efe3f808a4a56ed45b233193d7cbf0
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-libs/obby/metadata.xml b/net-libs/obby/metadata.xml
index fbb4a0fb19a4..1b2becffa26c 100644
--- a/net-libs/obby/metadata.xml
+++ b/net-libs/obby/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>Framework to synchronize changes within a text documents to other participants of a session</longdescription>
 </pkgmetadata>
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index b02b3732a2a7..753bf6727ec2 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -8,5 +8,5 @@ DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
 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 3101 BLAKE2B 40662dd056224a0ad87b3ef9620f7499910afa912657aba99d157ec89fa9d9581aca7e49f418c5a7c09c1996f4c084f44a077b80b3492b5901da93dde3786cd4 SHA512 6b48d1dec7b04ded7a6a28b6ba10e418f4daf9f06550d1a29db52e7b9a4feed3ce28e66fe797f169fc5d0c7370baa82435d3c6e98b693027cce9d20bd0fea009
+EBUILD pjproject-2.9-r2.ebuild 3123 BLAKE2B b46ba44852d0aa08aa43a9cb2d696b1f1065373e022224154ca49e3357ebb9e2c589b18ea00af0d65cf0270192f0c0b441bd6f723f534cd40d3a57bd796f5af3 SHA512 9ff5be65dd30be1d8b2dccf5021f1eec56e0edc348a5afea71a01ab638edbba2359f52bdd503121b1d88da8c364371556f5b52a2b47d44aa5a3081af7fe16b1b
 MISC metadata.xml 1275 BLAKE2B 6d833264ab353a9393a577f50a5241948bffe17ecfa551aebd4736fef54e7ef316c481faee27ddde3a5aab327a22bd38520e781aaeefc5a2c14cb2fd08dcf608 SHA512 563deb2cb83e6a638d9cc99b912c4ca907acd0ea133168a33d452f29d856b27ee38ee73bf27ed6147b6decfb6b4a74ef1ea40b1742e201408916fdeca9400771
diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild b/net-libs/pjproject/pjproject-2.9-r2.ebuild
index 14cf482e2630..de54ebdfa60e 100644
--- a/net-libs/pjproject/pjproject-2.9-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild
@@ -39,7 +39,10 @@ RDEPEND="net-libs/libsrtp:=
 	portaudio? ( media-libs/portaudio )
 	resample? ( media-libs/libsamplerate )
 	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speexdsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index bcc937373b94..16061b0b3cbd 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,6 +1,4 @@
-DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
 DIST rpcsvc-proto-1.4.2.tar.gz 61788 BLAKE2B e941fa86088d690e3e80a501beb5169a51ff77b60d618f54db9d9fd5fb96c2b2a4277ab8d847dcdb29dadd2f6947d155b15cd8b6af1f1420e023da8637d555c0 SHA512 6769f9439e3f187eebdeef4ee8d54f8a6fee6f410e3137d0c1b26e61b705873932890856faff55b68c39aa702e456b36fe9410b85baf1ef9b20ee97f2158971a
 EBUILD rpcsvc-proto-0.ebuild 478 BLAKE2B c7c8e675ea6a1fab782b3b8da093eada21de0ddda0835aeedf0e3aa39828df23b7f6b797c4178f9eccb676ffb45dc059d48b07e88488d7f4771202154d36c67e SHA512 30964ff01fa3043f9719bebce15d3b64d26dd77fa71375db16bc59ba7308d8db5861d2f8619bdbea425576f714ed428587288774c872a53ee1268f304d0abbd2
-EBUILD rpcsvc-proto-1.4.1-r1.ebuild 945 BLAKE2B b37c837ee226bf9208107c89c2b66b6e7209ff2226cd73c41f76a711959f3aee7188c53262c37dfd409c9968ed27d79db92c6d1c2fc480912fcbe7397b3aa59f SHA512 8d4078193d552d75b6666ea25c4ca1c03a71ab28236bf35609fa08a902cbd23e6e40f5b17f6e867bb83077c70b24fe8e0de74af52d28c67b230a9072eadae8a6
-EBUILD rpcsvc-proto-1.4.2.ebuild 946 BLAKE2B 3d8e3dce7cd6c67d3a3c693b99482bf806ed353a5efb2bde2485e9b69ca21047f18b7c006412221b4347596cefbd9dd8fc74c7eda37b6a31457807b04ed21ddf SHA512 4f79dec2aef4aa0164ee561ee76335cce4fd2e2089b1135e737ed56d75e95940b593f06e579ff41f6339cac9897affd03a0bcfcfaeb2668792c7949890e89023
+EBUILD rpcsvc-proto-1.4.2.ebuild 945 BLAKE2B b37c837ee226bf9208107c89c2b66b6e7209ff2226cd73c41f76a711959f3aee7188c53262c37dfd409c9968ed27d79db92c6d1c2fc480912fcbe7397b3aa59f SHA512 8d4078193d552d75b6666ea25c4ca1c03a71ab28236bf35609fa08a902cbd23e6e40f5b17f6e867bb83077c70b24fe8e0de74af52d28c67b230a9072eadae8a6
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
deleted file mode 100644
index a07ee40040e2..000000000000
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="rpcsvc protocol definitions from glibc"
-HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE=""
-
-# sys-devel/gettext is only for libintl detection macros.
-DEPEND="sys-devel/gettext"
-RDEPEND="
-	!<sys-libs/glibc-2.26
-	virtual/libintl
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Use ${CHOST}-cpp, not 'cpp': bug #718138
-	# Ideally we should use @CPP@ but rpcgen makes it hard to use '${CHOST}-gcc -E'
-	sed -i -s "s/CPP = \"cpp\";/CPP = \"${CHOST}-cpp\";/" rpcgen/rpc_main.c || die
-}
-
-src_install() {
-	default
-
-	# provided by sys-fs/quota[rpc]
-	rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die
-}
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
index d85094fa3c34..a07ee40040e2 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # sys-devel/gettext is only for libintl detection macros.
diff --git a/net-libs/shairplay/Manifest b/net-libs/shairplay/Manifest
index a4c92eae4bb7..76f083eb7d53 100644
--- a/net-libs/shairplay/Manifest
+++ b/net-libs/shairplay/Manifest
@@ -4,4 +4,4 @@ EBUILD shairplay-0_pre20170118.ebuild 960 BLAKE2B d8dd128013d9402402f489d81c6f9d
 EBUILD shairplay-0_pre20180824-r1.ebuild 938 BLAKE2B 45a699b980d2136775f98302a1c9d5bda050c2ecd5f4b27662aa5f724c65107b1d2e6ab3be1602892b9fec0001c1f476d90e7194ea4d816e592d82626eff73c6 SHA512 199b58876e1d6e2a0957ee102d118a8ad35ca65c2921c1e4140fa5e626dbbbed1e671164c8485370d97f74c08452b75014bcd9beb2e3bc5b3865a2602d48e8ac
 EBUILD shairplay-0_pre20180824.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
 EBUILD shairplay-9999.ebuild 926 BLAKE2B c6a518f8deff81b1072948c6be8376cec5827da017e721b1179681fe7797db542fd009aeba277c5aee83997d183fc0c9f7f5ea8fbbb7e9dab0ab9b9247331d70 SHA512 4b76ddc7c46d1712831b1cc5cbb5a03e9727b28c7839a3b4a511ae4a3c16a15fc6d4b3d700fbb9d9356394b472c5023dab128923d446ebce34d973c2dfba32cf
-MISC metadata.xml 806 BLAKE2B 54e0d86fcf821eb4c29502f75a44b7a5dc53747e6e594e4a8bfcc558cef8362b136b17e827a10f617b6115a29f3dda5528555e09c2c6fb1fe43b2132d1a8a177 SHA512 fe0e689e3b0cd7bf95bab72137b10b04d7006b63917142293bca72a58a90c485d3e5735f6036828de714a89180021785361aa8862fcf7405815e0bb57f476329
+MISC metadata.xml 728 BLAKE2B b706a2a73f7d5c6119c6202452535f1b174a0ae6ae63656155941116c9edbe1b96c607624d235bb0410790f0c36d2ca3b602a0169486825e3fddba2b394dffe3 SHA512 911c29e609c4f991a7c8cb031fb71ab66440d4959a1ba16fb45f8282a770588d3572b8712b4afcf531404c993b1657e6e9d4d749b655998822e7e9d0c46cd3b5
diff --git a/net-libs/shairplay/metadata.xml b/net-libs/shairplay/metadata.xml
index 4c3bf6e9c763..470346c82d9e 100644
--- a/net-libs/shairplay/metadata.xml
+++ b/net-libs/shairplay/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <longdescription>Apple airplay and raop protocol server</longdescription>
     <use>
-        <flag name='alac'>Add support for Apple Lossless Audio Codec files</flag>
-        <flag name='playfair'>Add support for handling fairplay handshake (used in for example screen mirroring)</flag>
-        <flag name='tools'>Build and install a binary shairplay in /usr/bin</flag>
+        <flag name="alac">Add support for Apple Lossless Audio Codec files</flag>
+        <flag name="playfair">Add support for handling fairplay handshake (used in for example screen mirroring)</flag>
+        <flag name="tools">Build and install a binary shairplay in /usr/bin</flag>
     </use>
     <maintainer type="person">
         <email>candrews@gentoo.org</email>
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 4131db447fef..0ace9ab30bb3 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -2,11 +2,9 @@ AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199
 AUX initd 655 BLAKE2B bc837b09c4d75cb086bc1757ba1b1963b60ae2123ba041a53557a2ae7c05145be0898ce5c10d60c894ef369c46afe2a65454ab9e2d2a23d1c859c074d80b8a86 SHA512 c7eaf934497329a369ea9fe5eefe061937719e34d965c464ccea6b72b12bf16c7b79bd821e3550fecb1fde3b014f40afad61c10cf4d7140f42d3d8ba964acdc6
 AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822791d2feccb8e44cf09e90779986210bf854c0cff0d1b4519c1b4acd92723e92b8b262859f7d9da7ee55e9 SHA512 0d90ffb47e42013af68b5eb7ffb03d670523b20de17ba7fe63e227502188cfd72242450d09e94d381fa201cdff459307622c9ab19f3bf651d6948979e103e3c6
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
-DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d86e472ec75ff45ff826712efa515682f9439181d52444b2a6a21472c6e78a3bea5bb7e356373faf733e2644a315d SHA512 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7
 DIST c-toxcore-0.2.11.tar.gz 507476 BLAKE2B 67e86a5e5c8da1c387a319e6726eaccec28608f165f0b165d12e379cc7d8080baf9b89f438804ab8e59a8690a11bebba7f2ef689554800312fe039da77e70cac SHA512 616b30423a170463b4445f6940e038fd9af820946c970260fcf72cc54d08d2615364b9f086869180e3ae26154ea92fea6e9a602366306bc40c3e1575e86350df
 DIST c-toxcore-0.2.12.tar.gz 504832 BLAKE2B 625713142cc1e4b6583879144c05d47a40a1d98031a8a2bf0deec85a199f816a0ff6df5c76e9487a526d7c1c1650b37a10ed81be8233eaa1395707851378474f SHA512 c22f139cfff3a5aedf5fb08c33cae0dae3d6fbceec87867c81290e3bf9d2e13466a0e2bad8378a7a7ba1e9b7b9ad756712963461ae248102e4cab7d4691228d8
-EBUILD tox-0.2.10.ebuild 3119 BLAKE2B 4eb4584d7ebc7dcb4e365ef3baff2a2bff5546c37051511f36987abf38f0b2c9b82937d9f33f0efc99697e7c84195eb94f6eb6bf1f57747a80fe386308d636e4 SHA512 bc52cd62f1165d7659adad3e46bf79d7caa708495cc9695205048a16a831cda41cd9799056edef2c7f459b3f33109ae648f36c9f1b7eece3dc5e6c82519975d9
-EBUILD tox-0.2.11.ebuild 3183 BLAKE2B dfadd25086119764477120fefcd81f3d1277223de61d223961cc9fa424e5109beb2aecd6401f5d46949927f2fa96839cf68237e0ee0eb7662fee2f9d853ff0cf SHA512 f170e0826c4e077b0c0b8936a8ea787e0f0ea851e278a3a49399d524040493b7fe0bdfffd3bccdce9e08c724a36c3d543944317d3cbb64e47f431619d75ea5f8
-EBUILD tox-0.2.12.ebuild 2844 BLAKE2B 6a7a2ea6a10b3750c095937ab6e9b9ecd4fe6202281d1b6610b16a452a57f879131d5133654df3713f6e38bfbf2bb012344501f8ef08a810e357af167863aad2 SHA512 995e516b90b21e943fbc5b5731a14b533e180e13becd887bf3de590953df2b0d3279267b03cef62f7ccc67a1df6ecc2a3856d2839b83fb19f7a79c294c3176c2
-EBUILD tox-9999.ebuild 3060 BLAKE2B ee68a7b8141408b59296d0ad7c14ea69d082ae31a736ea4405d10c35414ae91146ac8442dc242a86ee4aa79aa2652dee975d79f9905dd420263d670ee39981af SHA512 3f45c8b5d5e16c9fb52a895b15ba65036bbcae0e8086eac804aa6dd8cbdea4cb1dc3b2402e69c960444dd0ecedae28c2bf3cab716d9867ab97403e976eae1ec3
+EBUILD tox-0.2.11.ebuild 3219 BLAKE2B daa3f0c785d6c426795618731d3667410a1433efd453085e412b464466cfa174831b7fd0c060977fd8c6d9cd668a18e9cfb888b0a8192d6c302bdc035c87175c SHA512 7db0921d096e9b05affc5dae171fed0f8c31c088b3356bc5e2b3f5329b78b6c5e8b00c989bfd6d1b41d1965d578841fc1382c126bddd470d590b774b18ded80d
+EBUILD tox-0.2.12.ebuild 2905 BLAKE2B 14e9022c6c946847c0e4711e3c02e9f36334f84a0b6f3e8da79376af2dc131e9029b1f5a8f5efbebd0e00341772bc96c98b8abeb9f902f6d399b2f78eddd2aeb SHA512 250a3a8d862d03937e54e2a1247b9d3760fc636475214b08606a0eaaa17061a7fa810889349113bfc7df7b9356164ab9cc0e6b8ddbd30b0116324d02258d952c
+EBUILD tox-9999.ebuild 2717 BLAKE2B fe39a1975c90b5924a2d59946789ba9053b8ee5e3f6c6a09654383496d8e5c0d27aa2c18ddfef5d2563b508b0c59f4a997765a57a3cb51b0be3cd3362a214398 SHA512 6f10c3082f71032632e25d6ce3b503a92126d19b5d45d9438c96155da43edf83e30e23a7ac670b55a35887a0d3e85f873678a9c6d0c996514fdb1da171b43972
 MISC metadata.xml 870 BLAKE2B fe6cd17ce54fce4f002d1952694a0f3b6cbfc55be321de1256590721aa6d2e248bf8e9b080708c6cf06bbf8cccba327dc71a18223500d1a0910d1c6edb9ffc55 SHA512 7600b6b0558499e346cec1d6f5ddfadfa7a9fa97187737febe8076379af759f30f7ba90c46f38c70b69a91b39a365c7deb04182f6cc77ba54da9bd792ceb2025
diff --git a/net-libs/tox/tox-0.2.10.ebuild b/net-libs/tox/tox-0.2.10.ebuild
deleted file mode 100644
index 5964c671805c..000000000000
--- a/net-libs/tox/tox-0.2.10.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-MY_P="c-toxcore-${PV}"
-DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat"
-SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/0.2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
-
-REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
-		daemon? ( dht-node )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="
-	>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
-	av? (
-		media-libs/libvpx
-		media-libs/opus
-	)
-	daemon? ( dev-libs/libconfig )"
-RDEPEND="
-	${DEPEND}
-	daemon? (
-		acct-group/tox
-		acct-user/tox
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake_src_prepare
-	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAUTOTEST=$(usex test)
-		-DBOOTSTRAP_DAEMON=$(usex daemon)
-		-DBUILD_MISC_TESTS=$(usex test)
-		-DBUILD_TOXAV=$(usex av)
-		-DDHT_BOOTSTRAP=$(usex dht-node)
-		-DENABLE_SHARED=ON
-		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av))
-	if use test; then
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=$(usex av)
-			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6))
-	else
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=OFF
-			-DUSE_IPV6=OFF)
-	fi
-
-	if use log-trace; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
-	elif use log-debug; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
-	elif use log-info; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
-	elif use log-warn; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
-	elif use log-error; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
-	else
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
-		einfo "Logging disabled"
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/initd tox-dht-daemon
-		newconfd "${FILESDIR}"/confd tox-dht-daemon
-		insinto /etc
-		doins "${FILESDIR}"/tox-bootstrapd.conf
-		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
-	fi
-}
-
-pkg_postinst() {
-	if use dht-node; then
-		ewarn "There is currently an unresolved issue with tox DHT Bootstrap node that causes the program to be"
-		ewarn "built with a null library reference. This causes an infinite loop for certain revdep-rebuild"
-		ewarn "commands. If you aren't running a node, please consider disabling the dht-node use flag."
-	fi
-	if use daemon; then
-		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
-			ewarn "Backwards compatability with the bootstrap daemon might have been"
-			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
-			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
-			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
-			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
-			ewarn "Then just re-emerge net-libs/tox"
-		fi
-	fi
-}
diff --git a/net-libs/tox/tox-0.2.11.ebuild b/net-libs/tox/tox-0.2.11.ebuild
index bd541befcf1b..d293d7067869 100644
--- a/net-libs/tox/tox-0.2.11.ebuild
+++ b/net-libs/tox/tox-0.2.11.ebuild
@@ -80,6 +80,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cmake_src_test -j1
+}
+
 src_install() {
 	cmake_src_install
 
diff --git a/net-libs/tox/tox-0.2.12.ebuild b/net-libs/tox/tox-0.2.12.ebuild
index f6c830c2713e..76511a2fe702 100644
--- a/net-libs/tox/tox-0.2.12.ebuild
+++ b/net-libs/tox/tox-0.2.12.ebuild
@@ -38,7 +38,9 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	cmake_src_prepare
-	#remove faulty tests
+
+	# Remove faulty tests
+	local testname=
 	for testname in lan_discovery save_compatibility; do
 		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
 	done
@@ -53,11 +55,14 @@ src_configure() {
 		-DDHT_BOOTSTRAP=$(usex dht-node)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av))
+		-DMUST_BUILD_TOXAV=$(usex av)
+	)
+
 	if use test; then
 		mycmakeargs+=(
 			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6))
+			-DUSE_IPV6=$(usex ipv6)
+		)
 	else
 		mycmakeargs+=(-DUSE_IPV6=OFF)
 	fi
@@ -80,6 +85,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cmake_src_test -j1
+}
+
 src_install() {
 	cmake_src_install
 
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index 206fb9c4e391..6e0181ca0d85 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -19,23 +19,27 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
 
-COMMON_DEPEND="
-	av? ( media-libs/libvpx
-		media-libs/opus )
-	daemon? ( acct-group/tox
-		acct-user/tox
-		dev-libs/libconfig )
-	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
 BDEPEND="virtual/pkgconfig"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}"
+DEPEND=">dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+	av? (
+		media-libs/libvpx:=
+		media-libs/opus
+	)
+	daemon? ( dev-libs/libconfig )"
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-group/tox
+		acct-user/tox
+	)"
 
 src_prepare() {
 	cmake_src_prepare
-	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
+
+	# Remove faulty tests
+	local faultytest=(lan_discovery save_compatibility)
+	local testname=
+	for testname in "${faultytest[@]}"; do
 		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
 	done
 }
@@ -44,20 +48,21 @@ src_configure() {
 	local mycmakeargs=(
 		-DAUTOTEST=$(usex test)
 		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DBUILD_MISC_TESTS=$(usex test)
 		-DBUILD_TOXAV=$(usex av)
 		-DDHT_BOOTSTRAP=$(usex dht-node)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av))
+		-DMUST_BUILD_TOXAV=$(usex av)
+	)
+
 	if use test; then
 		mycmakeargs+=(
-			-DBUILD_AV_TEST=$(usex av)
 			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6))
+			-DUSE_IPV6=$(usex ipv6)
+		)
 	else
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=OFF
-			-DUSE_IPV6=OFF)
+		mycmakeargs+=(-DUSE_IPV6=OFF)
 	fi
 
 	if use log-trace; then
@@ -77,6 +82,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cmake_src_test -j1
+}
+
 src_install() {
 	cmake_src_install
 
@@ -91,21 +100,12 @@ src_install() {
 
 pkg_postinst() {
 	if use dht-node; then
-		ewarn "There is currently an unresolved issue with tox"
-		ewarn "DHT Bootstrap node that causes the program to be"
-		ewarn "built with a null library reference. This"
-		ewarn "causes an infinite loop for certain rev-dep-rebuild"
-		ewarn "commands. If you aren't running a node, please"
-		ewarn "consider disabling the dht-node flag"
-	fi
-	if use daemon; then
-		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
-			ewarn "Backwards compatability with the bootstrap daemon might have been"
-			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
-			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
-			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
-			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
-			ewarn "Then just re-emerge net-libs/tox"
-		fi
+		ewarn "There is currently an unresolved issuer with tox DHT"
+		ewarn "Bootstrap node that causes the program to be built"
+		ewarn "with a null libray reference. This causes an infinite"
+		ewarn "loop for certain revdep-rebuild commands. If you aren't"
+		ewarn "running a node, please consider disabling the dht node"
+		ewarn "use flag. For more information please refer to"
+		ewarn "https://github.com/toktok/c-toxcore/issues/1144"
 	fi
 }
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index e2bb391f203a..a4defc6c8b62 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,7 +1,9 @@
 DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
 DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb5e40aef85ae8cd8fedef4c655fd2698a7f81431e34550b5156814a75c0b1a738393e7c44acbfefe96acc4c4bc SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f
 DIST zeromq-4.3.2.tar.gz 1697442 BLAKE2B 70a1f6da357987c32483050fcf86cb81a1fb0b65a527f6900f54eea8958c6aa6024af04067114663824d42305f507cba67e03c7aaab7e23e4f6332d4368613eb SHA512 b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4
+DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
 EBUILD zeromq-2.2.0.ebuild 1202 BLAKE2B d7305176ccb01d706480c012de123b16eacc7bae10916377bff524575ecd4a174cab2112fd1a1b20e3465f69d400c5d3a02f3ba8b30cddfdd75f01093f82e935 SHA512 ab6b64d7b0abc80e03241fc26bcf87e753730b9d6bdc52ad09578d83124b7acc3b49aad2bdee662cd99a4c6e26c19c2b49445cf5d60a6b45cb74452502f4c2a1
 EBUILD zeromq-3.2.5.ebuild 1493 BLAKE2B 44f12a38570540f82df5381908f68759b02a423b9a0e9ff014432c02bf6538f2fd08380eb241a6ef7bad12b50bbff0e53b72a05cea11dfb012dab3b229b7c3c8 SHA512 2b5999497c19de44b8846ee173d8dc96ace8d2e9ff1c9f0e1e1ef8633513ed2bea7a33cdf2947b8c5cfda36911a405132a71114efad45c1e40ca6cfb878a0918
 EBUILD zeromq-4.3.2.ebuild 1436 BLAKE2B 500b642be77c2ae67926d932eddead3a872bb6cd5d0a752e2b7fe87f5ce4ba52b3256903f05ba62e923985637fa3c7af08fbbf504cf79b7caff2d74a7f794397 SHA512 333b64802cdafc872e5db83fc3566f6f307e07cdd668939f0c955e6bed2c156dd02ffde51fc17f393842ca13f57a5ec9f44f459eaa02d5fc9ee13331b9600926
+EBUILD zeromq-4.3.3.ebuild 1437 BLAKE2B abdafd58cdfc2807d1aaf9f16f660186441f5d8099ed741383b8cc0f83f323c4002a12e1cfc245f656f7a3b11fcdcb588c9c50f9dc92706ff0ab19c6eefaf88e SHA512 63785fce2db3c9901a9a9afece8568f85dc8367a62f0799559e7799275c0bd414368a2e5fd8a71975c81c739d16edf4e1336d4e34cedb8b38ac5c94cda052406
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.3.ebuild b/net-libs/zeromq/zeromq-4.3.3.ebuild
new file mode 100644
index 000000000000..bb5cb548f8d5
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.3.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
+	sodium? ( dev-libs/libsodium:= )
+	pgm? ( ~net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+	!elibc_Darwin? ( sys-apps/util-linux )
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	pgm? ( virtual/pkgconfig )"
+
+src_prepare() {
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable drafts)
+		$(use_enable static-libs static)
+		$(use_enable unwind libunwind)
+		$(use_with sodium libsodium)
+		$(use_with pgm)
+		$(use_with doc docs)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Restricting to one job because multiple tests are using the same port.
+	# Upstream knows the problem and says it doesn't support parallel test
+	# execution, see ${S}/INSTALL.
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /net-libs
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)