gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-libs
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
256 files changed, 2871 insertions, 3081 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3a35bd60632d..91e3eac81eda 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/NativeThread/Manifest b/net-libs/NativeThread/Manifest
index b153fe9f6feb..a8a72187c471 100644
--- a/net-libs/NativeThread/Manifest
+++ b/net-libs/NativeThread/Manifest
@@ -1,3 +1,3 @@
 DIST NativeThread-0_pre20190914.tar.bz2 3163 BLAKE2B b16aa3ceb3ea18ea13962e53d68fa2eac1854b9141055de251eedf0c9a2cc284e68f3f2601f49d1ac1d7fcef9fc502bf1877161fdb43b1b941a3b9983829e4a9 SHA512 ff0902b874c72f0e15f35374d0a409271ba236343cf24bc708bc7a72677a9a582013bfb7a1e8fdd2aabb741bb5dc04dc901ff4c09841a85324194644d40c58e6
-EBUILD NativeThread-0_pre20190914.ebuild 609 BLAKE2B 29e06d882651e1f0755ea359c1c4d59f33fc69577c5905aae6b5a583e8ce00ec4839199d01916ae574c60847016c7b6bf2dc5311835767de6827221e91d9a56b SHA512 5facd8cd928eac21c4de3167384e0027e62a8c34bf4d8f706e62dac0b84cfe14e11a2e128fb6ab662eea358cdd163130b3b519d5afd2fbde1548ab462f4d7d18
+EBUILD NativeThread-0_pre20190914.ebuild 585 BLAKE2B c9d7b1ed765f9d8f2a638ffec5957337800d07354f3d4713ca836027c22f645b432878622cec0ff16aa1745cce6b0ab27903da63674f7eeff2819fc1791cd368 SHA512 cfcb0b6a5ee8d952f6825304f84c9ddd29d8436540494f43396073703edc99ac2a41aae7777153623b0c5ad9f28cbb36a83201091e3ea64e9f149e1c589b16c7
 MISC metadata.xml 256 BLAKE2B d4cddf1e47808cc6fed0829aa4bfe16d930ee2e12bb3e7355ed4871b41e42dac196735be01fe9b38464183039f2df7f88cdd26750461dc9a3268f9844e3373fd SHA512 26e53ead25d8fef36a3759518b200c6a4ea0fc24d2c1f054ed85772cba5644118b231438d723ca25c22a55ed2fcf54e2c467279c9f3b49b6c1ced9997e3f098c
diff --git a/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild b/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild
index a13407892c05..7d89a6bca773 100644
--- a/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild
+++ b/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic java-pkg-2 multilib toolchain-funcs
+inherit flag-o-matic java-pkg-2 toolchain-funcs
 
 DESCRIPTION="NativeThread for priorities on linux for freenet"
 HOMEPAGE="http://www.freenetproject.org/"
@@ -12,7 +12,6 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=net-p2p/freenet-0.7
 	>=virtual/jdk-1.4"
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 701f467cba72..311871f03bb3 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -3,5 +3,5 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674
 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0
 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
 DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
-EBUILD axtls-2.1.5-r100.ebuild 4859 BLAKE2B 11e8ff0ae951c4d844bd00741f61d070216c0bafdd207c234c3f512b1bdff68e95bf351f6e464d9b0c8cdcd7efb3f979feab4bf22347de54e60ab165e9e7d6f1 SHA512 ea8bf4f5b387c91aa8e77f73282d45a90183c90237d302cb3060e8fe06a3c9fcf7414800b06d8c533aaae33662eb3a58fb002ef6d2c997c6b1637e3ae054dec9
+EBUILD axtls-2.1.5-r100.ebuild 4851 BLAKE2B 654527168c497fcfa02adf84c9445dd3d6ba4916fac602bad198f4a5043824e72d32eca8c8ec54ed28139a0fffe894d75ae7d00abe5e590b377976ffb95c0f95 SHA512 54828ed8e13f1f17a51b40369a19488d48e72de03b08fe1623ffdd3b578d6327e7f943d6e42d561c9209971311e1c2f901551e7ed14d711cbb47dc868390e8a3
 MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0
diff --git a/net-libs/axtls/axtls-2.1.5-r100.ebuild b/net-libs/axtls/axtls-2.1.5-r100.ebuild
index c56626d589a8..d9a47694270d 100644
--- a/net-libs/axtls/axtls-2.1.5-r100.ebuild
+++ b/net-libs/axtls/axtls-2.1.5-r100.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit lua-single multilib multilib-minimal savedconfig toolchain-funcs user
+inherit lua-single multilib-minimal savedconfig toolchain-funcs user
 
 ################################################################################
 # axtls CONFIG MINI-HOWTO
@@ -48,7 +48,7 @@ IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
 # TODO: add ipv6, and c#, java, lua, perl bindings
 # Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="
 	httpd? (
 		cgi-lua? ( ${LUA_DEPS} )
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 1755fa0af8db..2cecd08d39d9 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -5,5 +5,5 @@ AUX c-client-2007f-openssl-1.1.patch 2857 BLAKE2B 748933d521a99409234e62cfee1c98
 AUX c-client-2007f-topal.patch 1078 BLAKE2B 5224ac12119e25c3208865bf1904a21c9d4bd880b685bea1389cc32a30764e8673606085f2d58ec12532618807d61257e02ed2d9b178014c8ba78f9defba1f72 SHA512 f81914d9d0acf92625d2a4956aa82e9639bc36ab12c608dafb8137afe619f6acc5d9647d05a1827bfe27b21c9dd774bd458c8cfa2e5c2e449ed956daed674b00
 DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
-EBUILD c-client-2007f-r6.ebuild 4583 BLAKE2B dac2c56b160076d3e7c465a3cbb79b9e18a93264a70022ac41dbf1907e9ff2187bb5a1e86e7c201ff4c1bde0e1b3e7cc844ce2f337cfbd28c530e1b8eae20b52 SHA512 3f77c3072f72eed9a236868e21e89c05b79d584e42208dbe0d27cbc26b24d03d30277888e3e1d2636c874d807435d6727ffc04484d2b84cc05a244f582dc1a97
+EBUILD c-client-2007f-r6.ebuild 4575 BLAKE2B e101aa7b73dffd3716aa7d51c44c8a130475baa9ec5ef1e9c0aa1eda23ad98517fc2622926d32a90d876aa8bc42343270a16cae61f744cf9daff5ef3b6af5aee SHA512 35436419d54ce1350e16e861afa2aa0d37a79b1f8e2a2d3ab913dd6328bfe20f7a1c34ad6d368a2a03220f2170200753d64f7b971e14a0af684ed2a06d7791a9
 MISC metadata.xml 480 BLAKE2B 1e688b1b8c76882dfbce8625873104438c89652149a9a14069d8692a469101fb7cf4036151e42f888558d8eb4062817f9481e9552b4882bd285f1c73ed821364 SHA512 b59bb7820763cb1c5dab4b0166fafc424fa76aa24465c44c7314ca8ed0b0f0b4d5066fca335cad963d5c4737be1b1d02ff929f0b2a5c5d234728669ddb5379a9
diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild
index 56771f441299..f34716901d93 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic libtool toolchain-funcs multilib
+inherit flag-o-matic libtool toolchain-funcs
 
 MY_PN=imap
 MY_P="${MY_PN}-${PV}"
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa"
 
 RDEPEND="
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index ff424cda15ad..37a0e917c506 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -3,8 +3,10 @@ DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac
 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
 DIST courier-authlib-0.71.1.tar.bz2 2208870 BLAKE2B 5058a5d3182c53020c3be0a693908bd90e6e2397f03124df3efd7c3bd39ebdc794166d49c6153880bbf93518afbf4388160680cd701236b075b6e59624fb6882 SHA512 a1b36f4f3b0f11fb34e5dab197b3a0471bc6a99528fe77836b3b2d12f9dac292be4c181aeba5afa3410685dd6882ed00ff6692e74cd0132ba591de1294d0f2d7
-EBUILD courier-authlib-0.69.0-r1.ebuild 4511 BLAKE2B 2dd9250efd5570d1b7daccf670648bff90301c57df511503058dec0585601a954cb8ed5a58121ac32dd4c0410854148e25ce45f871ce47333595ada90aa878fe SHA512 76786b563120a896110e987b86587a80211cb49f84af86861bfafa301134d13f16997d7411da6caad0466a63ecddcccfaff5cd6e71110766413128f808098180
+DIST courier-authlib-0.71.2.tar.bz2 2208460 BLAKE2B 49aaea85032166ba4867e7834bb2f6c8d3eccb0ebe24b94bac3033a3da2154e3162d06892354b37eb0c38db092ce0096b050246db341b18a32065c19f322238a SHA512 b0bd2356013d48a998908d4825901e8e730ec276699005696948781e8af4014e25eded3116fa5a8a38b6236e9713f454170628b51aedab7b7d2ebec082643a47
+EBUILD courier-authlib-0.69.0-r1.ebuild 4512 BLAKE2B 34a99c77240315486dd328f2e305db672439318e6b41a0282af191142492ea4225bbb9cd0461ab4560cc2953a2ac7337bde4bbddc33e01d4e4bda314c3cfe22c SHA512 a0886941b872bb98ee025163b61b19c3a0fb9e69d678e2ee05894f6d5357fb6c65891f11cc9e61eacd7792303e30da15df0b2d4c6ec80e1f2b33de424669af7e
 EBUILD courier-authlib-0.70.0.ebuild 4520 BLAKE2B ba78dad0a14640b96ced9c2c96285fc2186047cc3c190aa07ae50ecbae5e4630af04588735aa09545f26a9b8d40c1b4b122c44930de57ea26df9bc87021e8b30 SHA512 97dd3146d345d2b41c18391afd3861de59712eccf9f2412439b8ffbcb08df2ad922d113e5f29a73f45c41e160afa1387f2e898932a2c88de47062a6066487878
-EBUILD courier-authlib-0.71.0.ebuild 4512 BLAKE2B 56e372434a4c745776ed0a95a94c153f486b975455d91bb8438c5e2e0af7bf2560841584d1875cb96e68827b9ce5439b949da2b4eb0a2415f0f64b46cb93d856 SHA512 556c8594b9e689caef5b196d15688d7e86962450af7bb94010b4cb85e2d43a2c45368b5e0389a7c668021b52fe3f8f2820ed659cd2f5f53af266184dd6f11fa0
+EBUILD courier-authlib-0.71.0.ebuild 4513 BLAKE2B ba00763eaf52e3ae4b856bc2af77befaf23669f5aa597cdd754a81bbf0ea7b95b539054bcfaba8f62e906d15e201d6ebcdf9efe4ad69784b867cc6f76475f3c7 SHA512 781e907f7f1f3e032fd7ce989ef8ad7d94dbc9f4c13463ce28a541e6ae9f304d47b428ea0060fcbd7876ab6ab05f5ef9c7dd9870e7f0894509d7fcd6ef6b5d47
 EBUILD courier-authlib-0.71.1.ebuild 4522 BLAKE2B a460178e96200383b969c96373264a97c081f8b25aa767d1175a49ff1b60e08f90f27d54d1b1bd07dff9895de842ce6eab4d31bc5e4868fdfed5eb0aeccfa48d SHA512 5c881c789884467565c047be9d37494701fe3a4cb640011905e406f2d4ae82d533baa0f6eb5fc122e6b0a5501bbef590ffec5fb8fec39365541f2ee35c2beb89
+EBUILD courier-authlib-0.71.2.ebuild 4522 BLAKE2B b25d724b5b868ff4ffb0dd9e51ef221d7a4e46c203071592a5ac6fa3ad2c78eb42355df4060e0d74501448f27a9b1cbefc7b9792509c85b1f0ef6a6b8bbcef41 SHA512 e2f4bd61622c368abfb325c1485f2ebf32f5cb1ee117bff5ede4e19223740493b8756f5dc0e45ddd8f69def37e426d5ee635df94f1844493e3cc9ab905d226cd
 MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
index a95655f28ac6..4a8abc450eec 100644
--- a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
index be6b3354a070..cd7055818b7a 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.2.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.2.ebuild
new file mode 100644
index 000000000000..923d27fc838a
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.71.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 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.2.3
+		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 1955d537f9c7..836eb31afc0f 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1,6 +1,8 @@
 DIST courier-unicode-2.1.2.tar.bz2 445242 BLAKE2B 118afeefbb0d957f3a0b7a39e573edbdc3fa1d85c1028f4aca46137402f01a6b4d5df11c48e9d8235483ba277e187863d3f8f7b1cf426a1b5f2d40eb243cca4f SHA512 97d1c12917a1d415b4dfb8155e2573e0e4101112433107e252e393765fa88edd5aa8d349a2c201ea951bf0e9d51ac0f0c6444494c308fbe9909929364661bc24
 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
-EBUILD courier-unicode-2.1-r1.ebuild 523 BLAKE2B 0a5ce7fcdf36958ae4afd09130257d37309524e3363f670be5c4d32d6f1b152980e0d7a8c5e88135e671faef175e9966d820bcbb844c8552e7c161296564b619 SHA512 6e4f24532522e80972bfe3e95d2f996b63bc9fa9cc921f18c1f01cf4e95cd5539200a2a8d081a31130888b832ea4e2c720aa2adb733bcc433a17a20b30b26466
+DIST courier-unicode-2.2.3.tar.bz2 593337 BLAKE2B b384aaac20ae645f4eaf256c90e50dda4e7b7e78f91188fbadae9851c7fb1c994b1b91b942a02cabbea357e15bc3d9e9d64f97d2810a359604303905b3d03fba SHA512 aab25e9b095e11e5744d4148b50d95ded2a5613c48146f90dacb796eba82aaf41b0ea86ec82a0edd702ad2a8c00bb7f784e12c3ddd01777a19edb3da10a168f3
+EBUILD courier-unicode-2.1-r1.ebuild 524 BLAKE2B 193482c0ce637c50aabbd0bfafd54db751fc07720f71f6c87be788e09068731111619ce27911efb10a0673390d3f064fe2a5e0445282d262cc09ff2d16117e0e SHA512 4183e7627946a5f3ca3167fb6d73dc7801d71ca4be8b510441910b2f059eb8b045775e72b563062f5bd70f0fa08ca773cfe0cfe81c0a0e59e2967c01482d5e1b
 EBUILD courier-unicode-2.1.2.ebuild 531 BLAKE2B 9f1fd38475d02afcf9a161501f54884b3ecaccb6738917630e8a80dfde9d50701bfc432584ddf0adbba7c6c8fea6f1946f5f5d7ff226e2c88eeb8220a75a5e12 SHA512 63658aa656ccdec8a9941c23a422f55bca14ba8977288ec96a8ffacc11880878bf9832780cd55b47c684a36b5b206c762405d710d4f527eefa2de221890c14bc
-EBUILD courier-unicode-2.1.ebuild 477 BLAKE2B f5fbf470d191e1eb07c8ac5c237b2db221eca2f616e1bdbaa7576dab6eb9252f5a2ad32ab6aca8c3f853960afcb54579ef86a6310cc3c64bf15fe0bce8516273 SHA512 61e3262dc8e9414fd6d1b8623505e3fb3f32290d327fe64d27bc33766e528d89362e3f24cee9a9a93a4bd54f5a64b36ce06a0468710056ee38de157bde1cfb99
+EBUILD courier-unicode-2.1.ebuild 478 BLAKE2B a3b9872184bed03e527cc7a91b41baaa65a762155bdcd2d0543b4ab51d9dc307414c9a231eadd34af37051725740d8893c3aebe8f99b070da118ab013f48c1c0 SHA512 9e168562de2b26bed904d5c44b445e793a6e8efebb37b84e9a22b7c5c8ee647d671777efb054b4df173da6ef122a8c0def3b1343738f086a93cd0d1505d9f34d
+EBUILD courier-unicode-2.2.3.ebuild 531 BLAKE2B 9f1fd38475d02afcf9a161501f54884b3ecaccb6738917630e8a80dfde9d50701bfc432584ddf0adbba7c6c8fea6f1946f5f5d7ff226e2c88eeb8220a75a5e12 SHA512 63658aa656ccdec8a9941c23a422f55bca14ba8977288ec96a8ffacc11880878bf9832780cd55b47c684a36b5b206c762405d710d4f527eefa2de221890c14bc
 MISC metadata.xml 293 BLAKE2B 85c442aa45e6a97917305b7e9326f8445f5911a3a3913d3540250b83361a16bc07810b8288a692082d9a2203bd696ba87d8fa1b6ba47c046f6d96577d07400af SHA512 39ee602134069ac766933c31bacbab2de9f40aa8bab6450660ce5319a95e285f4d4c463df41f22d7fd7e1c8584634a4b3ada8962941143fe8d4120cbb11515f0
diff --git a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
index bab50bd7818f..8015be8a0066 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_configure() {
diff --git a/net-libs/courier-unicode/courier-unicode-2.1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
index 6dc015faefea..483c9d41a566 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild b/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
new file mode 100644
index 000000000000..6948fe87918a
--- /dev/null
+++ b/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Unicode library used by the courier mail server"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 24b514b66d4c..4940b5e702e9 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -1,4 +1,4 @@
 AUX version.sh 736 BLAKE2B 6f79aba490d6ac467b0f45ae1b3404692c24e897aece8b40f0ba4d6bcd31d980283c6e8f2307bec19d442d45687fad1ca126e50a6443d3eee2ce75b0d9f5c5a8 SHA512 e7c0c49477a7bc8e01bb84a133bef817a5942e8c13db3cbab05f8fd1a5abcbd821dab4016634363b077c869b93becce4ec1431b3e1d28fa969169cf0b9f6051a
 DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
-EBUILD czmq-4.2.0.ebuild 1187 BLAKE2B 2749d42c3ea0226569bdc37d5ed81aa9c8aca13f48730720f5a7f34dc7b7b607ab0e7620a3e9249a9e397298bc6a749365f1ef9a802e05879a460f170eb23ad8 SHA512 00cf49ef271f3ae802e2231fc2c9212da97b1b45488299c9214f121bd4becee21121a40db43367a5e558aa4695d58ebb170df52469cd8bc1161c112a2c58fb07
+EBUILD czmq-4.2.0.ebuild 1168 BLAKE2B 329b9bf87e51d55ae8f8c8b528d96f5a03417fb59cca8436eb3e382a1f0b484fd2aced56f5dab8dfd661dcf51ad24feca51dbd77df67e9549cb5c769b630dd89 SHA512 37a90add2ea8fb85d4f05cba6ff2f031f74a086af47d1bc486b007a2867f752794322cdf3fe82cea20f15eb729bba7a7909aad10fea35c0be948dc6d635edbf2
 MISC metadata.xml 685 BLAKE2B df8cf761a5f66beb5270526eb6494146b13730418bcfed63cf9f1e8c63ff5442b1c8c0556678a737d153729258bb1b79dfd910ac7e42ebd2f3f3d52ac40279ef SHA512 5711249c075704615125fb9208883beb4907a6a0e4fef865ef948ad6925399aae34efe03aa61f68d30a561fa12ebfb2f14795ce281defd597a164629e62451fc
diff --git a/net-libs/czmq/czmq-4.2.0.ebuild b/net-libs/czmq/czmq-4.2.0.ebuild
index 2eb22f2b402f..ddf995f59146 100644
--- a/net-libs/czmq/czmq-4.2.0.ebuild
+++ b/net-libs/czmq/czmq-4.2.0.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit autotools
-
 DESCRIPTION="High-level C Binding for ZeroMQ"
 HOMEPAGE="http://czmq.zeromq.org"
 SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index d38fb489c42c..350b8e7362a1 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,5 +1,5 @@
 AUX daq-2.0.6-parallel-grammar.patch 560 BLAKE2B 73cae026bca21c573a3871b1a7d97d3fce93f0d66328a840003b0b538792bd8439745081bbda3742d59b5f0880a4a844e919b6db6a19601bebababfe138d1ebe SHA512 d22182c91be6283a057f7f33ea093ba064f8a880fbebc3342ae0ab2d2923fee2fbb2ef1ec69b144b0dfb2fbca09c0f6a6421a961a88832d7b952907e6c2e2665
 AUX daq-2.0.6-static-libs.patch 5093 BLAKE2B a374f1d8aa237f55a102dff62084ff3cf62b9672f72448af4f6a1c29aff1f3453e0a49bd4d6c8b209d928425f71bf21d2272a9f6733fb72cc31e52f7ffdc04d2 SHA512 ef793b31c2759366f9890afb8229ce6e47552d4634ea3ae05c77dd55eb674be5e35a9443d271414671945b85dfb7f316a347df94ffea687a382f0b562b191102
 DIST daq-2.0.7.tar.gz 520287 BLAKE2B 799a8e240c9e359a08ac74ef4fe0d92882d4635f270beaf5f5077bb20cc200d6cf8c55e2c68a59ecabac361ce00619d66ddeb4d7e9a25094b16b3a858673099f SHA512 9bedddbc2d952526ab4e1d65f4507eb914507f8b3b5702ecf7137f8a210c690703469162a117a76cb8376a5639db46bd767fc48789ba7294a0bad26d4cd0ede2
-EBUILD daq-2.0.7.ebuild 2060 BLAKE2B 50bf278b780dff6a4e56cce21ea4c235ba6c2ace8052c827fdb8c29824afac947a3a308444ab1881b88af47fa28a6a8ab34fb4edfe49b7b046e8161d8b63af28 SHA512 ca9ed467651297a25a213f98c511d6243b7253757e80fb2956707ea93286c85a4736d7ba43082ce9a5574e39956e31bfb8bf9375f4a598aaa68cac4461ef493a
+EBUILD daq-2.0.7.ebuild 2061 BLAKE2B 39f18f55b38251f708c04c4c0a918f866efeb280b49cafc988951918ead5362a10bc80b85a3f0e6b4e039fdf0241a52ceb7dadba577c24d4a4c4b5e110a83237 SHA512 95e4710ae49b99590150a0b820951823bc2adc540b7a5b30bf5590068bcb1a379abb6432383a442307098e97d2f72d4087d338a4228fd286105a186166b7d61d
 MISC metadata.xml 1314 BLAKE2B 167ce20e3e0130835e68309dedcbaac8313455fe7bdf680b00975ebec436d554c4c9d44c71e5b42b4af4b0aa7f7ea5eb7a0d1993c0ee37a0cd1d5267107cc9e1 SHA512 8eddd30b83bd5f03280d208ce11df9e388adb7df2fdb9420bc7fadf6956b85012e0ed6a5fdbace36c5c5f65ff8e711a749da2eb17bf585c6223cfef95218831b
diff --git a/net-libs/daq/daq-2.0.7.ebuild b/net-libs/daq/daq-2.0.7.ebuild
index d6681e08a357..21c38f12f6e5 100644
--- a/net-libs/daq/daq-2.0.7.ebuild
+++ b/net-libs/daq/daq-2.0.7.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-inherit autotools multilib
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Data Acquisition library, for packet I/O"
 HOMEPAGE="https://www.snort.org/"
@@ -27,6 +28,7 @@ DEPEND="
 	pcap? ( ${PCAP_DEPEND} )
 "
 RDEPEND="${DEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.6-parallel-grammar.patch #673390
 	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
@@ -34,7 +36,6 @@ PATCHES=(
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -66,7 +67,7 @@ src_install() {
 	# This has been bugged upstream
 	if ! use static-libs; then
 		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"/usr/$(get_libdir)/${z}.a
+			rm -f "${ED}"/usr/$(get_libdir)/${z}.a || die
 		done
 	fi
 }
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index a3f930322c87..7daefa9f35ef 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,7 +1,4 @@
-AUX farstream-0.2.8-make43.patch 1959 BLAKE2B d7c18eaf156a6cca991014dc512898cf93f1b67b10c78f28bf6cebf772d4a8974daba1305f06d7087f43fd766218d49724dca471835fcfe5dff06a105f40bb53 SHA512 c577c5f9fb384f93ce7e36cff117d3c2dea92dc7b15064dfed19d18fc5d8658044df19e2f0cc112cd347e35c6038501e0b05a1f97c95b0f43f776aabd8fba01b
 AUX farstream-0.2.9-make43.patch 1423 BLAKE2B d17a589cd2c91eab66cfb86c3050e0c9fa6cdf7a92ffb9e483f7cce2cbb9106ddc3755f56e70a33446b59aee68fb5e8bf9a4b6cde3d480f0ed411b42bb273ec3 SHA512 55c95b76e897b64b350f1740cf65311bf3ce1e2ed24515c713dbe8f0a4f1e4d4232e630e5c8abd8fce580f4ff7265f77bdefaf78ac3eb135342b2a70305bd104
-DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 DIST farstream-0.2.9.tar.gz 1334833 BLAKE2B 3c23f9534cb8578acd82bb0f7308891e0448cbf5a5b986f27d14e4d727a1e52f4268532c44dcc84e2a1db19504840ddac128c9bd0a731f06e2972d233d8781b9 SHA512 8840725d2f1de59bebc8c49cf68a6712822a4e7b6ba9078713f80e3c35a39135565a1a885edab43a562f895e11b8f5d8d666d57d9b3814dabb661f46498515bd
-EBUILD farstream-0.2.8-r2.ebuild 1885 BLAKE2B 2da12350f5bd058d35ab5f06f9b5b52ec79cd51a65deb3f1f2fe71c8d5705101c4602344b4b279d06d09af9bf21c700034a63d0245ce8597edb0b2b72076361b SHA512 6256c320d320b4a47b622d6daa04c8c9adba0df5452d6d8facedb529708a1b804ab876b20471e535d1a777f22559a30f152b2fdd13f20eba647cd60a3dce5d89
-EBUILD farstream-0.2.9.ebuild 1910 BLAKE2B 58752747ef7c7549b4925e9eb8850059f8bb6fc838a996448c4e5460ab3f4e31a0e9685f2a4e76eadb6bfdc195dfe85307d842d0324c1a31483919ba8faf1d00 SHA512 dbbbb7dd2fe1254a7c4dbe5c95debc0ea41a803a658fcade307bdfec3f6e8546ab392b710fad24203496b1d2e2adaa81dd1a96dca58f18ff825dd467ab2255f0
+EBUILD farstream-0.2.9.ebuild 1904 BLAKE2B ab910554bdb54fce15c29ba5b9e54b0d10d982c40e3538bd07eb1812e64c1a64942606ffd29155894a059f8862deef7ae6198fcf94b00d17cb24ae21c5055af3 SHA512 d34582a20ddb599fd2f7852aebc3b79b67b39d8d7a75cb429bc99fd76e5c7c4fd4de466214f1fc1966ae8e9894beaa26a8f046ffdbbe8d1d7d55a18ba8aa10cc
 MISC metadata.xml 324 BLAKE2B 5d42923f0341e578e9a43d0a7c22a9f3c4110252bc5acd869d4a92a7e9ed08e7262d9ebc559cad8c3f7de63ff411daa6ff25178b37be3493eb464a7d48a88a2d SHA512 c97ce61625bf6ae20953c5164123c8494be83d4870787b247f460103c9965e9ad8d599ded1a67f7fcf91e4f0156674fdd4fa6d4177577f766d60a65eda7af93c
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
deleted file mode 100644
index 3ef67aeb0e53..000000000000
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
-SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+introspection test upnp"
-SLOT="0.2/5" # .so version
-
-# Tests need shmsink from gst-plugins-bad, which isn't packaged
-# FIXME: do an out-of-tree build for tests if USE=-msn
-RESTRICT="test"
-
-COMMONDEPEND="
-	>=media-libs/gstreamer-1.4:1.0
-	>=media-libs/gst-plugins-base-1.4:1.0
-	>=dev-libs/glib-2.32:2
-	>=net-libs/libnice-0.1.8
-	introspection? ( >=dev-libs/gobject-introspection-0.10.11:= )
-	upnp? ( >=net-libs/gupnp-igd-0.2:= )
-"
-RDEPEND="${COMMONDEPEND}
-	>=media-libs/gst-plugins-bad-1.4:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-	media-plugins/gst-plugins-srtp:1.0
-	media-plugins/gst-plugins-libnice:1.0
-"
-DEPEND="${COMMONDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.18
-	virtual/pkgconfig
-	test? (
-		media-libs/gst-plugins-base:1.0[vorbis]
-		media-libs/gst-plugins-good:1.0 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.8-make43.patch # remove when bumping and switching to Meson
-)
-
-src_configure() {
-	plugins="fsrawconference,fsrtpconference,fsmsnconference,fsrtpxdata,fsfunnel,fsrtcpfilter,fsvideoanyrate"
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable upnp gupnp) \
-		--with-plugins=${plugins} \
-		ac_cv_path_PYTHON=
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #539224
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	addpredict /dev
-	gnome2_src_compile
-}
diff --git a/net-libs/farstream/farstream-0.2.9.ebuild b/net-libs/farstream/farstream-0.2.9.ebuild
index 4c76af4f7c7f..eb7ddd40101c 100644
--- a/net-libs/farstream/farstream-0.2.9.ebuild
+++ b/net-libs/farstream/farstream-0.2.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp valgrind"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/farstream/files/farstream-0.2.8-make43.patch b/net-libs/farstream/files/farstream-0.2.8-make43.patch
deleted file mode 100644
index c1e1c0d42791..000000000000
--- a/net-libs/farstream/files/farstream-0.2.8-make43.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/farstream/Makefile.in
-+++ b/farstream/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -549,7 +551,7 @@
- glib_enum_define = FS
- glib_gen_prefix = _fs
- glib_gen_basename = fs
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@introspection_sources = \
- @HAVE_INTROSPECTION_TRUE@	$(libfarstream_@FS_APIVERSION@_la_SOURCES) \
- @HAVE_INTROSPECTION_TRUE@	$(nodist_libfarstreaminclude_HEADERS) \
---- a/gst/fsrtpconference/Makefile.in
-+++ b/gst/fsrtpconference/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -569,7 +571,7 @@
- glib_enum_define = FS_RTP
- glib_gen_prefix = _fs_rtp
- glib_gen_basename = fs-rtp
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
---- a/transmitters/rawudp/Makefile.in
-+++ b/transmitters/rawudp/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -496,7 +498,7 @@
- glib_enum_define = FS_RAWUDP
- glib_gen_prefix = _fs_rawudp
- glib_gen_basename = fs-rawudp
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index c8072b43f46a..9809144b0775 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,9 +1,7 @@
-DIST glib-networking-2.62.4.tar.xz 186004 BLAKE2B 0fbf41cc916a76d23382eb6ae84316e5328c682c4e440f304a978be897f81778e96a201a19dfdc4bd912c144d4013b4cb6344a2a0031fc2898f4af31ef0b43fa SHA512 cd233eeed7ffb8458f4e0316a08927713899e64ce2654aa34f267ccf09d2516e7dee79012dd9e1488d3e8c0e1795c3525523bf8dc5f82a71c1b202942c38363a
-DIST glib-networking-2.64.3.tar.xz 189760 BLAKE2B 5f067aacd0d7724367eabf961d81fba9d77a7057cc60ffc7bada0f55a7eff0bcc2388e8298792636c77252b9494a6a7d36bcfd227bdfbbf66e5d45cf77dfc1bb SHA512 01251f7f95d1c331e883d5ee7857bad0c0d6308991e437ff54ed63e718bb30a12e872755e0611e2bf6ccb2a01c52ba865fe0d94ac69dbab37d74afe063a0590d
 DIST glib-networking-2.66.0.tar.xz 193920 BLAKE2B bba3c74a3676c15fbe3b9cb97aafb3c9320ebb6f7be1479a66cefd233aa5a548a605be74156445e6a54e8cdb307a09e2916f6d8736640ee38fce9ca289de195f SHA512 697798864746b40542873257a789290cacee425467e32c0eb096c87e124b37510753a990ef5d350f1db85c24da88e448bca9d8d8b4308123a74feac299176de5
 DIST glib-networking-2.68.0.tar.xz 237992 BLAKE2B dab2b692c48366ba71325e1808d51a1d7614c29c21448f6d95388c262ec7c6d647489be933595d4e38151d1eef70385181d891d6613e6d1a0a2c95b3b0d764e9 SHA512 3961851d1c39352bc6cbacbc966a7ad075467ca17006eca432ea0646b660fed85951951aee72597a8a595420e6160fd91dca612c241a0505f4f0a67922ef1771
-EBUILD glib-networking-2.62.4.ebuild 1730 BLAKE2B c4184f83f4ba69b5b061208f4df37a16bfb27521e3b5e69d4a4bf123568348979744cfca1030364cb2800497dcd468d70be2896f619a790467cb5ffa355fb2c5 SHA512 4a85bfa3ecebbe651797e0913ed85438001ae44e4989d4d820c1004d70498918a012f1d4baa4f1b467ff345fbbf7ea3a2cbad76e0e5dd24a201caef04b538ac8
-EBUILD glib-networking-2.64.3.ebuild 1730 BLAKE2B 2e6cee2c446169ebd9859fa8b432320a454811e12af7dc222c16f80738c34c64a122f8f6a3d31524ce84385f6236f42a0bc6ce2675523c193f9834b8866d619b SHA512 0c0cd2a47c7f4d452eda6cc62bff74d96310befb353076629085ea63c3d6837830207b36b9183626faa1bd3cdebd9d05d864d06e93ec829e1f579be68862a332
-EBUILD glib-networking-2.66.0.ebuild 1737 BLAKE2B 884e76bf5d410629ead60596404728eb4b7f0cd97ab9ca3863e5b0c2a9b0a20a824ac29b7938b78b6f64cbf6650315b087b488719bc5c6e411b6334d41ceada8 SHA512 450990fe682cda41c169ef323c387a466fb59007717af17734c4a78f82cbaa993be4e125b4bd88c83374cb3832c4bcf06fcac0507d10dca09ee601477ef74677
+DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22
+EBUILD glib-networking-2.66.0.ebuild 1731 BLAKE2B 1c6d54281519fdf26a5d3b92b97228832caf633e215dd2a25cf771d39bcdc09352581387becc77c05cad4e5bb64da31ddfec27c41fb5ced1abf023f4d742321d SHA512 1a259111f5cf387d775083a2c22e4bb40a640bf76f9157f4d0a63052fd599d7b488ce648480a84537a29c88c1bafdedf88cf689907ff74268d5e46b4623d1ec3
 EBUILD glib-networking-2.68.0.ebuild 2084 BLAKE2B 186a10f4c6bb5d5a029c1bf7c94ad911ef215ab30399f48cb4f715cecfe45bd1e23dad51527f9a8d2bd1971c36c4abccb5a9b4ecb4ad3a8c2bea61e77ff60c57 SHA512 4470c628b24ff3df4eeb27d640530c2557940a35d9001c75ab62a8aec399f8096b660f009b939ceedf668f537f64bbbd5c816c8649d07352118ef63783bb4dbf
+EBUILD glib-networking-2.68.1.ebuild 2084 BLAKE2B 186a10f4c6bb5d5a029c1bf7c94ad911ef215ab30399f48cb4f715cecfe45bd1e23dad51527f9a8d2bd1971c36c4abccb5a9b4ecb4ad3a8c2bea61e77ff60c57 SHA512 4470c628b24ff3df4eeb27d640530c2557940a35d9001c75ab62a8aec399f8096b660f009b939ceedf668f537f64bbbd5c816c8649d07352118ef63783bb4dbf
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.62.4.ebuild b/net-libs/glib-networking/glib-networking-2.62.4.ebuild
deleted file mode 100644
index d1a91d25ddae..000000000000
--- a/net-libs/glib-networking/glib-networking-2.62.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson multilib-minimal xdg
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gnome +libproxy +ssl test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.60.0:2[${MULTILIB_USEDEP}]
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/gnutls-3.4.6:=[${MULTILIB_USEDEP}]
-	ssl? ( app-misc/ca-certificates )
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dgnutls=enabled
-		-Dopenssl=disabled
-		$(meson_feature libproxy)
-		$(meson_feature gnome gnome_proxy)
-		-Dinstalled_tests=false
-		-Dstatic_modules=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/glib-networking/glib-networking-2.66.0.ebuild b/net-libs/glib-networking/glib-networking-2.66.0.ebuild
index 3b2f65a990f0..07241df42db4 100644
--- a/net-libs/glib-networking/glib-networking-2.66.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.66.0.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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.64.3.ebuild b/net-libs/glib-networking/glib-networking-2.68.1.ebuild
index f22fb43f04ad..5d4e94cae8f7 100644
--- a/net-libs/glib-networking/glib-networking-2.64.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.68.1.ebuild
@@ -12,22 +12,37 @@ 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
-	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.67.0:2[${MULTILIB_USEDEP}]
 	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
 	>=net-libs/gnutls-3.6.5:=[${MULTILIB_USEDEP}]
 	ssl? ( app-misc/ca-certificates )
 	gnome? ( gnome-base/gsettings-desktop-schemas )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls[pkcs11] )
+"
 BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 "
 
+src_prepare() {
+	xdg_src_prepare
+
+	if ! use test ; then
+		# Don't build tests unconditionally
+		# This is a hack to avoid needing gnutls[pkcs11] when USE=-test
+		# It may become a real runtime dependency in future
+		# Please check!
+		# bug #777462
+		sed -i "/^subdir('tls\/tests')/d" meson.build || die
+	fi
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Dgnutls=enabled
diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest
index 54fb2ff634eb..91b05ebc3ee0 100644
--- a/net-libs/gnet/Manifest
+++ b/net-libs/gnet/Manifest
@@ -6,5 +6,5 @@ AUX gnet-2.0.8-test-existing-domain.patch 1000 BLAKE2B 26d58d6bf8a8fe3b46e7cc892
 AUX gnet-2.0.8-unittest-build.patch 1041 BLAKE2B 0efb7cd8f6d2b2cd8e775ad499614a4de2659153070f940a5326de36ca70b621b6ea41d27307cc62b67a20b3a490416884e3438b506c152f8370c2bb38468292 SHA512 f7cec5602a33a14083117188190881bd4e6cca188a16d854b9d48fe5fab7653386f7e8e116d2c3eedc30595068e844078b73286cc80e2d165f7acec0b8376773
 AUX gnet-2.0.8-unittest-service.patch 1093 BLAKE2B 572ac32893cf3221c9e2743a97bdf91dd60bba521ed54dac9252d260445d0da67b6b2eb68d5b21cd760f1e7e61b71c6f8ec7ffbce8b8ad4f248e27ba55bf505e SHA512 2b815264462491b072a7ffb2f8413999149aa249d33d5500fc2279b523c518a31c4dcb1baf3c5554bdfef0c6f4c112ebf1d26b19f211a0a7ace9f867e07c037b
 DIST gnet-2.0.8.tar.bz2 514019 BLAKE2B 6e09912d4d438fc55290c9df45b2fe29397efbaf2ca0ff88fa6e22a9935aa1520f4a1faac24720ab1925bd6537a8725766351e4256e036ef61cfea91470bc6d5 SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f
-EBUILD gnet-2.0.8-r2.ebuild 1988 BLAKE2B bc079a068edcd2cd4bfd8d84470c104f9f94d7d6658bfbda40fbb9c25f8a82678dbedb381067d9ddb38d081ff0e068a2ed4caed8ed743211a711714595a7c938 SHA512 9dd5e6756c93f8ca42530a919b9ac63dd6f6d3d30430ffe8c26817275818be3eba43e340193c1774f82d37fdf87d37dbc4cada58b16ada23560cf6bcc9526a77
+EBUILD gnet-2.0.8-r3.ebuild 2021 BLAKE2B eda8e9160233c6d7efe989356e2d410f819a6f94d40ee652e17d9c0d059c290a55fb4e103d8a3435164f6d2f0d18aa80afd1f890788675c65c3eea1145434baf SHA512 247f5ce38de9e8ad19c6be1a9fcb7754bd2ff292865a16bdd099a3e31187b523ad12e09dcc96af02bf49257c286ff62b4919960421f10bb42c8a59ae8b8d43a1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gnet/gnet-2.0.8-r2.ebuild b/net-libs/gnet/gnet-2.0.8-r3.ebuild
index 4ed80b5b4ed5..40c3a0ad5151 100644
--- a/net-libs/gnet/gnet-2.0.8-r2.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit autotools eutils gnome2
+inherit autotools epatch gnome2
 
 DESCRIPTION="A simple network library"
 HOMEPAGE="https://wiki.gnome.org/Projects/GNetLibrary"
@@ -55,7 +55,8 @@ src_prepare() {
 		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
 		configure.ac || die
 
-	eautoreconf
+	# bug #672170
+	AT_M4DIR="macros" eautoreconf
 	gnome2_src_prepare
 }
 
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index a81a1b26e745..a3d6ed756244 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,7 @@
 DIST gnome-online-accounts-3.36.0.tar.xz 860472 BLAKE2B 921f2f5ed9ac3db07046507723d814fc41579aee76cd2437673cdc3612db1077627ab47586e719b56a5bce25afe75b8028477f69745791eeb774c82bf854863d SHA512 2d04ea016c1bace9a2cb6ef7a6539c7f878cfa9b309394b18ed692ef1b9b73bf5f93a3f9edcb74170f1be4823a5c9ac6cde3b4e7245906e1b4e130d33eeb1c81
+DIST gnome-online-accounts-3.38.1.tar.xz 861008 BLAKE2B c66f8e59fffc69b5ad570040959fc559f788e76ba8b6b2e289b9b985c10bbb238056de39dd4e4f078ada351d38a51ab6765b4070650c97bbabc3ac1abfc3b844 SHA512 3cf38aecde3c28d51d5185f0ff7facc41191a9b6d8168ec5a8509e0e983f688607591e37fde4c75b69c5c6e2b5ac54827192eca7f41c9b7fd3e5882ccac9b155
+DIST gnome-online-accounts-3.40.0.tar.xz 860724 BLAKE2B 47f22af85b701854396c462df04b9ba2e004ee4a954619916240fef0f8139e3a37608bb9c16e4cfabbb6fc863e7448678a48865620c0293d231f9b125fe9c904 SHA512 ac90226023e2a69ad9cd12faf637844a029814282f164cc905810bf54af6693069b9019ca58211deb8487f6a32886eb072a1223fca32bc4e3fe0bc91ce8f2d6c
 EBUILD gnome-online-accounts-3.36.0.ebuild 2000 BLAKE2B 6fa042b85c7bdbe0f80a52dfd62473cf15829c2f95bf14fc94f003ea000d33991f52426c63149221722fc73ae0ed408927acaaf848c751e9814ab57cc7881b46 SHA512 d1b8d5c98688831f218f4076bcf7cace567f712e56cd0a9f30ecc8482f81bdc7b020708c31d6efb69509ae1631188ec798a2c652c4f6e1c9f488f0332082881a
+EBUILD gnome-online-accounts-3.38.1.ebuild 1983 BLAKE2B 7f825b9d5971aeaf8de192dadb313fbafaecc44b209d84bc83873c004ffa4f6f77f37d994eb37aa9130eca04c231e7fee17db50cec03f1cc6893cb36792d5371 SHA512 9fa839112f5ca826bc327f9ac8dd3d808eb68bd112441173eb238a88a44fe6353956c1394c78d9dc7b38aecd26940b338a2871d8fa430ac6d7bb0042de194d9b
+EBUILD gnome-online-accounts-3.40.0.ebuild 1983 BLAKE2B 7f825b9d5971aeaf8de192dadb313fbafaecc44b209d84bc83873c004ffa4f6f77f37d994eb37aa9130eca04c231e7fee17db50cec03f1cc6893cb36792d5371 SHA512 9fa839112f5ca826bc327f9ac8dd3d808eb68bd112441173eb238a88a44fe6353956c1394c78d9dc7b38aecd26940b338a2871d8fa430ac6d7bb0042de194d9b
 MISC metadata.xml 379 BLAKE2B 36ab13a2c6483f81247083c86d6424d66e0780ac4e16c485588bbceb8ce8174de38796de29af933831ec3075dacef135d2c06d18b22d601e28a1f5fe5f7661dc SHA512 fbd620273932175e14f89a7c155819d7733309eabdb0a82113f9a88d8e33aae3c2b35bdfe5f0883c133e94d4eccf456ba496c419d15e98fd0cf79b685f7a8c69
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.38.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.38.1.ebuild
new file mode 100644
index 000000000000..221ad9075e73
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.38.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="debug gnome +introspection kerberos +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	>=net-libs/webkit-gtk-2.26.0:4
+	>=x11-libs/gtk+-3.19.12:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	kerberos? (
+		app-crypt/gcr:0=[gtk]
+		app-crypt/mit-krb5
+	)
+"
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.30.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	gnome2_src_configure \
+		--disable-static \
+		--enable-backend \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-foursquare \
+		--enable-imap-smtp \
+		--enable-lastfm \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-windows-live \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable kerberos) \
+		$(use_enable kerberos fedora) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
new file mode 100644
index 000000000000..221ad9075e73
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="debug gnome +introspection kerberos +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	>=net-libs/webkit-gtk-2.26.0:4
+	>=x11-libs/gtk+-3.19.12:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	kerberos? (
+		app-crypt/gcr:0=[gtk]
+		app-crypt/mit-krb5
+	)
+"
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.30.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	gnome2_src_configure \
+		--disable-static \
+		--enable-backend \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-foursquare \
+		--enable-imap-smtp \
+		--enable-lastfm \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-windows-live \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable kerberos) \
+		$(use_enable kerberos fedora) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1655fdba12cf..17b1ca0dc9b3 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,9 +1,6 @@
 AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0b579d77483b9fc0f779bb24e3ba50953c2ca2b2bfc7774861085da3d9709fdf250c450cc77aa312095f816bf67748b5d2b5bed4f43ee SHA512 6f2dc20dbdd27875a964aa806380556f4a3da1d2c0c4f7337e0845fb304319b5b9ad94ba519982a4db75486f673a717e20c294487b2d3e339bf7d144a0f33803
-AUX gnutls-3.7.0-ignore-duplicate-certificates.patch 11218 BLAKE2B 2d2b03b17dd482e11c4d51e8947459f0543f6f053be4175bd324b3395af31b77fd689613842abd147ae2cfe6ad4f0abf3f9dd80dec69685b36097828a0008dfc SHA512 65e0a4660caee99ca2d129227061a165fa7a0f5aee085a1ab5e4bf4939549e268d2988d601bc3a719c64e19597fd45bb19b3e6f721ac7ba290249c67e345096b
 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
-DIST gnutls-3.7.0.tar.xz 6129176 BLAKE2B 3b03e7017ac1d715c740f8f09b0690dd1c983dcfd5faef0740cf66ac785c1a84e959f85808aa10a6eebd745d96ca0293681049911ea663aeff85fedfa2567aad SHA512 5cf1025f2d0a0cbf5a83dd7f3b22dafd1769f7c3349096c0272d08573bb5ff87f510e0e69b4bbb47dad1b64476aa5479804b2f4ceb2216cd747bbc53bf42d885
 DIST gnutls-3.7.1.tar.xz 6038388 BLAKE2B 1d55eb441827c7148d63bcad37bf7bc62d539ee9bc7e14c2fe5ec1d0bdcadd75e2cbc98ba104523b24c8dfd9526b4595475a818d206971cc012fac509cd33a6f SHA512 0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95
-EBUILD gnutls-3.6.15.ebuild 4303 BLAKE2B c4aa9aed6ba8b99aaae8c3541d087afe299e37beaf78167876535b49aa9f7bc5ef624d5b04d4124df074ae08c63dccdb543e4bcdf9347cf6c4ac86938d60c62e SHA512 61a3ff29bd0821b07a7792b0d5d1520eb1abadc87119b8ba1cdc30980c299e47e40637cee61621607d860f7b66a38cc17714938995e7c477d1a85fd4b5b4e001
-EBUILD gnutls-3.7.0-r1.ebuild 4308 BLAKE2B c72d05e3119bf539a2f5058ba2d917c28f05700d20a7e5773ad8ef3d3bcffb1ec5603e5238d42aef2e2ecf8d7d8755cdef181ded939cb683a93e2ae416506f16 SHA512 35e6036471eb50cea51e52614dc169972d8cba4da7e36b6f0e9c357e3c9d54e7cab828c84fd86ad6d960ad8807d3d599acb1c1109cbe29cfb3ccc351610633a3
+EBUILD gnutls-3.6.15.ebuild 4304 BLAKE2B ac36fdbe080003eee3519cbc05ac7b8bcd2013ca24e5269d37d841b5199df3c4140287505b98e45943b47304adb3cd5136d604ccbbf25fcf1fbec8ece24e5f18 SHA512 891490e57eb4aaf60877a060b24c2d783a6e85807456ff6856563d4c9fe30641b101ed67934ab9a5743f868d5e1e1552029ef079f712fd9a771bb1abb3d6876b
 EBUILD gnutls-3.7.1.ebuild 4240 BLAKE2B a53df62983590ce9052deb810b474563b7d5c046e3de5fcfb026c78962f7237f798be322e940cf78ba1949863bd0aac48606cb87f8e3f0be1af49bed43050f41 SHA512 e54a53d940060f0fa5e037478aa49a6eed4bf3293806a8045e8850918dd7b4cff54cd7786178fe9f17124ef8de2ef7b20cf2e85f5ea8e946ca153c782e51eaa5
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/files/gnutls-3.7.0-ignore-duplicate-certificates.patch b/net-libs/gnutls/files/gnutls-3.7.0-ignore-duplicate-certificates.patch
deleted file mode 100644
index b0143818b46b..000000000000
--- a/net-libs/gnutls/files/gnutls-3.7.0-ignore-duplicate-certificates.patch
+++ /dev/null
@@ -1,403 +0,0 @@
-From 09b40be6e0e0a59ba4bd764067eb353241043a70 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Mon, 28 Dec 2020 12:14:13 +0100
-Subject: [PATCH] gnutls_x509_trust_list_verify_crt2: ignore duplicate
- certificates
-
-The commit ebb19db9165fed30d73c83bab1b1b8740c132dfd caused a
-regression, where duplicate certificates in a certificate chain are no
-longer ignored but treated as a non-contiguous segment and that
-results in calling the issuer callback, or a verification failure.
-
-This adds a mechanism to record certificates already seen in the
-chain, and skip them while still allow the caller to inject missing
-certificates.
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
-Co-authored-by: Andreas Metzler <ametzler@debian.org>
----
- lib/x509/common.c          |   8 ++
- lib/x509/verify-high.c     | 157 +++++++++++++++++++++++++++++++------
- tests/missingissuer.c      |   2 +
- tests/test-chains-issuer.h | 101 +++++++++++++++++++++++-
- 4 files changed, 245 insertions(+), 23 deletions(-)
-
-diff --git a/lib/x509/common.c b/lib/x509/common.c
-index 3301aaad0c..10c8db53c0 100644
---- a/lib/x509/common.c
-+++ b/lib/x509/common.c
-@@ -1758,6 +1758,14 @@ unsigned int _gnutls_sort_clist(gnutls_x509_crt_t *clist,
- 	 * increasing DEFAULT_MAX_VERIFY_DEPTH.
- 	 */
- 	for (i = 0; i < clist_size; i++) {
-+		/* Self-signed certificate found in the chain; skip it
-+		 * as it should only appear in the trusted set.
-+		 */
-+		if (gnutls_x509_crt_check_issuer(clist[i], clist[i])) {
-+			_gnutls_cert_log("self-signed cert found", clist[i]);
-+			continue;
-+		}
-+
- 		for (j = 1; j < clist_size; j++) {
- 			if (i == j)
- 				continue;
-diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
-index 588e7ee0dc..9a16e6b42a 100644
---- a/lib/x509/verify-high.c
-+++ b/lib/x509/verify-high.c
-@@ -67,6 +67,80 @@ struct gnutls_x509_trust_list_iter {
- 
- #define DEFAULT_SIZE 127
- 
-+struct cert_set_node_st {
-+	gnutls_x509_crt_t *certs;
-+	unsigned int size;
-+};
-+
-+struct cert_set_st {
-+	struct cert_set_node_st *node;
-+	unsigned int size;
-+};
-+
-+static int
-+cert_set_init(struct cert_set_st *set, unsigned int size)
-+{
-+	memset(set, 0, sizeof(*set));
-+
-+	set->size = size;
-+	set->node = gnutls_calloc(size, sizeof(*set->node));
-+	if (!set->node) {
-+		return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
-+	}
-+
-+	return 0;
-+}
-+
-+static void
-+cert_set_deinit(struct cert_set_st *set)
-+{
-+	size_t i;
-+
-+	for (i = 0; i < set->size; i++) {
-+		gnutls_free(set->node[i].certs);
-+	}
-+
-+	gnutls_free(set->node);
-+}
-+
-+static bool
-+cert_set_contains(struct cert_set_st *set, const gnutls_x509_crt_t cert)
-+{
-+	size_t hash, i;
-+
-+	hash = hash_pjw_bare(cert->raw_dn.data, cert->raw_dn.size);
-+	hash %= set->size;
-+
-+	for (i = 0; i < set->node[hash].size; i++) {
-+		if (unlikely(gnutls_x509_crt_equals(set->node[hash].certs[i], cert))) {
-+			return true;
-+		}
-+	}
-+
-+	return false;
-+}
-+
-+static int
-+cert_set_add(struct cert_set_st *set, const gnutls_x509_crt_t cert)
-+{
-+	size_t hash;
-+
-+	hash = hash_pjw_bare(cert->raw_dn.data, cert->raw_dn.size);
-+	hash %= set->size;
-+
-+	set->node[hash].certs =
-+		gnutls_realloc_fast(set->node[hash].certs,
-+				    (set->node[hash].size + 1) *
-+				    sizeof(*set->node[hash].certs));
-+	if (!set->node[hash].certs) {
-+		return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
-+	}
-+	set->node[hash].certs[set->node[hash].size] = cert;
-+	set->node[hash].size++;
-+
-+	return 0;
-+}
-+
- /**
-  * gnutls_x509_trust_list_init:
-  * @list: A pointer to the type to be initialized
-@@ -1328,6 +1402,7 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
- 	unsigned have_set_name = 0;
- 	unsigned saved_output;
- 	gnutls_datum_t ip = {NULL, 0};
-+	struct cert_set_st cert_set = { NULL, 0 };
- 
- 	if (cert_list == NULL || cert_list_size < 1)
- 		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
-@@ -1376,36 +1451,68 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
- 	memcpy(sorted, cert_list, cert_list_size * sizeof(gnutls_x509_crt_t));
- 	cert_list = sorted;
- 
-+	ret = cert_set_init(&cert_set, DEFAULT_MAX_VERIFY_DEPTH);
-+	if (ret < 0) {
-+		return ret;
-+	}
-+
- 	for (i = 0; i < cert_list_size &&
--		     cert_list_size <= DEFAULT_MAX_VERIFY_DEPTH; i++) {
--		if (!(flags & GNUTLS_VERIFY_DO_NOT_ALLOW_UNSORTED_CHAIN)) {
--			unsigned int sorted_size;
-+		     cert_list_size <= DEFAULT_MAX_VERIFY_DEPTH; ) {
-+		unsigned int sorted_size = 1;
-+		unsigned int j;
-+		gnutls_x509_crt_t issuer;
- 
-+		if (!(flags & GNUTLS_VERIFY_DO_NOT_ALLOW_UNSORTED_CHAIN)) {
- 			sorted_size = _gnutls_sort_clist(&cert_list[i],
- 							 cert_list_size - i);
--			i += sorted_size - 1;
- 		}
- 
--		if (i == cert_list_size - 1) {
--			gnutls_x509_crt_t issuer;
--
--			/* If it is the last certificate and its issuer is
--			 * known, don't need to run issuer callback. */
--			if (_gnutls_trust_list_get_issuer(list,
--							  cert_list[i],
--							  &issuer,
--							  0) == 0) {
-+		/* Remove duplicates. Start with index 1, as the first element
-+		 * may be re-checked after issuer retrieval. */
-+		for (j = 1; j < sorted_size; j++) {
-+			if (cert_set_contains(&cert_set, cert_list[i + j])) {
-+				if (i + j < cert_list_size - 1) {
-+					memmove(&cert_list[i + j],
-+						&cert_list[i + j + 1],
-+						sizeof(cert_list[i]));
-+				}
-+				cert_list_size--;
- 				break;
- 			}
--		} else if (gnutls_x509_crt_check_issuer(cert_list[i],
--							cert_list[i + 1])) {
--			/* There is no gap between this and the next
--			 * certificate. */
-+		}
-+		/* Found a duplicate, try again with the same index. */
-+		if (j < sorted_size) {
-+			continue;
-+		}
-+
-+		/* Record the certificates seen. */
-+		for (j = 0; j < sorted_size; j++, i++) {
-+			ret = cert_set_add(&cert_set, cert_list[i]);
-+			if (ret < 0) {
-+				goto cleanup;
-+			}
-+		}
-+
-+		/* If the issuer of the certificate is known, no need
-+		 * for further processing. */
-+		if (_gnutls_trust_list_get_issuer(list,
-+						  cert_list[i - 1],
-+						  &issuer,
-+						  0) == 0) {
-+			cert_list_size = i;
-+			break;
-+		}
-+
-+		/* If there is no gap between this and the next certificate,
-+		 * proceed with the next certificate. */
-+		if (i < cert_list_size &&
-+		    gnutls_x509_crt_check_issuer(cert_list[i - 1],
-+						 cert_list[i])) {
- 			continue;
- 		}
- 
- 		ret = retrieve_issuers(list,
--				       cert_list[i],
-+				       cert_list[i - 1],
- 				       &retrieved[retrieved_size],
- 				       DEFAULT_MAX_VERIFY_DEPTH -
- 				       MAX(retrieved_size,
-@@ -1413,15 +1520,20 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
- 		if (ret < 0) {
- 			break;
- 		} else if (ret > 0) {
--			memmove(&cert_list[i + 1 + ret],
--				&cert_list[i + 1],
--				(cert_list_size - i - 1) *
-+			assert((unsigned int)ret <=
-+			       DEFAULT_MAX_VERIFY_DEPTH - cert_list_size);
-+			memmove(&cert_list[i + ret],
-+				&cert_list[i],
-+				(cert_list_size - i) *
- 				sizeof(gnutls_x509_crt_t));
--			memcpy(&cert_list[i + 1],
-+			memcpy(&cert_list[i],
- 			       &retrieved[retrieved_size],
- 			       ret * sizeof(gnutls_x509_crt_t));
- 			retrieved_size += ret;
- 			cert_list_size += ret;
-+
-+			/* Start again from the end of the previous segment. */
-+			i--;
- 		}
- 	}
- 
-@@ -1581,6 +1693,7 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
- 	for (i = 0; i < retrieved_size; i++) {
- 		gnutls_x509_crt_deinit(retrieved[i]);
- 	}
-+	cert_set_deinit(&cert_set);
- 	return ret;
- }
- 
-diff --git a/tests/missingissuer.c b/tests/missingissuer.c
-index f21e2b6b0c..226d095929 100644
---- a/tests/missingissuer.c
-+++ b/tests/missingissuer.c
-@@ -145,6 +145,8 @@ void doit(void)
- 		printf("[%d]: Chain '%s'...\n", (int)i, chains[i].name);
- 
- 		for (j = 0; chains[i].chain[j]; j++) {
-+			assert(j < MAX_CHAIN);
-+
- 			if (debug > 2)
- 				printf("\tAdding certificate %d...", (int)j);
- 
-diff --git a/tests/test-chains-issuer.h b/tests/test-chains-issuer.h
-index 543e2d71fb..bf1e65c956 100644
---- a/tests/test-chains-issuer.h
-+++ b/tests/test-chains-issuer.h
-@@ -24,7 +24,7 @@
- #ifndef GNUTLS_TESTS_TEST_CHAINS_ISSUER_H
- #define GNUTLS_TESTS_TEST_CHAINS_ISSUER_H
- 
--#define MAX_CHAIN 6
-+#define MAX_CHAIN 15
- 
- #define SERVER_CERT "-----BEGIN CERTIFICATE-----\n"			\
- 	"MIIDATCCAbmgAwIBAgIUQdvdegP8JFszFHLfV4+lrEdafzAwPQYJKoZIhvcNAQEK\n" \
-@@ -338,11 +338,102 @@ static const char *missing_middle_unrelated_extra_insert[] = {
- 	NULL,
- };
- 
-+static const char *missing_middle_single_duplicate[] = {
-+	SERVER_CERT,
-+	SERVER_CERT,
-+	CA_CERT_5,
-+	CA_CERT_5,
-+	CA_CERT_4,
-+	CA_CERT_4,
-+	CA_CERT_2,
-+	CA_CERT_2,
-+	CA_CERT_1,
-+	CA_CERT_1,
-+	NULL,
-+};
-+
-+static const char *missing_middle_multiple_duplicate[] = {
-+	SERVER_CERT,
-+	SERVER_CERT,
-+	CA_CERT_5,
-+	CA_CERT_5,
-+	CA_CERT_4,
-+	CA_CERT_4,
-+	CA_CERT_1,
-+	CA_CERT_1,
-+	NULL,
-+};
-+
-+static const char *missing_last_single_duplicate[] = {
-+	SERVER_CERT,
-+	SERVER_CERT,
-+	CA_CERT_5,
-+	CA_CERT_5,
-+	CA_CERT_4,
-+	CA_CERT_4,
-+	CA_CERT_3,
-+	CA_CERT_3,
-+	CA_CERT_2,
-+	CA_CERT_2,
-+	NULL,
-+};
-+
-+static const char *missing_last_multiple_duplicate[] = {
-+	SERVER_CERT,
-+	SERVER_CERT,
-+	CA_CERT_5,
-+	CA_CERT_5,
-+	CA_CERT_4,
-+	CA_CERT_4,
-+	CA_CERT_3,
-+	CA_CERT_3,
-+	NULL,
-+};
-+
-+static const char *missing_skip_single_duplicate[] = {
-+	SERVER_CERT,
-+	SERVER_CERT,
-+	CA_CERT_5,
-+	CA_CERT_5,
-+	CA_CERT_3,
-+	CA_CERT_3,
-+	CA_CERT_1,
-+	CA_CERT_1,
-+	NULL,
-+};
-+
-+static const char *missing_skip_multiple_duplicate[] = {
-+	SERVER_CERT,
-+	SERVER_CERT,
-+	CA_CERT_5,
-+	CA_CERT_5,
-+	CA_CERT_3,
-+	CA_CERT_3,
-+	NULL,
-+};
-+
- static const char *missing_ca[] = {
- 	CA_CERT_0,
- 	NULL,
- };
- 
-+static const char *middle_single_duplicate_ca[] = {
-+	SERVER_CERT,
-+	CA_CERT_5,
-+	CA_CERT_0,
-+	CA_CERT_4,
-+	CA_CERT_0,
-+	CA_CERT_2,
-+	CA_CERT_0,
-+	CA_CERT_1,
-+	NULL,
-+};
-+
-+static const char *missing_middle_single_duplicate_ca_unrelated_insert[] = {
-+	CA_CERT_0,
-+	NULL,
-+};
-+
- static struct chains {
- 	const char *name;
- 	const char **chain;
-@@ -377,6 +468,14 @@ static struct chains {
- 	{ "skip multiple unsorted", missing_skip_multiple_unsorted, missing_skip_multiple_insert, missing_ca, 0, 0 },
- 	{ "unrelated", missing_middle_single, missing_middle_unrelated_insert, missing_ca, 0, GNUTLS_CERT_INVALID | GNUTLS_CERT_SIGNER_NOT_FOUND },
- 	{ "unrelated extra", missing_middle_single, missing_middle_unrelated_extra_insert, missing_ca, 0, 0 },
-+	{ "middle single duplicate", missing_middle_single_duplicate, missing_middle_single_insert, missing_ca, 0, 0 },
-+	{ "middle multiple duplicate", missing_middle_multiple_duplicate, missing_middle_multiple_insert, missing_ca, 0, 0 },
-+	{ "last single duplicate", missing_last_single_duplicate, missing_last_single_insert, missing_ca, 0, 0 },
-+	{ "last multiple duplicate", missing_last_multiple_duplicate, missing_last_multiple_insert, missing_ca, 0, 0 },
-+	{ "skip single duplicate", missing_skip_single_duplicate, missing_skip_single_insert, missing_ca, 0, 0 },
-+	{ "skip multiple duplicate", missing_skip_multiple_duplicate, missing_skip_multiple_insert, missing_ca, 0, 0 },
-+	{ "middle single duplicate ca", middle_single_duplicate_ca, missing_middle_single_insert, missing_ca, 0, 0 },
-+	{ "middle single duplicate ca - insert unrelated", middle_single_duplicate_ca, missing_middle_single_duplicate_ca_unrelated_insert, missing_ca, 0, GNUTLS_CERT_INVALID | GNUTLS_CERT_SIGNER_NOT_FOUND },
- 	{ NULL, NULL, NULL, NULL },
- };
- 
--- 
-GitLab
-
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.6.15.ebuild
index 462583d91fa7..b5557dc3ffcd 100644
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/gnutls/gnutls-3.7.0-r1.ebuild b/net-libs/gnutls/gnutls-3.7.0-r1.ebuild
deleted file mode 100644
index 643a1c4d8ad5..000000000000
--- a/net-libs/gnutls/gnutls-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1+"
-SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
-
-REQUIRED_USE="
-	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen:= )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-PATCHES=( "${FILESDIR}"/${P}-ignore-duplicate-certificates.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
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	local myeconfargs=(
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable guile)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gsnmp/Manifest b/net-libs/gsnmp/Manifest
index bc96088afdaf..186c65bdf931 100644
--- a/net-libs/gsnmp/Manifest
+++ b/net-libs/gsnmp/Manifest
@@ -2,5 +2,5 @@ AUX gsnmp-0.3.0-g_access.patch 264 BLAKE2B d19fb56bc2c4acc33a26395475f939f10408b
 AUX gsnmp-0.3.0-pkg_config.patch 710 BLAKE2B 08eb07f74a31713e30342fcce11dbdea36b32133fff2a3c11ef8e907aa0d4dc4b5f0a7d2b0870f1ff0ae5863ef2f6017b856ddd6522461bbde2c146765ef7368 SHA512 95c9413863152970705273a54e6ecd51a071cd7bba8ce0d1614dd1bf677f11b9f948caf02de450e261a50cf65d468bc7f11e300ccea9cd21a0e41a659616e55f
 AUX gsnmp-0.3.0-underquoting.patch 181 BLAKE2B cd12cf9802ef532b6e52e315b6e92e111ef9fb0c5501121ac912057af6cd8a87a20e8258f3fc338253a8fc72931afc5d381193ee6726d7a364dcfef871fcf06b SHA512 5d77d7c36e79dfc78499f83957a0e40628fc67011c15f44f6ae8c8c731d1429acdd95a43c6a39e0353d1b0ce7702fb9c1facbf51800d11141e408e815d91ed69
 DIST gsnmp-0.3.0.tar.gz 423137 BLAKE2B 6987b1d13b946b2e4b78618e0910cb6f787c71c1658178ca1ced866a82ca5f6467c1dd21d7c2e40dfbf9150d860539e216d4be197ed705a38517a57fc7220d66 SHA512 dcba2eb5ae31704fe6dc3e0b98f3032666b7b2be1efdff0f60a3cf4d0e0c3384563d72e5289a8d10c447f00da73f646a1963ffe08b46c7bc165972ac1b07c8b1
-EBUILD gsnmp-0.3.0.ebuild 742 BLAKE2B 77286fdc94d6a4cee47011786878d506974277b4add153860803277a232c82a44ab0b61606f1df955d98089732bb0102e100ce0ea1542ebb52775526577e758f SHA512 2e2a6acccc6b01af526b927fed2da0351efd69437dfa2f8701bee6513c7ce369b7e0e4047e9081bc33e9db410bee6390cae951b73ba7c9617fc3db77c43131bb
+EBUILD gsnmp-0.3.0.ebuild 784 BLAKE2B be9c54eebbeef450ea58708a01ec651c61c964dd4f19af8fc9874b7066856bbd346b02f7c1872350ee4695e6d329edc58e6ec07a18672433a256f0f73fd77a41 SHA512 79fdc8b9b9460ea6344e6439d87946e46e5c650327884b07dd4168010a1849e850b887239cdccc8cca810f3d73ef90f3a762bb02ea3a375b3fac6e36c197e590
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/gsnmp/gsnmp-0.3.0.ebuild b/net-libs/gsnmp/gsnmp-0.3.0.ebuild
index 346fa6711278..03183265f562 100644
--- a/net-libs/gsnmp/gsnmp-0.3.0.ebuild
+++ b/net-libs/gsnmp/gsnmp-0.3.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils ltprune
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="An SNMP library based on glib and gnet"
 HOMEPAGE="https://github.com/schoenw/gsnmp"
@@ -18,14 +19,18 @@ DEPEND="
 	net-libs/gnet
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README )
 
-DOCS="README"
+PATCHES=(
+	"${FILESDIR}"/${P}-g_access.patch
+	"${FILESDIR}"/${P}-pkg_config.patch
+	"${FILESDIR}"/${P}-underquoting.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-g_access.patch \
-		"${FILESDIR}"/${P}-pkg_config.patch \
-		"${FILESDIR}"/${P}-underquoting.patch
+	default
 
 	eautoreconf
 }
@@ -37,5 +42,5 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 2c68ae0b44a3..8811d781fd18 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,5 +1,7 @@
 AUX 1.0.0-honor-python-ver.patch 691 BLAKE2B 1e7954d6bc2feffa97ec429bb96f0d5b6ef4e04eef977731db75bfde4a00d4afab35944a595131b0088569b17f577c41f0ce63987ddbeba5187ae7591f5e9cb4 SHA512 ca5e2495a13a5bedd29dcdfba4c03f74a65d46f964d861adb7d2bcdf73813fe64c456ab52d0ccbb9fc913d6d5c0a76a9d199c114b1f3850d2184e3c7959412f9
 DIST gtk-vnc-1.0.0-patchset.tar.xz 9636 BLAKE2B 4f25fdf279e5a1718ea8dc42bdb59722630b363e4e289704b946ae788d593b5d95c56d0eb5315e30ff00c2eb4d3a9e5df366f74808f94e926a47c2f817b0f1ee SHA512 998771ceb28516f52bb083d872a1ad8aa22a7208c8a0ca94270f63d91cc7f7a0f99c4bb93f7a545d9a6c796fa063dd27b36a1cb9a3d7c9349a9d8372754ea929
 DIST gtk-vnc-1.0.0.tar.xz 215904 BLAKE2B 05ef0389c3ac307859228506adf55a5ed0f5d577078b82686ad97c9df180fc5c23d8dd030930c61f87b1bbd3cb6cee74c4485af4816b7b29fd53016c2d9b1d07 SHA512 63a40b9b284c4e46a92d5375ab3660b324ff27bfc572559d3b34d29fe4f7d24e976396b6688b8f3e3109d49dc5527075d128c43bb997507e68ddc0880b0ad148
+DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb
 EBUILD gtk-vnc-1.0.0.ebuild 1850 BLAKE2B 08f14959a9440e1fd8a404d287633bdd4eb7bd1ae134f5ff011dc13d6800572426bb50ad8ad173864785f381defe1d677c9e8c5f0ead404f09336f01a72309b0 SHA512 7121e7e4181db642101072fd2f3b7337268edc0cb69961bc203184111c6c1db92734669c1f3926f4af00f7b90a1917aed215d6e32e80df2dd7d2f34781a866f1
+EBUILD gtk-vnc-1.2.0.ebuild 1573 BLAKE2B 29268356e8fd5a33d1eeeeaae1c0f0a718b01115355607cfd9d45072aba6ad3a6c10b667931e10a1982a57e38a5c2692e4bc3f78a2f74ec702bc77fe75fe5657 SHA512 d2770a023396eba61f14b402a0367a7bee89de744363ae107ee1ff09dd20b7b65b80a1a04262214d793d96cc0074a6cd6757ab3454b5f9e5f22a7579cc8067e2
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
new file mode 100644
index 000000000000..f5587f996c28
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org vala meson python-any-r1 xdg
+
+DESCRIPTION="VNC viewer widget for GTK"
+HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection pulseaudio sasl +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gdk-pixbuf-2.36.0:2
+	>=dev-libs/libgcrypt-1.8.0:0=
+	>=net-libs/gnutls-3.6.0:0=
+	>=sys-libs/zlib-1.2.11
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.27 )
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	>=x11-libs/cairo-1.15.0
+	>=x11-libs/libX11-1.6.5
+	pulseaudio? ( >=media-sound/pulseaudio-11.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
+"
+# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
+# perl for pod2man
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/1.0.0-honor-python-ver.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature introspection)
+		$(meson_feature pulseaudio)
+		$(meson_feature sasl)
+		$(meson_feature vala with-vala)
+	)
+
+	if use elibc_musl; then
+		emesonargs+=( -Dwith-coroutine=gthread )
+	else
+		emesonargs+=( -Dwith-coroutine=auto )
+	fi
+
+	meson_src_configure
+}
diff --git a/net-libs/kdsoap-ws-discovery-client/Manifest b/net-libs/kdsoap-ws-discovery-client/Manifest
index d87500c9f35b..d04bf60075c5 100644
--- a/net-libs/kdsoap-ws-discovery-client/Manifest
+++ b/net-libs/kdsoap-ws-discovery-client/Manifest
@@ -1,7 +1,4 @@
-AUX kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch 346 BLAKE2B 5b195b70196269ee1f09c7b92823d9b59303c7bb485c68f4352242eed1e1086159ad9f47c1963db9e1ed8fc1d03e31a6e480bb47abbeff4167638c1e46a62864 SHA512 cf0ba64983da5c8b18e4103bce0dd1afb2cd5292d3f37a52a29c93a5d19895c13ea244ad27433cc54be8ce419f3a67a1941e21e25a232a4230a0c9b56f020ace
 AUX kdsoap-ws-discovery-client-0.2_pre20200317-no-install-docs.patch 467 BLAKE2B 1b972ba3ae3a6831d49c1c2986fae4ff75fa051964b1c39399b413d724c7c93fef6bc9e740a7e0f10860b64e228f1f18ad1f4836e887aec67d0b2addf7205892 SHA512 2370c1571dcee014b258f388a8a6401a331afc4a2ca0e3491e112ad686bc822cb780b155a1f74e4a8dbe315a65207cc22e088f2471ba621b645cc8e043829903
-DIST kdsoap-ws-discovery-client-0.2_pre20200317.tar.gz 37395 BLAKE2B 03bee2d6f87a3fb407e0cff7e84f9bd83814d742f714630b8c469b26a139062472ad39a0f743caac6f5de4ae2c8a55c42b56ee14c6afcd3a0a874c3f0d9978c5 SHA512 f99092e06e4d7496d6fe79e4cf78265c072476159da958c2a0ee7b852be00b16c89582a8c69c5cbe4160a6419435ee2d8bc71bce40ea9753eaf458c34df6f86b
 DIST kdsoap-ws-discovery-client-0.2_pre20200927.tar.gz 37493 BLAKE2B c0dff21554bc56c4055c74a166a85186d67b0378f7bfbfcd3582ae7b992aaa71cefb6b794258fa07b37fcdd1d42ac2bf9fbfd7cd8142f8f77b1ba9791d683dae SHA512 86f8c4eee3fd484253ee91190092a9ae0dbd3d0c536ec25a6e3ec35be45d4a3d320cffbfc0ed2024d447788b43c9df88ca81181157720ce8942c9034d4eea49f
-EBUILD kdsoap-ws-discovery-client-0.2_pre20200317.ebuild 1348 BLAKE2B d153c9bfc270d825027ba02792bd55db19eb3b1cdc6b66acb84adbf2dadaa9be64c8950afe7e3632ff7972c0ddd8f2d7caace84c6f9aea75a7fa975120e96b73 SHA512 ad6e189b4204c724183f7c79c9d7bcfe20114ebd7d992912971f1d1abb720cbca6d98a97aeddd83417eb37b46bb3dbde08c140a15ce46768813a290b206e93d9
-EBUILD kdsoap-ws-discovery-client-0.2_pre20200927.ebuild 1329 BLAKE2B 49d21299e9dcb78e65ac416f9e473cc2315d9996a5bbeb1e5eb6f06b4ae6d51742e85523160b02bc9c2d6bf17b1353c40e2b3f7f214063a51abd7ab3f8164b64 SHA512 fd7dd84020e14f268b2963083725bb6e1a8e20cf0a6fb0a7759620cf5f8606f411462c348e9d77504874ca5a1867b5d79baa6e8348a5222edb10a93ca54255b0
+EBUILD kdsoap-ws-discovery-client-0.2_pre20200927.ebuild 1326 BLAKE2B f9dad0bfdddae899c6531e9c848c887aee958bf7d18d682d7cf5f6e6a48e80cb127e8f39e55649d1f7ff909138fcc745c1287a5d5f45dba193b1d7611efb325d SHA512 107697e4e7cb26ad1f36935eb38d70005d9ae80362f2d7be6235309b53291a508a2fef28273322f7f3a32f4a50e6f8d5a3e1a1133878897a92cb3bae3f21e5f1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdsoap-ws-discovery-client/files/kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch b/net-libs/kdsoap-ws-discovery-client/files/kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch
deleted file mode 100644
index f8f6c08c5f1c..000000000000
--- a/net-libs/kdsoap-ws-discovery-client/files/kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/KDSoapWSDiscoveryClientConfig.cmake.in	2020-03-02 23:38:05.253097303 +0100
-+++ b/KDSoapWSDiscoveryClientConfig.cmake.in	2020-03-02 23:39:03.346641208 +0100
-@@ -5,5 +5,6 @@
- @PACKAGE_INIT@
- 
- find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
-+find_dependency(KDSoap)
- 
- include("${CMAKE_CURRENT_LIST_DIR}/KDSoapWSDiscoveryClientTargets.cmake")
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild
deleted file mode 100644
index d9179fc30fc6..000000000000
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="forceoptional"
-inherit ecm
-
-if [[ ${PV} != *9999* ]]; then
-	COMMIT=14287e92e80a77aa4c0adee2871e6b87c9c3055e
-	SRC_URI="https://gitlab.com/caspermeijn/${PN}/repository/${COMMIT}/archive.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	S="${WORKDIR}/${PN}-${COMMIT}-${COMMIT}"
-else
-	EGIT_REPO_URI="https://gitlab.com/caspermeijn/${PN}.git"
-	inherit git-r3
-fi
-
-DESCRIPTION="WS-Discovery client library based on KDSoap"
-HOMEPAGE="https://gitlab.com/caspermeijn/kdsoap-ws-discovery-client
-https://caspermeijn.gitlab.io/kdsoap-ws-discovery-client"
-
-LICENSE="CC0-1.0 GPL-3+"
-SLOT="0"
-IUSE="doc"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	>=net-libs/kdsoap-1.9.0"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qtxml:5 )
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-install-docs.patch
-	"${FILESDIR}"/${P}-deps.patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use test || ecm_punt_bogus_dep Qt5 Xml
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package doc Doxygen)
-		-DBUILD_QCH=OFF # does not use ecm_add_qch from ECMAddQch
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	ecm_src_install
-}
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild
index 74f1eb852d13..da7b75210e76 100644
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild
+++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild
@@ -10,7 +10,7 @@ inherit ecm
 if [[ ${PV} != *9999* ]]; then
 	COMMIT=dcefb65c88e76f1f9eda8b0318006e93d15a0e1e
 	SRC_URI="https://gitlab.com/caspermeijn/${PN}/repository/${COMMIT}/archive.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	S="${WORKDIR}/${PN}-${COMMIT}-${COMMIT}"
 else
 	EGIT_REPO_URI="https://gitlab.com/caspermeijn/${PN}.git"
diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest
index 53ac5d0caf22..97fe6219251b 100644
--- a/net-libs/kdsoap/Manifest
+++ b/net-libs/kdsoap/Manifest
@@ -1,6 +1,3 @@
 DIST kdsoap-1.10.0.tar.gz 1399777 BLAKE2B d04393e34536eca43edb612339cfc40ff024849b74231d472f9936d86172d299f973e4140ae2bde363dca441e26016126db5f0782807c3d5598543ec4afcd737 SHA512 c0e0108f74e5d4075a71369f428862b7f3eb6a7b1968eea7a7b01f4536d999468a7af8013be722c02b303a0580e7cd649fe78c1588f837405ede4bb753fb56b7
-DIST kdsoap-1.9.50_pre20200317-libkode-dfe0d565cb58cfb25da77853d9694097aa8e5882.tar.gz 50653 BLAKE2B a14145adcb1a9551c9fc70246bebe034db605e8d4056744856ff67a575ed192b90439a25b7ba6916d66b9830d7ffec1da82f2e12425b6e58801ebbe289cc09b7 SHA512 efe539888d25a527d43a83a6e3c38d75eec92bab3f09766890870f3fe6516cbd8349b049b42399c8764b28550291130b705350ae9d4d9947b839c03174b9b984
-DIST kdsoap-1.9.50_pre20200317.tar.gz 919821 BLAKE2B 8028e98a1d79800e9f8bbddcb50e0b3ebb2d71b2f87d4f2920c6689b8536d712f76fb9ff48dd16b3d68871e46d9b1d36198aadab3d1d645f2dc397beef3d596e SHA512 f00c960d442c6a2977d321441ddd0924b42422e2a4e974a7fabb2d896fdb7310813750154f7548758ccb01a5d312d9af74a8d34746e09d07aff7925ebb6c3b4c
-EBUILD kdsoap-1.10.0.ebuild 900 BLAKE2B 8249c721a8efc5ca434259b81fd9dd5532e91842db2f05d66cedbafe11d5b64e93404fa5f1366e0dd14d14aad88e64715271ca069d26996a8b953ca9e99971d1 SHA512 4ec1bffc795e2878660e2a41702fa151c15ce63cbfd8f7f3db8155e3e3916a69ece0b5b85013c4db65ae0227e591ee35030a2623e1dcb89fa06d5e66211efa49
-EBUILD kdsoap-1.9.50_pre20200317.ebuild 1344 BLAKE2B f008cd03c3dd55f3901c7ad46bf837a6834b9a6d05bd663ebe5df1301eb258df052bb40b5d0bd58e29904e927391e73e88b6e9287edca13935382d3432b781c9 SHA512 fd37d66bfaa349125503603cd3695814d425da60b0bd2b52d1744451b62ec5834fa28e821541942a37b95e0a1488ee2b21999154b8d20c759e4c9dc742dffd9b
+EBUILD kdsoap-1.10.0.ebuild 897 BLAKE2B 3128bc6ce0e740d5929a1150df92734eb1052cb0e4cc93a3c84913ef4916d870e9bee77f7990eaf5731b857b40627ba31e30d03b2de788a14a319e9c06340069 SHA512 e4d0a437b63e3ea3212258324d8b7954c5faf95a910636ea319025fb1eedff2fdaed606b6459dc9ae3975841bf4561cc61694b5f829e1f8d14d50da394a4db14
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdsoap/kdsoap-1.10.0.ebuild b/net-libs/kdsoap/kdsoap-1.10.0.ebuild
index d16d3493eda0..93e3d7693fa7 100644
--- a/net-libs/kdsoap/kdsoap-1.10.0.ebuild
+++ b/net-libs/kdsoap/kdsoap-1.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 else
 	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
 	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
diff --git a/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild b/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild
deleted file mode 100644
index 789535021078..000000000000
--- a/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	KDSOAP_COMMIT=8fde0425e38bf58922b6054768b4a7e5f349500b
-	LIBKODE_COMMIT=dfe0d565cb58cfb25da77853d9694097aa8e5882
-	SRC_URI="https://github.com/KDAB/KDSoap/archive/${KDSOAP_COMMIT}.tar.gz -> ${P}.tar.gz
-		https://github.com/cornelius/libkode/archive/${LIBKODE_COMMIT}.tar.gz -> ${P}-libkode-${LIBKODE_COMMIT}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	S="${WORKDIR}/KDSoap-${KDSOAP_COMMIT}"
-else
-	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
-	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
-	inherit git-r3
-fi
-inherit cmake
-
-DESCRIPTION="Qt-based client-side and server-side SOAP component"
-HOMEPAGE="https://www.kdab.com/development-resources/qt-tools/kd-soap/"
-
-LICENSE="GPL-3 AGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_prepare() {
-	rmdir kdwsdl2cpp/libkode || die
-	mv "${WORKDIR}"/libkode-${LIBKODE_COMMIT} "${S}"/kdwsdl2cpp/libkode || die
-
-	cmake_src_prepare
-
-	sed -e "/^find_package.*Qt5/s/Widgets //" \
-		-e "/install.*INSTALL_DOC_DIR/d" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDSoap_EXAMPLES=OFF # Qt4-based and no install targets
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 31fb095956a9..707153b0f513 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-1.7.1-r1.ebuild 2740 BLAKE2B 7122b8668a7b2ba71da9da14d8043c13556b7e801080821799766e0ab10a67b807add94b1e9142045bd3d6a748133eb07f069b41a86cad4158b7cb9a83b2aa70 SHA512 6cd96df4e4b9925f3b59d77eb35446e1799240e3fe97108bf7ce83d6ba64384714dcc6a4f71312aebdc784d1300af34ea4b26f4fa46c4b98487ae94aae62b82e
-EBUILD ldns-1.7.1-r2.ebuild 2801 BLAKE2B 0a468c9589e044f87511d279d5fc091b6282d5fff483affb759d1c0dfcf3816b264bf3b3b30d05497e1b0eac87dadfb41bd771993a1667bd66023200ebc7e33a SHA512 ddb8b3f44504e3fd16cb6e55509ff69a5441eb7a8da48eff35b3954b3f24443d8b1d5f50f0cb90ea495e01e3ac5bf2ae2f4b4f52c198dea93685d43b26c4f70f
+EBUILD ldns-1.7.1-r1.ebuild 2743 BLAKE2B afae1f5a1ae8c87c3e815bc38860deda37361c3a5a91104f5ab1dc8210f4854bd80016309d98e6303c97caa78fe5d577a6280957317c371c1dc2680623489469 SHA512 986db8ecf063ce1fc2ecf68b06688c5e33c8a73ebdfceb11fca4d694101bc857f648b3d6e5c5bccb8f597d264ccc2c3452af89bd6ef1c2a113608e0b65bf6f1a
+EBUILD ldns-1.7.1-r2.ebuild 2803 BLAKE2B d18f0e45a9ce0aa47f3041f20025348dfeb6bd033ab5ab36790660bc633d7d02e9f16dfcbb4b7591ba5351013d1cea33bb6c4f17d17bd10627134c3b2b68e34d SHA512 e852b19bc473d07b829bc97d0fae8fa43a6821fe28ccffff39969f2e73c4bf53c473c819e168fd2ca6f84d2b024e36a2c068eb52512f44b9c9ef9fea9a18d432
 MISC metadata.xml 932 BLAKE2B 263b5d8d54aed15ae710d6f3d60ebe1683699c8aef9fd34fe5865ee5d1aa046ae40be8c1239b2ee3f7df57a8f8f6de57b7b693e2c4d7680fc8cfa269bd3cd832 SHA512 40c5a002f31a00ff586f3af4b1f112760a589aeec5846e5335bf39c6a6b2fd0e248dfcd62c1f4956f81f710db1f9998e0dd7b84acd658252d7006c8100631ae7
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index fac411168db6..78a9e8a8dfe1 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python3_{7,8} )
-inherit eutils ltprune multilib-minimal python-single-r1
+inherit epatch ltprune multilib-minimal python-single-r1
 
 DESCRIPTION="a library with the aim to simplify DNS programming in C"
 HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
@@ -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
@@ -68,7 +68,7 @@ multilib_src_configure() {
 		--enable-sha2 \
 		--without-drill \
 		--without-examples \
-		$dane_ta_usage \
+		${dane_ta_usage} \
 		--disable-rpath
 }
 
diff --git a/net-libs/ldns/ldns-1.7.1-r2.ebuild b/net-libs/ldns/ldns-1.7.1-r2.ebuild
index 0ed420ce1959..9e872b955a93 100644
--- a/net-libs/ldns/ldns-1.7.1-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit eutils multilib-minimal python-single-r1
+inherit epatch multilib-minimal python-single-r1
 
 DESCRIPTION="a library with the aim to simplify DNS programming in C"
 HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
@@ -72,7 +72,7 @@ multilib_src_configure() {
 		--enable-sha2 \
 		--without-drill \
 		--without-examples \
-		$dane_ta_usage \
+		${dane_ta_usage} \
 		--disable-rpath
 }
 
diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index b50d863e524f..ce5b134cb94c 100644
--- a/net-libs/libasyncns/Manifest
+++ b/net-libs/libasyncns/Manifest
@@ -1,5 +1,5 @@
 AUX libasyncns-0.8-configure-res_query.patch 428 BLAKE2B e19cdfc88ebee7f22dac6dad6dc302fa80957464c91eb8907ef75bd3f5fb32d7b985545a1aafccf2cd228688c16ab731ddd9c5315083f8f4d117a9a6d4ee731f SHA512 ed338a91575f9e642c3da9764348fb7d4e5b2d0da4ef9a849a4cb176df96776100e59b419bbc9206395252d8317c20c5cfe1b68e008825fde1192e24dc9f8ce0
 AUX libasyncns-0.8-libdir.patch 299 BLAKE2B ad0b79b5725877642c1b03c8183654be8d54e78e44bf7ab4de3c8bd1ffc5ceb2e6cfd250cc4725c2a0491d062d12124faf55fb20b07887e1f47cee7ab156f0de SHA512 b4a42a4241034756feeacdcd9a7d6e57a8b2d9ae945b149e05c6ea9d8b33791733601ef9d153e75d7979079cdf4c02c4136f881236e2a2b393ce070021c3a2b0
 DIST libasyncns-0.8.tar.gz 341591 BLAKE2B a93e7fdeb6e686cf3ed87db8fe2473f8868defd5bb6a29497c48d970d1ff33c550b5521d84a224314c9e93bd4cf09f502bde0fbe1c4d2680f6fa07f1f1a224c6 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7
-EBUILD libasyncns-0.8-r4.ebuild 1232 BLAKE2B 84d54abfa07f8d58d534aa617d1ce9cc10a2b5a1a614b5b36391de5ccbea68a55ec10605bdffe01e7bcec180591f5b2710eb4bd0aba9ad66dc4e7386d0c34c64 SHA512 1c7801714c1ff1e25379fbd3cae2c66ffa7a4959b06921f26db48ff380b536f3b65c28d17fa781bd7965ebf9593207817715f4a17db22673e1473b405cf39f28
+EBUILD libasyncns-0.8-r4.ebuild 1237 BLAKE2B 3e7bf04cd8adca1af1d8290d15c8c98a798cf5d0bbb272b48e798cd1d56ec4d6363f8d209261a182711206d8ba9ed4093f580df4d7b837a6a8f6a0b6577ecb8e SHA512 fc51ddae39e7108f9252a1bae06bb471af757e69fef324f2cec1ad1d19f5581b76885515d7b3e03a93c13eef8fcc06f3927a01e719483a8d8bf1a5fe54d6eec2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index a09e4fae9e19..a55c87358a01 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,6 @@ HOMEPAGE="http://0pointer.de/lennart/projects/libasyncns/"
 SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
 
 SLOT="0"
-
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
@@ -18,12 +17,15 @@ IUSE="doc debug"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
-src_prepare() {
-	default
+PATCHES=(
 	# fix libdir in pkgconfig file
-	eapply "${FILESDIR}/${P}-libdir.patch"
+	"${FILESDIR}"/${P}-libdir.patch
 	# fix configure check for res_query
-	eapply "${FILESDIR}/${P}-configure-res_query.patch"
+	"${FILESDIR}"/${P}-configure-res_query.patch
+)
+
+src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -31,8 +33,7 @@ multilib_src_configure() {
 	# libasyncns uses assert()
 	use debug || append-cppflags -DNDEBUG
 
-	ECONF_SOURCE=${S} \
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		--disable-lynx \
 		--disable-static
 }
@@ -55,5 +56,5 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest
index 4fcf26dc6280..5abac3c07629 100644
--- a/net-libs/libaxc/Manifest
+++ b/net-libs/libaxc/Manifest
@@ -1,4 +1,4 @@
 AUX libaxc-0.3.4-so-symlinks.patch 997 BLAKE2B 51b60a7055b0357a951425a83aa7f98b84a5cedc4a807992191766d51a5f5b672123a07e876972feba4753cd102851b9dbcbd15957bf11b5f794473f5a3bbdbe SHA512 b9567f60b37a4c2cc658a7215bdd864409f2b3626c28648547a9fe6bdaeebbc5f414cb5ca6e5a78dfd9d24b7b81a38bd358bd83887a56adb9ceed5049df6c187
 DIST libaxc-0.3.4.tar.gz 40198 BLAKE2B 78fc122eefbc5c6173bdad5cf31734cf95b750c09bddede5b2656a88bede3d6c25fb22af5447681c58eb1f296ee326480e22aacb843d951f1bd7a6933155432a SHA512 7b6b5466ee89d78d3c3a2e7cf961dfb3310bff01947e69e906c83ff97e89d1bdc0e2e92f7bd0d4b48a97af91409f435a4fd869229af5b67b2f66ba464bbfd7b8
-EBUILD libaxc-0.3.4-r2.ebuild 1255 BLAKE2B bd856104834c30ecd9ddfcc8d73cd6823cd0722efd8604b5a3bce2ca26296f2b0e12ae2178a5071fe34341652f95a6c395479ff4ee21098256fe7fde0c331a8e SHA512 95fad7584a2269517195bfa720080b7ffa101196444b5e3894b11c2a0bce8beab93be275999dcb2ec388d4930ed3901ab01046e4b79e3d7a6c4398314d6f7119
+EBUILD libaxc-0.3.4-r2.ebuild 1253 BLAKE2B cfd715172d69015bafbd4ae41104a749fbfd0fede1c222beb4e3ad60770e6c394beff7af2d0e32edad3a88b5ae31c9fe00cccc892d655dd5f2600fbe98e88bdd SHA512 2c244b826eb7a25cd16040b1347561f973fb3cf0c7208f6d7312ef4c4f87d8cb44cfa9faca442e296bc70cac6bda0a35862f577df1ae8d96ab36c9e937c39b60
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/net-libs/libaxc/libaxc-0.3.4-r2.ebuild b/net-libs/libaxc/libaxc-0.3.4-r2.ebuild
index d85e8cf5de82..13ba915719fb 100644
--- a/net-libs/libaxc/libaxc-0.3.4-r2.ebuild
+++ b/net-libs/libaxc/libaxc-0.3.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"  # not GPL-3+
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 78fd34b8e548..8c76f82f3ce7 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,8 +1,8 @@
 DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
 DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
 DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
-EBUILD libbtbb-2018.08.1.ebuild 3479 BLAKE2B ea8e75095644069ee74ef72677aec429114e155ed50565ef71b8237695ae76e4ca750caf6b82df4eff7400ca7a37535dae011c296c7a88b2ef6c4ee168b5ae8a SHA512 9257591a151e4d3da471462cb75febe508eead5bf8b1981c5d75c6906a2228257a5659b45a4718b91c21ebcd0acf1092ee4c34aefa938367555be6ee4ee14add
-EBUILD libbtbb-2018.12.1.ebuild 3476 BLAKE2B 726593872c2381dc76737e00bd1dd53a32fe56ff042615d8625a297dd3e177a925a27b1cd217b16d62511f88d0fd0d6d594d772646d46c38d13ed9041d24cc84 SHA512 c6bb6dd0de2cd46d8d8860b9afe5f5f126f5ad94d86e00f67d89c60f6a62bac1915ee21489f3160b9f73362fdfb4904b2524309922a1951b5afb3fecb05ca1d1
-EBUILD libbtbb-2020.12.1.ebuild 3479 BLAKE2B 42bc145ff8e257e660d74c5dead6d263d45b42453c95c70d0ca66fbf5ee013011fa9c850f283c547c166c2ed69efe68c562a6cc25a8f6fb68c0662654502252b SHA512 73895c457512229eff996455028420fb3a3e8621891c8c8b0d5cb41c839549c8514a555c5f27441934f288e45277f1606699cb85d3fb76977d643e5a66fe0ec2
-EBUILD libbtbb-9999.ebuild 3479 BLAKE2B ea8e75095644069ee74ef72677aec429114e155ed50565ef71b8237695ae76e4ca750caf6b82df4eff7400ca7a37535dae011c296c7a88b2ef6c4ee168b5ae8a SHA512 9257591a151e4d3da471462cb75febe508eead5bf8b1981c5d75c6906a2228257a5659b45a4718b91c21ebcd0acf1092ee4c34aefa938367555be6ee4ee14add
+EBUILD libbtbb-2018.08.1.ebuild 3470 BLAKE2B 6084d483155c28553328fca02da898c9e37ff4a9d01b82c6aa86a75157c95b130d93a1384042f41cdeefe4e4a77e50dd391598ae50668903302f07a4ac75b109 SHA512 d24a516eb987b1d23812980e937856bba04f20f8dbcf9ab8980f528068d7b9aae2c9464f988f0d89e072b1c3bff27263095ca24428bf583549e479292c769617
+EBUILD libbtbb-2018.12.1.ebuild 3467 BLAKE2B 3a525773dac747916a2824a792ba82a7b536d02f437ad54df462ef025d87f485a4509705ce49c0af624ad108b32888019b083a321dc4ba30340551737ecea320 SHA512 98b8925a4b828464897d868682f1d3642c17761cbb17f1fd584df7141b2ee6f503e845463110c5aac507e62e63c86109b2287818ee14ee175949e7a5a3d8ea64
+EBUILD libbtbb-2020.12.1.ebuild 3404 BLAKE2B 0960f98c48cc5505ced0faf31ecc0d43f71db64cecad00737818a6202721e2bf323b531b892876ce5d28adb537f323366c9e2e393db7098f3b7c76176ca1096c SHA512 2812a860a5d8c70922efb2b91f55db79dd28913a3962c398698cdcf980b365f8430272fcfe528fa1c2600be1946a6033fc2504f735e9edf1f1df026682780791
+EBUILD libbtbb-9999.ebuild 3404 BLAKE2B 0960f98c48cc5505ced0faf31ecc0d43f71db64cecad00737818a6202721e2bf323b531b892876ce5d28adb537f323366c9e2e393db7098f3b7c76176ca1096c SHA512 2812a860a5d8c70922efb2b91f55db79dd28913a3962c398698cdcf980b365f8430272fcfe528fa1c2600be1946a6033fc2504f735e9edf1f1df026682780791
 MISC metadata.xml 504 BLAKE2B 60d141d4d1d3cba4986ccbd980ea1e5e38e055cbfa533e3fb0d1a1f06f7bd6b88c19c217ba9ba3a5f4127ede213256662a6165581047ebc9f0edb8f114cae4ef SHA512 bd75845c471382ed6720c72f4597fcfe7527788273b222c74ce8ffbeb5c37e65a500e9c51626c3d969037fa583af99708817dc4b66f51534abae445bcb3b5c65
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
index a1587cd739a2..23524a6f4e36 100644
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
index d3976d1260b1..f4a117ca3006 100644
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
index 758b20c33cd9..edbf18eed8ff 100644
--- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
+++ b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib cmake-utils
+inherit cmake
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -47,7 +47,7 @@ which_plugins() {
 src_prepare() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use wireshark-plugins; then
 		which_plugins
@@ -60,7 +60,7 @@ src_prepare() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_prepare
+			cmake_src_prepare
 		done
 	fi
 }
@@ -73,7 +73,7 @@ src_configure() {
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DBUILD_ROOT="${ED}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -87,7 +87,7 @@ src_configure() {
 			local mycmakeargs=(
 			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
 			)
-			cmake-utils_src_configure
+			cmake_src_configure
 		done
 	fi
 }
@@ -95,7 +95,7 @@ src_configure() {
 src_compile() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -106,7 +106,7 @@ src_compile() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_compile
+			cmake_src_compile
 		done
 	fi
 }
@@ -114,7 +114,7 @@ src_compile() {
 src_test() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_test
+	cmake_src_test
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -125,7 +125,7 @@ src_test() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_test
+			cmake_src_test
 		done
 	fi
 }
@@ -133,7 +133,7 @@ src_test() {
 src_install() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -144,7 +144,7 @@ src_install() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_install
+			cmake_src_install
 		done
 	fi
 }
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index a1587cd739a2..edbf18eed8ff 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib cmake-utils
+inherit cmake
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -47,7 +47,7 @@ which_plugins() {
 src_prepare() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use wireshark-plugins; then
 		which_plugins
@@ -60,7 +60,7 @@ src_prepare() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_prepare
+			cmake_src_prepare
 		done
 	fi
 }
@@ -73,7 +73,7 @@ src_configure() {
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DBUILD_ROOT="${ED}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -87,7 +87,7 @@ src_configure() {
 			local mycmakeargs=(
 			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
 			)
-			cmake-utils_src_configure
+			cmake_src_configure
 		done
 	fi
 }
@@ -95,7 +95,7 @@ src_configure() {
 src_compile() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -106,7 +106,7 @@ src_compile() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_compile
+			cmake_src_compile
 		done
 	fi
 }
@@ -114,7 +114,7 @@ src_compile() {
 src_test() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_test
+	cmake_src_test
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -125,7 +125,7 @@ src_test() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_test
+			cmake_src_test
 		done
 	fi
 }
@@ -133,7 +133,7 @@ src_test() {
 src_install() {
 	CMAKE_USE_DIR="${S}"
 	BUILD_DIR="${S}"_build
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use wireshark-plugins; then
 		for i in ${plugins}
@@ -144,7 +144,7 @@ src_install() {
 				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
 			fi
 			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_install
+			cmake_src_install
 		done
 	fi
 }
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index 19ace1639c7c..c8510a9d7f67 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,3 +1,3 @@
 DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22
-EBUILD libdom-0.4.1-r1.ebuild 1124 BLAKE2B c3901e4d0444db08ee515a1270558f4153ae0479691a374c71a9a873127e8ea23ce43c16af6449dc43aa3e9a79dbd2859c30b26ec1149015d8c1af9f43334bf8 SHA512 c61e6c25c8afa07412148372dc8d36cf7942c3bd0f413abc1c6aed226bdfc9e8ea61694dd99c8031fa85c69d9750d70878954d9ab2ce4f6774c7ac625ac8bafb
+EBUILD libdom-0.4.1-r1.ebuild 1131 BLAKE2B 0853429474b39c874506f36a30530f688fd4a0dfce0a21779a0f60cedd6f0721758f1acdc336aab9bf8b66ad91472fbd2b1a81031ac72ccb5e2cd1dd6b24e798 SHA512 b630c353cd14c48a907f9cd4e5e603f13200c3483319619e7bca6895191b0fdd47aa4685ec41064e1745ff6ca91ec2b94687aab6fa05530dc7d7febbd9632b0d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libdom/libdom-0.4.1-r1.ebuild b/net-libs/libdom/libdom-0.4.1-r1.ebuild
index 19c4937b1fd3..bbe71b65dfb2 100644
--- a/net-libs/libdom/libdom-0.4.1-r1.ebuild
+++ b/net-libs/libdom/libdom-0.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="expat test xml"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libecap/Manifest b/net-libs/libecap/Manifest
index c54f554c7ee7..a416720a1ab4 100644
--- a/net-libs/libecap/Manifest
+++ b/net-libs/libecap/Manifest
@@ -1,5 +1,5 @@
 DIST libecap-1.0.0.tar.gz 343468 BLAKE2B 5a5a12365289daaee8b324016f42b6b56f5bf5b1f7893ae052517c8c20a792a798ebb31f4038c121b1c6eefd9d375562014050572e0285e3a9b91bbfb9989fa8 SHA512 7d34b5a9b6843d6b09efc4fa390c7a2d3dda7a2ae5e82d5021295e436ca9afb7c1f70bc6f25a68e4c430fb6e33ee9f602655c9c830fccd46a8f554774813b452
 DIST libecap-1.0.1.tar.gz 339799 BLAKE2B 6971391d0bde588f6bfb11704d343494eaf81fd1ac5e9c8c6d9f32ae0b03ed41aaf03c41cab1365ffefa8e032b65f72417af395c26d89af69c30d327252246b7 SHA512 0054ad11b3f558d7c623060a69207a1b8e679803cabdf1a2bce4b04335d71c016eec770fc9d2cbf3d0a93502c255cb528305f9f8e6df4e095fcb980667045919
 EBUILD libecap-1.0.0.ebuild 756 BLAKE2B 4251965072777a9b3aaf292ceae8b232a44095925f68d3fac83950930d3f98c6f9aa520a91c4b02867728d25e0c8956894e47b9eb523af8d8be06d447182786b SHA512 73685fe75de863494f2a30b00283d39a92e55f48f0476a4e0f3b15a47a2f92147d95d4eddf1a5781ede19d4cca57177cf5101541a97626ecd7ca02cb4dca91ec
-EBUILD libecap-1.0.1.ebuild 789 BLAKE2B 735eea7cfea04d356234d982e2353506141b019fecd5e03007ff0416d942d0cccb3c4f4ca2b94a3455dd37bdab3afff9b71baa5cb5b7b7b22cb862f93d2d7dd8 SHA512 005c81729ceb229c879b97b0dfa86bd16560c9ed527227025e25673da70582519b14b2c290d38b08eb26fa55939cc45f20f8adcbb4b165b2297904cde45bca98
+EBUILD libecap-1.0.1.ebuild 784 BLAKE2B ed18ac3f587d3d93ee99af4b65d3397a478dc086f88e373cb63e3ecd6fbaf84a7b96e3dc5e31de7afc6cb7f2405f9278bd1bc2a5e8350090a2951dc8d1faf73b SHA512 0ebedf250a062dc28c6bf11851d11a5a0613817e9fec2067ad387fdfb91a5c463ae46eaef18521244383f09f372bc1130280b64a834d04f8ac85b81ff7d6a95f
 MISC metadata.xml 529 BLAKE2B 5084671496dca729715835548ad5d0ea16b2312014bdd0d3368a62bc9140ae72481cff611a701bf329631af8b024fa3830f9af23661aa401720658a4784ec8b6 SHA512 8c369afceeaea9d63c93dd890f32fe606a69942536c3d9798395eefcdfbc06e027fc40c50a899b7014696f5a5897afbf8feaf674317db10449d30c83b63de470
diff --git a/net-libs/libecap/libecap-1.0.1.ebuild b/net-libs/libecap/libecap-1.0.1.ebuild
index 24efca086b5d..89867e52b063 100644
--- a/net-libs/libecap/libecap-1.0.1.ebuild
+++ b/net-libs/libecap/libecap-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.e-cap.org/archive/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 RDEPEND="!net-libs/libecap:0
 	!net-libs/libecap:0.2"
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index abe5d38a9591..c6b127f56591 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,5 +1,7 @@
 AUX libesmtp-1.0.6-openssl-1.1-api-compatibility.patch 2243 BLAKE2B 03cf78375e04d781c1deb15ec76ba35b2800dd2b739c9ad330cfc9a25c05f59b684a5cbe8e436288a98e84b2ebab2c08abfdfd81e000f9a3c4053411254ab89c SHA512 9c5e9ea6d6b09dd48225edc17a9003ea863d91e06ec3856ce22d89b1b908f1c8bfccb7a1090dc5b1ff26a62c35a48806805115000eba3a478cab632181c905a1
 DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
+DIST libesmtp-1.0.6_p20200824.tar.gz 156674 BLAKE2B a78dece0cceb252ca7505b5457a9137c6e3f45c544b9774ab683fb1defed6458ed0d94604aa16df540d3e397738fbe00e1c3b3c649f34b73421e494c35cf2fc1 SHA512 bd0868aa8fb10bd81c18d473acaf1ef94ab2278a6619e5d348a59857f459d2d47a22583d7d533a983518ece436853914420b7189c305d9dab5c399bf26f8a5c0
 EBUILD libesmtp-1.0.6-r3.ebuild 1018 BLAKE2B 96c8a363e5081dd00979e96e78f1cd361e5410beeb5ff62775f19e9c1c1c46d8c140269fa734acb6b1056340e8a5393038a9698d3f041151a6f675e5e27276a2 SHA512 131ca73a72e43d9f46977ffd0b44322fe47db8055ffde87ecb7f0cf1423b11f66703d10d7a5ba00a5c09936579bbd250b4e73b1de3037c2a653179c4207e5092
-EBUILD libesmtp-9999.ebuild 1004 BLAKE2B 11b92522d84e9bad7c52fc7ee0836f429549c3a5107ed1385fc04c9a58054fc5abf3feb700599213087c1a2cac91a584e8ac3b8d0f4ddd99eb62dbc56f64f8f1 SHA512 2f943a1c80b1fbccea90c8a87f8d1904fc287b05547209670705ae19ca05827ccf4642e1bc909fba139619655d532fb6aaf915131367a8106099aa8f5b3d2105
+EBUILD libesmtp-1.0.6_p20200824.ebuild 1114 BLAKE2B 55e1664aa2cf50aa3d3a4c7dbbd550eecddce4db8e50dfda843ae612714cdde686744c1d981d0f8d38187b69fcf6f91a7fa0090825c6b2616416fb4be49a1bde SHA512 5e2a16730e159258d13997c8949e2ed4ed97f4ee55e3dd2cae4950e5f24e6d87fa3a2f7022737d4908818dfee070c3f753df4635344e1290d52001a2d0680c24
+EBUILD libesmtp-9999.ebuild 940 BLAKE2B c70c6f65ae3363723850c7f573352d004a60357955c198568c4f281505ec13220e0b0aeebdddb3380eeffc2fce2b2010fee9fb49869de07a02c824d33e158417 SHA512 2dd5f8dad7923bea7f7dd128a088a5aabc56828f8a6ce98457a8f0c1b930ced0a9be3db848486a48562a525e3c4bbd2fc96ed26df4251df227b29bf1ba4f2b8b
 MISC metadata.xml 330 BLAKE2B 960a34feef0d9e57b37adc3e5776686215c7476dc5331f39b247786ecec58407e74aae1898d60d54209e00573e5486e3b042ebabfb686d4840172371ed1d5509 SHA512 97671749440b8ca99218706c398b65e45fdd0c6a4529877aafad2deb0598c7a7fdd7b6aa84079b194c345b4eee550551aa5d2af60216f95fa0701f6b4ac3c1d6
diff --git a/net-libs/libesmtp/libesmtp-1.0.6_p20200824.ebuild b/net-libs/libesmtp/libesmtp-1.0.6_p20200824.ebuild
new file mode 100644
index 000000000000..549485ab84ed
--- /dev/null
+++ b/net-libs/libesmtp/libesmtp-1.0.6_p20200824.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+COMMIT="c80e46678e1025f3116bdcc75563364744adbe18"
+DESCRIPTION="Lib that implements the client side of the SMTP protocol"
+HOMEPAGE="https://libesmtp.github.io/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libesmtp/libESMTP.git"
+else
+	#SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/libesmtp/libESMTP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/libESMTP-${COMMIT}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/7"
+IUSE="ssl static-libs threads"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-1.1.0:0= )"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS docs/{bugreport,ChangeLog,faq}.md NEWS Notes README.md TODO )
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library="$(usex static-libs both shared)"
+		$(meson_feature ssl tls)
+		$(meson_feature threads pthreads)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libesmtp/libesmtp-9999.ebuild b/net-libs/libesmtp/libesmtp-9999.ebuild
index 20a4ae8e7534..83df4e67b077 100644
--- a/net-libs/libesmtp/libesmtp-9999.ebuild
+++ b/net-libs/libesmtp/libesmtp-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-DESCRIPTION="lib that implements the client side of the SMTP protocol"
+DESCRIPTION="Lib that implements the client side of the SMTP protocol"
 HOMEPAGE="https://libesmtp.github.io/"
 if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
@@ -16,14 +16,10 @@ else
 fi
 
 LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-IUSE="libressl ssl static-libs threads"
+SLOT="0/7"
+IUSE="ssl static-libs threads"
 
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
+RDEPEND="ssl? ( >=dev-libs/openssl-1.1.0:0= )"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS docs/{bugreport,ChangeLog,faq}.md NEWS Notes README.md TODO )
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index e44cbfbd953f..2fd8da72d74f 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -3,5 +3,5 @@ AUX libetpan-1.9.4-CVE-2020-15953.patch 2880 BLAKE2B a31fcc50b16d6644ce091aaf7f3
 AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
-EBUILD libetpan-1.9.4-r1.ebuild 2237 BLAKE2B 0b6b78907f5e6279b6738f0fe641afdcc0333ace80438118b6a41540f64a4bc19bcaebeee1e4d313d5f43dda84d39e0c2d6547af1690edd6652892eee37434f4 SHA512 008ad7bd15b3a171bae751976e614f242a40972d50e9c04e3f7dea78e1e258c3870486869ce0f9ab90c9c7f33ded29677ca82b059932eba0315d4f0f78968162
+EBUILD libetpan-1.9.4-r1.ebuild 2236 BLAKE2B 74c147234add5526e0c17336f2dc6b644322fdd82fd87a62023f87e444788a5e4f05cd9d244e26a6995465eb4cd1a586fbc3d23c857087d9092a79d8f18ac127 SHA512 e888833567ef7658865fcdd01ccf1dd6d6d8c3a837d2cf5b2ca2aa29caece3c5afd7e72a533f0249897eb68df58033549338a17a243c4b3012b1dc298675fe65
 MISC metadata.xml 828 BLAKE2B c33cbf260d3d2f9529101c441cf49fcce001deec2b23c22a63715ff2ecc0e105c46a37e0aaf9641449d88e57b148d5fbca534a3b81475ffe795aeb07f5c1441f SHA512 5e13ad73cf38a8e4690506fc56f3482d72675622d3882c4cae335c5146c6cd9a942eca23834d1a010d3edb7deca8325d9f4ff576b59a3879b47966489fd28a65
diff --git a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
index 596b7ddb55b7..760073c0c5a5 100644
--- a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
index bdf8577a6968..92522e4f574b 100644
--- a/net-libs/libgfbgraph/Manifest
+++ b/net-libs/libgfbgraph/Manifest
@@ -1,3 +1,5 @@
 DIST gfbgraph-0.2.3.tar.xz 270772 BLAKE2B 4e9e1d9ed5d0bc58d6b01f6d58d7d9dc8cddb28c09bc820927e242a7d6118aabc8e4d808050205cf2d516571c598a0dbc75e09588e64d53db1456d519d23b810 SHA512 4e03beb4172a591c7d1eb4cfac56009b0d25183168f73344d24ac47554334d1edf2c5087c523025cee5d565182a02dc7ef72adc66cff1e4ad53a1d0990d3afb8
+DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68
 EBUILD libgfbgraph-0.2.3-r1.ebuild 1005 BLAKE2B 8ffb8d2eec96a712eaa1ee1041e392edefe989d7915e753ecd9f52bb914dbbe0fbea18358d950aabab248960c17bba8d6eab3917f9040b039595a0518311a71e SHA512 d1d34aaf526c849097384343fbd9a8dab1400b93ebcb913ca348a376374aba0d356f61a0fb75bedc6dc595926148155cf05455606136594288ce0386dbe767d0
+EBUILD libgfbgraph-0.2.4.ebuild 1243 BLAKE2B 39b30bc1ad7f7cadcae0e486ff2194b84be4bd2bf5dbd5ca6d9afae2b543cf4c1c35dc26c9655cb68352aa74162474882aefc3d430d08caee7150a8f13135670 SHA512 54e129a0a37c3119a06a1b8652766695c266589e49d4c105c6f904e90ab708f622443a2dbbef02b0b35f5bc55168939f0574318554ddc3dbb56eddb7a8626e81
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
new file mode 100644
index 000000000000..25eaeeb87edf
--- /dev/null
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="gfbgraph"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="A GObject library for Facebook Graph API"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+introspection"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib[introspection?]
+	net-libs/libsoup:2.4[introspection?]
+	net-libs/gnome-online-accounts
+	net-libs/rest:0.7[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/gtk-doc
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+# gtk-doc needed for autoreconf
+
+src_prepare() {
+	# Test requires a credentials.ini file.
+	# https://gitlab.gnome.org/GNOME/libgfbgraph/-/issues/7#note_802926
+	sed -i -e 's:TESTS = gtestutils:TESTS =:' tests/Makefile.am || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+	# Remove files installed in the wrong place
+	# Also, already done by portage
+	# https://bugzilla.gnome.org/show_bug.cgi?id=752581
+	rm -rf "${ED}"/usr/doc
+}
diff --git a/net-libs/libgrss/Manifest b/net-libs/libgrss/Manifest
index 101dd356efc5..9b1294a2e271 100644
--- a/net-libs/libgrss/Manifest
+++ b/net-libs/libgrss/Manifest
@@ -2,6 +2,6 @@ AUX libgrss-0.5.0-fix-slotting.patch 3986 BLAKE2B a4fcde8d97fcabf79db52e7b3f99b3
 AUX libgrss-0.5.0-headers.patch 268 BLAKE2B a9873d24aa5c0bdbe004c3d91466127fba21636ed10c3a32c6d5140ea1d9b1b27bffd1146ffcb7309e66d93f3219b13b7da0cf1c86e8fddf4932492d7330dc9c SHA512 4352a3f80f5dccd164adacd32a3568df7c7274bac9a80cb4aac2d2e41cf62e40156a4aa96e4cd420f8279821b17dc63a51bafeab2cd7b5e1d3c0d760c503f738
 DIST libgrss-0.5.0.tar.gz 439634 BLAKE2B 28fcdfc7026b53c83bf8f97194bb70c1d68721bd767a1d527713756eb4360bb1ae81a2512d4284032d590bc5143fe9dedf1251c161bc22f0d4a1320639d05aed SHA512 189c49b7bdf029160e72d3d89c6779e193373e5a3af7f810041bf325d0b5543bb87b414d833a13e028a589b96a4d53bb223e88667d18d2c53f610d6086bb60ea
 DIST libgrss-0.7.0.tar.xz 362360 BLAKE2B d93337ab50edf9b5d0762a624fbf0db29faca556e5d13d51659c6199d9dcbf71bc8334b8a9c6a2830d9496b86d066949fc7b072439b63f3a528ef36b77c61bc0 SHA512 22a4f13ee979932575c6efd25bfd2fb184ea113aa34254d9e4bfb64cfbbd9b277dd235b8c9be037baf8c85bea7ba3bc1478ec3c7a3c87e63aeddb1774959c780
-EBUILD libgrss-0.5.0-r1.ebuild 870 BLAKE2B 445b78c46164d2039e77963b0265c3aa4e3e458d10981b636ad053da843305a450e4581fbbd083ca6e8289ef7daef6124fb9975aa41a174ebf9d8c46de4f64b6 SHA512 2661759badc30857e449aa5f53b167e4ed9a7cb0b9e29c65194d8b09a9c53ff4fd1da7d26c83a42186d3cff9399730c88d6e86ef4c0c692697a06fc2b4060871
+EBUILD libgrss-0.5.0-r1.ebuild 867 BLAKE2B 53ea59a5f326c2bae6b221f1465d5f1eb4857db951c65df825f13e1e6135a690e5ab5b5e501dfa8a887116faf8e6c01d8f10ca45c214805a5c00dcf6330cde48 SHA512 264323f62db8359f0ed14c8eebc02113b4d2f171a9729cd20229adcf59794e5d2dc25ec61925df605a0e7e77c72f7cf98cdd924bdeb2ad9995b15a19286a45a4
 EBUILD libgrss-0.7.0.ebuild 611 BLAKE2B d3a6e95a785b129e2bb87c2542e59d60e0cdf1bb6a91862b77b1c5f4f2c29d61dee07fca0e4188bb789fd76a093dd127980ef6c8a2eba27fc0f672d95c9369f0 SHA512 ef4078d9f120df4e62c39a8363485bdc306143bae7089918d40bc2d3486960684f332f065fee9a8e1b107b94e7ff5af3fcdda754118315b70bc15ea0655d3497
 MISC metadata.xml 392 BLAKE2B a3683c8e5db0596508877ac63d648bea8ba8bdf1e6fad9bd5eeab6d1003eba5dd9cda58515e80d8f287cb4cd7d056028a4656d2f83660d102c2326c48620ca5c SHA512 ea3b3f271fba72e28c4d0ab6db46c4fe58d5bac4999192a324ecea7f5199b8191cdaaaba89fc437bc24fa146a29a61a17f3df12bbc3d32c69a6aa91a795c05e3
diff --git a/net-libs/libgrss/libgrss-0.5.0-r1.ebuild b/net-libs/libgrss/libgrss-0.5.0-r1.ebuild
index fa23ad7e9b84..97d1a4d42169 100644
--- a/net-libs/libgrss/libgrss-0.5.0-r1.ebuild
+++ b/net-libs/libgrss/libgrss-0.5.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit autotools eutils gnome2
+inherit autotools epatch gnome2
 
 DESCRIPTION="LibGRSS is a library for easy management of RSS/Atom/Pie feeds"
 HOMEPAGE="https://wiki.gnome.org/Projects/Libgrss"
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index bc16fab2607a..cdaa512be405 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,3 +1,3 @@
 DIST libgsasl-1.10.0.tar.gz 1854755 BLAKE2B 691c143ece57b0b895f17ff3bfce8e216adb2ffcc7f6058501626b7b2e83d9eb0a85a036b6c7978b10eefbc94aab7b191e056341732d155597be5037e527b0e0 SHA512 33a8ea43be90a00fcda1b099ced8086b2ef9f72ee0dbce07bca04c944fa2d17588b6e5a32b7ab4ffeaf7ee695f9c84d3eb89c757c71934300d35580e423196dd
-EBUILD libgsasl-1.10.0.ebuild 1417 BLAKE2B 6002a2a56bc7943c02eeca31560a8545effa9855ae45524461fbec2b05c9396fd12e93c73b1493392e8087cda3ce143225545eb621913c1ec01e9e31c7c6467b SHA512 4d8310d89779c24b61f85a5ae1f92fd7c6f8ebabfef3a528983a513ecd58aef15d391809e84036699ca2b3424444d132e6b371ea29f5f2fac9bfe7f9da74a96e
+EBUILD libgsasl-1.10.0.ebuild 1418 BLAKE2B c5aecec746c7e679d82bec53ebf1def856f863df9f8d5928cd6ab303e8194d3f9ed9e831a81952270bf085cb9203433798998b6e4a2f5afd570847e8027a1ad8 SHA512 69c48a70ff298b654926c3619e7829922890bc4af03b29ca9ce0fdfc8ec1b92b9ce86d3be569ff95cf4a762d0b53922c585f285fd44d545cb127e7411d215499
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/libgsasl-1.10.0.ebuild b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
index 6d5ade330e41..e7c73d483335 100644
--- a/net-libs/libgsasl/libgsasl-1.10.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 
 DEPEND="
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index 0cc54f41045d..ccc775bc50b0 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -1,5 +1,5 @@
 AUX libgssglue-0.3-protos.patch 415 BLAKE2B 1c9a1592070eeeb3189ab7a64381f85c79fc8676b1efd744da70768767741ba1e3978c8dde7762c9c22e4de98c0d1e523d5bfd28efb7e5f97e5404e37dbdd183 SHA512 0993ce5908d1388490c195cd7da7950d019ac2937e4aa374dad515b12c9775ebbc578f2635b508b333fd8f961b4f8816db7c5e4891ace07f042c7ea6588c0307
 AUX libgssglue-0.4-implicit-declarations.patch 474 BLAKE2B 578c3306d1dc40165d20485dabac62f1a0d211e0ad3e0d54f79f7330c3ec7c26b0271345124b459eb576571735c9e3ec79687c1fce433fba5501a2b9ff59fcf9 SHA512 1a76bb2b53baa8277e117d8161cf186c569ae1d2e8f368a17378b33fb623e0be8b76ef6c36d413054d5501f344093be7691ea6e042b6367619de6079cd116c07
 DIST libgssglue-0.4.tar.gz 346984 BLAKE2B 5815db41ff3f65b014e713b68667bb49d3aecab943e891de881af2a2d157cceddc5173e7eff9ed2eac714b2e1341429694f1051ad98a3c4b728a61eaceeaddfb SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29
-EBUILD libgssglue-0.4-r1.ebuild 895 BLAKE2B 8af761c2e9a8334c01da8963d673786e3780c72f9dcaa5abcad7a9507e94328e77cf83873ed5e3df062991dac35d1b6372c10297f32eca4f84a75c77e4e05da7 SHA512 b2a59cab55d7078959f57c6dc94fa52bd4c264ec36c3b52f652b4fce85adb34f2cbbf470bc30ee067a9e8bc64b3e9c9855601156752b88e5bf332f8cf32db9bc
+EBUILD libgssglue-0.4-r1.ebuild 896 BLAKE2B 9741f96397e3958ade13f0d8fe25199bd176374e1b48a40e6f93b988502993428d06ba117977fc5c7b01e70826f601417e7cb3bc05be1cb6da9b3c1709def025 SHA512 4ca2aaa5004eeba87e5937fbdfe5782291dda2b0b43cd73c7b760aec9b4983114d43187e1660f07aac30d5f902ac6a30bc5ef5dcca4fb8729b2601a1d085b9e4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
index c83a1554679b..1229298a72c3 100644
--- a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="!app-crypt/libgssapi"
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index de264dc0cd97..e8c0a2b6f5da 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,6 +1,4 @@
-DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
 DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139
-EBUILD libhackrf-2018.01.1.ebuild 1007 BLAKE2B 6bec7c1a938fa883218ac3e1d2af9280baff3e6ad0552e598fc63ff815debb1c621b5bb413b645934882d6c1ddd349065e866e7e0de2c5760478e03de5cf7af6 SHA512 1696a2d932930bd128e0cbae2b334a290e686263cbf85881994d922f155d31d3558dd1fc37047f531ab5d569814f74bfc30c8f94937af88a59181a73cf75293a
-EBUILD libhackrf-2021.03.1.ebuild 1007 BLAKE2B 2ae026d3684039e642c7665fc39a6b2a57646fe59f479c38a314b5d8b9bd966e310536f93f5fc44e12c3af50bf88e43d6a8be3c9196bcf19db041b854dde10c4 SHA512 d6515e507b109e24e3a73e149cda9a8060a3b11bab40c7cbd883760b2e5c74d8afad0e2a16285b67c9a374c2814be2d9550771167bc2fe3fe6bdb7ed1a30265b
-EBUILD libhackrf-9999.ebuild 1007 BLAKE2B 6bec7c1a938fa883218ac3e1d2af9280baff3e6ad0552e598fc63ff815debb1c621b5bb413b645934882d6c1ddd349065e866e7e0de2c5760478e03de5cf7af6 SHA512 1696a2d932930bd128e0cbae2b334a290e686263cbf85881994d922f155d31d3558dd1fc37047f531ab5d569814f74bfc30c8f94937af88a59181a73cf75293a
+EBUILD libhackrf-2021.03.1.ebuild 995 BLAKE2B 0208bfdc780b55dddae07348cd34ff9d4f7e4080e3e1494dc894fd4dff858d94b09dfc33e74cac0b8c3965d6dab015b52d0ed7b7407b471f795fd9968fbca7f9 SHA512 f1a49089308790edc0547d870adb9a7c75c7a7017026f3b5501cebd29881a7547bd5721fd0ffec3b41dfadc4efb5173cfcf4ea5e598336754b6c1831eb875281
+EBUILD libhackrf-9999.ebuild 995 BLAKE2B 0208bfdc780b55dddae07348cd34ff9d4f7e4080e3e1494dc894fd4dff858d94b09dfc33e74cac0b8c3965d6dab015b52d0ed7b7407b471f795fd9968fbca7f9 SHA512 f1a49089308790edc0547d870adb9a7c75c7a7017026f3b5501cebd29881a7547bd5721fd0ffec3b41dfadc4efb5173cfcf4ea5e598336754b6c1831eb875281
 MISC metadata.xml 477 BLAKE2B b801f5f0a79afbd3227a4ee2688b9332824f61b8bda623565d2f36408dc792aacc273495d7ada5a37a69092bedc61b7ca28952738a5969bfe3132253423d437d SHA512 ba679c6d4942d6a0f8efb480f820434676e37148bc60b481e9b7b0fe13b6037ee8c450632a85de25ed08e96b6e3308ee7b54b8a5f5130cd43827ad811d59a825
diff --git a/net-libs/libhackrf/libhackrf-2018.01.1.ebuild b/net-libs/libhackrf/libhackrf-2018.01.1.ebuild
deleted file mode 100644
index 06468417d0d7..000000000000
--- a/net-libs/libhackrf/libhackrf-2018.01.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils udev
-
-DESCRIPTION="library for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-r3
-	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/libhackrf"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
-	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="+udev"
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_UDEV_RULES="$(usex udev)"
-	)
-	if use udev; then
-		mycmakeargs+=(
-			-DUDEV_RULES_GROUP=usb
-			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	use udev && einfo "Users in the usb group can use hackrf."
-}
diff --git a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
index c5c30e59473a..fd72ef016bea 100644
--- a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
+++ b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils udev
+inherit cmake udev
 
 DESCRIPTION="library for communicating with HackRF SDR platform"
 HOMEPAGE="http://greatscottgadgets.com/hackrf/"
@@ -36,7 +36,7 @@ src_configure() {
 			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-libs/libhackrf/libhackrf-9999.ebuild b/net-libs/libhackrf/libhackrf-9999.ebuild
index 06468417d0d7..fd72ef016bea 100644
--- a/net-libs/libhackrf/libhackrf-9999.ebuild
+++ b/net-libs/libhackrf/libhackrf-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils udev
+inherit cmake udev
 
 DESCRIPTION="library for communicating with HackRF SDR platform"
 HOMEPAGE="http://greatscottgadgets.com/hackrf/"
@@ -36,7 +36,7 @@ src_configure() {
 			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
index 10dc7d78c7c1..2dc40221c18f 100644
--- a/net-libs/libircclient/Manifest
+++ b/net-libs/libircclient/Manifest
@@ -4,5 +4,5 @@ AUX libircclient-1.8-build.patch 340 BLAKE2B aae0969fce33301022fa11f93a2eb1c81b2
 AUX libircclient-1.8-include.patch 289 BLAKE2B 4ba6e8eecdaad20dacd96b8418150e371bdbc65d68b87fa45738b53499633d9fbf23f6745282af2287e0ddd3118b1cceabc0305d5d6c37ed5d04e7a88b1a4b6e SHA512 62e3c1cfe8843eb16efe9e803785ba759100e3cf4c82b7f9f2fe11bd92a5fe9ad85707ef21c6231e3ee23f6e283711f643db76e79699574b3fb01eb893977d02
 AUX libircclient-1.8-static.patch 209 BLAKE2B cc25d264d6d1801584ee06ca51921f7ad1dee1499b1e604c8d732779b44f22aa93fc076c97fee45d131d10cb46cf611a4e03220e61462d2b0003653554667217 SHA512 b1161ce28e5a8d668c852ee0ac336c186426a9467156c66ebe4805a722297ec225cc6b859c13003741d05a15ced1ccfaca0a20d98bf0bf933fc84fc1a97d8827
 DIST libircclient-1.10.tar.gz 288863 BLAKE2B 28bcfb36553c04be28ef4ffc0cf5fe3af8538704997f628f311719d245a0629ff49bee2c512d29e4d43a24a2803cbafc99512ebda7d5c991d9ecb2f1786a9d24 SHA512 d677ceae0bfabc112671b351fb94d048399a7ad025ff33a2ff1ae6313382fcc78b64d499f2c882eb8b894abdde949562395819e4059fd14640dfae6757b0c259
-EBUILD libircclient-1.10.ebuild 1360 BLAKE2B 3091541933889ee79eb321ac1d3dc2d203c6c7082a5cb692c5f73830faf47b8e43dfb5bc511231290c9770189106d0d33df9516266d5b16400a8400f1ed99e64 SHA512 fcc3712deb08af153a3b76e885d59d01e201eb0ec746afa2bf5eed4b4640965005e1c56731ec3fa55b08c5e17a2bd036303bde161aa2acbf363eca1941790086
+EBUILD libircclient-1.10.ebuild 1367 BLAKE2B 52673c19a3b4726a618b47379f421f74df05652e60ac60337328acd1d1a31aa4b6eae9dc570b125c6b40bcb8035e9aa34a5a41ae6a854251ae78108ac2278704 SHA512 10bff52b3e960894b24e90a402d0981987e8281a22dcdcfc3aa19e7e077f90ff9cef23e8449c1816dea214d56ecc898dd9fef2f3dae80e8d8cf4a7de6d59bef2
 MISC metadata.xml 335 BLAKE2B 9616df0f3f19ee3ece536dfb658a60a9ffb53bed2562086cc5d0f15f27116a86d3ace0c0a796c476045a74d49e803008d9c345ad027f8bdfbb5923e008445268 SHA512 af62ea7ba30a57f3271bded0d53a9122693e992d1050667701ba54bb33d6851b6ddabecf5f54bbdf8aebb212bd3e6a5999a8e8c1b2bbdd6666243ccb24a6182b
diff --git a/net-libs/libircclient/libircclient-1.10.ebuild b/net-libs/libircclient/libircclient-1.10.ebuild
index 4607040231bc..750e5cf0862a 100644
--- a/net-libs/libircclient/libircclient-1.10.ebuild
+++ b/net-libs/libircclient/libircclient-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
 IUSE="doc ipv6 libressl ssl static-libs threads"
 
 DEPEND="ssl? (
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 3230aa217c7d..2661ee8d40e4 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,5 +1,9 @@
+AUX libiscsi-1.18.0-fno-common-2.patch 2058 BLAKE2B 00a2d3bd1ae4b08479593f92eaf8092fd5471ebe8df4bc6ff17786214a3d927b90928c014984ecf90b6c8950f8d2e74b5094ff7f903067ca939fcd14ed7006ee SHA512 e19867d6ca9373176bccf9ecb4b78a312f210bd719947a0bb590e8f18862da58d6254f396bab7b84410ca1bbd3ad1c24adfe3e3994e9e6424a4a27e17c65e420
+AUX libiscsi-1.18.0-fno-common-3.patch 1387 BLAKE2B f8bacb84a3c340a528576f56b52026fefc97792b9d5a136150bf348e378cd60b9ea702101b8e9443a320ddafe5a21d646f98a4a3434661adb39f595e2e9dc52e SHA512 b0c359393b70ee6a808e254a8aeb58d7bea25307fc0f957696369e74d82eced2d7b3edcbc18dc0c3be0b45016bdf331183bcf8fdfe853b292861ea28238aad2f
 AUX libiscsi-1.18.0-fno-common.patch 386 BLAKE2B c87a1e2c2b582277b3146a592cf385520a20513cc349a6244cba8e55f4a8f3e7f830cf16160564b07756899cc982993fff45900f512c0cb187340ecbb7bd1e4e SHA512 fc1aae874619ba263f404da0cbb4009fc09b907c2f9a65e29e18874b18daff7f0bc243b9666f19430d5a52e30adf5c784d380162c2bb65f1c79c9084981e2c8e
 DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
-EBUILD libiscsi-1.18.0.ebuild 829 BLAKE2B f412c0154a82852ddaa96053c326f976d73dcd3bdd041698de82f94b650516835e9dd4d9ec72c31e66f75b3211750fe70163e681a6f0094a53a4371ca4bd1597 SHA512 f197f360b60fdebffdc0332b4575abcdca1b46e7d89a7854f4b4a0e6f67168e5acb91fbac079c11f40f640ce4e495608dafb1029bbfdeaffb3059efe8561dd29
+DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
+EBUILD libiscsi-1.18.0.ebuild 908 BLAKE2B 4ca51f1f01cb18445990e05ad606eee71638d82adffc2d2d02b098241575f27e293388e06af4b770171a82021c5f3d6c2232bf507cd7696369523c10f8231f5f SHA512 0592599af1fe5116abcd26ed6835a080b9514def998ffcc1829922c5d32c41d0ca71adf7cb609304e62644426aa679906004621c1cd08e1d0b9e6ea064e604be
+EBUILD libiscsi-1.19.0.ebuild 975 BLAKE2B 6e239b8f48437edd357f760a3a1c7c18ebdc8192570bf1ed4a1e42135f73e9709547ac7ce3606b9da9eebec6e7a63b6b6f5aa3746428e7904bb56e8f4eea8dd2 SHA512 142777c88a783033ba46fc6a73be7b540c766249b965ad408d4d841d731eadde16382cca0aa6ace7429c59550137bb3af71671d2a4afa25300b37e8c913cb9da
 EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221
 MISC metadata.xml 247 BLAKE2B 3951ab56f9a5dd54a6da332a8f5a7c2b445ec812f8ba6ff6e8957e0ea605c197954b403c8da0d81fc02ee829ccbf807ee8fb929b05ff6d347e67bc22d8023c26 SHA512 8188eee6fd9f0b2bf471e9ceec1bb6459f1ef84ba7ef3dc372747043d3a6db6256dccd4e9e12596a07a04e778576e83fcb56350e59a7e5e09c43ac4dac789af9
diff --git a/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-2.patch b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-2.patch
new file mode 100644
index 000000000000..abb561982ba8
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-2.patch
@@ -0,0 +1,53 @@
+From ea89dcdbf167acd634300296172926c2e8d85804 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Sat, 15 Feb 2020 18:03:11 -0500
+Subject: [PATCH] test-tool: Use 'extern int' in headers
+
+Without this, linking fails on Fedora rawhide. Example:
+
+...
+/usr/bin/ld: test_async_lu_reset_simple.o:/root/libiscsi/libiscsi.git/test-tool/iscsi-support.h:59: multiple definition of `param_list_len_err_ascqs'; iscsi-test-cu.o:/root/libiscsi/libiscsi.git/test-tool/iscsi-support.h:59: first defined here
+/usr/bin/ld: test_async_lu_reset_simple.o:/root/libiscsi/libiscsi.git/test-tool/iscsi-support.h:58: multiple definition of `invalid_cdb_ascqs'; iscsi-test-cu.o:/root/libiscsi/libiscsi.git/test-tool/iscsi-support.h:58: first defined here
+...
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ test-tool/iscsi-support.h | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h
+index 7aa9e45..9c3a461 100644
+--- a/test-tool/iscsi-support.h
++++ b/test-tool/iscsi-support.h
+@@ -53,17 +53,17 @@ extern const char *initiatorname2;
+ #define EXPECT_RESERVATION_CONFLICT SCSI_STATUS_RESERVATION_CONFLICT, 0, NULL, 0
+ #define EXPECT_COPY_ABORTED SCSI_STATUS_CHECK_CONDITION, SCSI_SENSE_COPY_ABORTED, copy_aborted_ascqs, 3
+ 
+-int no_medium_ascqs[3];
+-int lba_oob_ascqs[1];
+-int invalid_cdb_ascqs[2];
+-int param_list_len_err_ascqs[1];
+-int too_many_desc_ascqs[2];
+-int unsupp_desc_code_ascqs[2];
+-int write_protect_ascqs[3];
+-int sanitize_ascqs[1];
+-int removal_ascqs[1];
+-int miscompare_ascqs[1];
+-int copy_aborted_ascqs[3];
++extern int no_medium_ascqs[3];
++extern int lba_oob_ascqs[1];
++extern int invalid_cdb_ascqs[2];
++extern int param_list_len_err_ascqs[1];
++extern int too_many_desc_ascqs[2];
++extern int unsupp_desc_code_ascqs[2];
++extern int write_protect_ascqs[3];
++extern int sanitize_ascqs[1];
++extern int removal_ascqs[1];
++extern int miscompare_ascqs[1];
++extern int copy_aborted_ascqs[3];
+ 
+ extern int loglevel;
+ #define LOG_SILENT  0
+-- 
+2.31.1
+
diff --git a/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-3.patch b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-3.patch
new file mode 100644
index 000000000000..e3c34aa6fdbc
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common-3.patch
@@ -0,0 +1,34 @@
+--- a/test-tool/iscsi-support.c
++++ b/test-tool/iscsi-support.c
+@@ -119,7 +119,8 @@ int readonly;
+ int sbc3_support;
+ int maximum_transfer_length;
+ 
+-int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
++static int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
++int (*local_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
+ 
+ static const unsigned char zeroBlock[4096];
+ 
+--- a/test-tool/iscsi-support.h
++++ b/test-tool/iscsi-support.h
+@@ -779,7 +779,7 @@ struct iscsi_async_state {
+ void wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_state *test_state);
+ 
+ struct iscsi_pdu;
+-int (*local_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
++extern int (*local_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
+ 
+ struct scsi_command_descriptor *get_command_descriptor(int opcode, int sa);
+ 
+--- a/test-tool/iscsi-test-cu.c
++++ b/test-tool/iscsi-test-cu.c
+@@ -63,7 +63,7 @@ static unsigned int maxsectors;
+  * this allows us to redefine how PDU are queued, at times, for
+  * testing purposes
+  */
+-int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
++int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) = NULL;
+ 
+ /*****************************************************************
+  *
diff --git a/net-libs/libiscsi/libiscsi-1.18.0.ebuild b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
index d5f2c942c2dc..444ee4b744fd 100644
--- a/net-libs/libiscsi/libiscsi-1.18.0.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.18.0.ebuild
@@ -22,7 +22,11 @@ LICENSE="GPL-2 LGPL-2"
 RDEPEND="dev-libs/libgcrypt:0="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-fno-common-2.patch
+	"${FILESDIR}"/${P}-fno-common-3.patch
+)
 
 src_prepare() {
 	default
diff --git a/net-libs/libiscsi/libiscsi-1.19.0.ebuild b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
new file mode 100644
index 000000000000..ac0e12e20ddf
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-fno-common.patch
+	"${FILESDIR}"/${PN}-1.18.0-fno-common-2.patch
+	"${FILESDIR}"/${PN}-1.18.0-fno-common-3.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		--disable-static \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+	rm "${ED}"/usr/bin/ld_iscsi.so || die
+}
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index eea1accce8fd..46917c4a924b 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,6 +1,5 @@
-AUX libktorrent-2.2.0-fix-MultiFileCache.patch 905 BLAKE2B a82395415166f2bb3475703e0ba3a7a428cd968e1ae3bb2df401f08db5d3f91518da38a7aba694bb7d56e4f089370c0532def676ace5c502549e718693783950 SHA512 99cd120d2e03bb9a64413d66810f67160afff066d9c15f36da335c838ee7d38f32d88ba9a4c7df1d0bf92c79bf50a080c0ddfc1004973f6c711d5d0aa9200bb8
-DIST libktorrent-2.2.0.tar.xz 357364 BLAKE2B 66a91fc32dc11a680d22755468513896c9cea1cbaef8664c84633860b78efba85e5c9e47684fdaaf7fb6f03f624268f9158ee2b8c6fc3d14b0e70339c1f6903e SHA512 2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a
 DIST libktorrent-20.12.3.tar.xz 604488 BLAKE2B e51bba82990632744aaadf3e40043fa80e64395f6f3721992780ff77d7663a0a3600aaf7d2653a00f32366555f1000a961c3e99de6d2e2cfecc4c1f79d1ebb00 SHA512 e2259251e8edbef6154674898614f81b3a29d5c711e9f751435450edbbb987c5e2a1d8ff864da5aa180b5d1adc3ef611f46175f2126faca52d1b1338d986d1cb
-EBUILD libktorrent-2.2.0-r1.ebuild 1551 BLAKE2B ea1add797a2ef00905b0c4bd7ddf18782e7f0d9f4e1533ce87df1bccb7fa7949a8edcab68891cc2ba0e46c574d5296dcd2aef9d05e3a72dbb231f2ae764f951a SHA512 7b1f88e1a44febb76014ed62e20b00f69910c56ff487d77003079ebf0551a34fa8158f01cc9239f853ff24cea3d0422a4ef93961c74effadcb0aedf46424f351
-EBUILD libktorrent-20.12.3.ebuild 1453 BLAKE2B 6af1132f972c7de12bc388f359979ce31b5f29028ed541b4a46f5c848efcc22aa262aa0ef6f94f42a610d383d70b9f650e60b86b40209002ea873fa9737ffd0e SHA512 ef93f6aba70813fee1822d7e69dc6a05dda7eff2bc8ed8ff301d1c707c7f508ceb2234560d2d1ae2baa41cb576a0b10766667ffa733edf5e274847d53655aeb5
+DIST libktorrent-21.04.0.tar.xz 603584 BLAKE2B 5fe1012bf5f18d3d8e08f1372216ccd975e544daf79063267285e06e29be20e9ca3f2a443bb52a8dec5a3bb3c3b927eec024e91c549cc22ff707db4e2d5bdd92 SHA512 b0455a589bf0d452c3df142182d677659fb4d0a3e4e80ca0dad9abc8c4c276bcd7b2f0889a0bf33ceddf1e71aaceaa3e654b26e904988a96e62ea42a0ba0952d
+EBUILD libktorrent-20.12.3.ebuild 1450 BLAKE2B 9622963f20945eb74d30d6a87fac967d4970d73dcd4ad2ebec04b528c708df172fa8a7ff7e8a19f3b6de5e91cc005259b1ab96ba613a530ac5a32e5f15c0b6e2 SHA512 c041d91582cff0e468eaf24319a79bfa482f238f9bdefb59bbac604aef15bf9cc5317564f31e62a1c142bd8df8aa8a4a7e9c35f6628b11db4a735f686f8def0d
+EBUILD libktorrent-21.04.0.ebuild 1442 BLAKE2B d5b0abc6b02740cefad1ad9ee4d25b8e47fd0b03148498d759fbcdb4173abf66a5862630e9292bd6f53b7109e921314698499cd291af2ee19ac720bdda12bdda SHA512 09ee605ddfb77fda18bdddf9361487b2cc846ba089760ef94e5a5aed6f6e7f776d7faa7f94aab786c09254e7d187bfe15cca827a5123d1189b910b2fd37de32c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
deleted file mode 100644
index bafdbaffefa5..000000000000
--- a/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b0abf8378d497c5a8881771518df6a02404d031 Mon Sep 17 00:00:00 2001
-From: Alexander Trufanov <trufanovan@gmail.com>
-Date: Tue, 16 Jun 2020 13:47:42 +0300
-Subject: [PATCH] Fix a bug in MultiFileCache
-
-Differential Revision: https://phabricator.kde.org/D29852
----
- src/diskio/multifilecache.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/diskio/multifilecache.cpp b/src/diskio/multifilecache.cpp
-index 0a513ad..882630e 100644
---- a/src/diskio/multifilecache.cpp
-+++ b/src/diskio/multifilecache.cpp
-@@ -455,7 +455,7 @@ namespace bt
- 			off = file_off + (piece_off - chunk_off);
- 			len = piece_len;
- 		}
--		else if(piece_off >= chunk_off && piece_len < chunk_off + chunk_len)
-+		else if(piece_off >= chunk_off && piece_off < chunk_off + chunk_len)
- 		{
- 			// The start of the piece lies partially in the current file
- 			off = file_off + (piece_off - chunk_off);
--- 
-GitLab
-
diff --git a/net-libs/libktorrent/libktorrent-20.12.3.ebuild b/net-libs/libktorrent/libktorrent-20.12.3.ebuild
index 3bb33235eb97..d1f8b32bb18d 100644
--- a/net-libs/libktorrent/libktorrent-20.12.3.ebuild
+++ b/net-libs/libktorrent/libktorrent-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/ktorrent https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild b/net-libs/libktorrent/libktorrent-21.04.0.ebuild
index 95565a6e37af..13cda9ce275e 100644
--- a/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.04.0.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="forceoptional"
+KDE_GEAR="true"
 KDE_ORG_CATEGORY="network"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="BitTorrent library based on KDE Frameworks"
 HOMEPAGE="https://apps.kde.org/en/ktorrent https://userbase.kde.org/KTorrent"
-SRC_URI="mirror://kde/stable/ktorrent/5.2.0/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
+	>=app-crypt/qca-2.3.0:2
 	>=dev-libs/gmp-6.0.0a:0=
 	dev-libs/libgcrypt:0=
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -41,8 +41,6 @@ RDEPEND="${COMMON_DEPEND}
 	!dev-libs/botan[gmp(-)]
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-MultiFileCache.patch" ) # 2.2 branch
-
 src_prepare() {
 	ecm_src_prepare
 
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 347014a3c4a0..acbbbe099892 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.Darwin.in 2436 BLAKE2B 63d9ce283549b26921cfd317639da45723ab5129e79dc0df0f4c2fa2489264db1991b6e9b2e76fb04906b85325d171af7dc2bb4f7f880cdb76fcdca76b50cd2f SHA512 e39931c63a20d49f6010dd668132295cfd3e02f39566715448665715ee909de3179c1db496b78261866794cdb21ecb14ccdd505f45aea5d8d0b7b196c344f9a1
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
-EBUILD liblockfile-1.16.ebuild 1310 BLAKE2B 10167a13d733cda3e19c9a0b44de8443e162fb93efe96abeb2e0f9dcf7686a08f5bdd07354b616a02cfdf351b3da5cceb7971ef4fd6bbfb4b816e64c596090ef SHA512 e0c67f083838ffe7e62d022d46178a63e7ee80d36385b7cfec212dfda11751753ac8a11ffbdf043b153d5fbca68e16d4507ddb98c3f591de285254687a4bc8f8
+EBUILD liblockfile-1.16.ebuild 1311 BLAKE2B 1495377f36328625a0407a76b1bc1a373f8ce3bbdae66600e3e00c6315d584bc29331794b568480c1118c3ce160dc80466a5a9e252dc05a00409c0283c6b41a0 SHA512 d4c32d400e2ec2bfcaec81b91e8bd50c61e546dadc33a69a193aaa5d4a258c8a8d05fe603f024a29ddb988932144ec14107b52c59c8b66fd33a8750a36674b08
 MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
index 5d0dad140895..3140e575a8bc 100644
--- a/net-libs/liblockfile/liblockfile-1.16.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 3ca48924d389..b5d4b6f3b668 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,5 @@
-DIST libmbim-1.18.0.tar.xz 474768 BLAKE2B 3dce8e1fa0e57cdf75174d0145006b38213fcd2de9166589f2d3ddd7a17dae3b308ce7a7338d388543c8ba83b6a9d2bf12051cbde1666fc43580314d9906704b SHA512 510af324563a6a4f9a9d656d6724398cf5c5ba07424962d5407dd05867ef36da40e1ee6c8be8040c6a67e764bc059d24282db45ce3d47075fcf4d7416245b28d
 DIST libmbim-1.24.4.tar.xz 512524 BLAKE2B 4f91d1fd4d993b3e28f7508f4fbc3d6f4467db1c27307a3c4bd006ad9cdb40800513641fabf37deb673f5926d7a0f0d4806e3bd62a3ad8825227631d35c67d5b SHA512 bb0b82c64213e5b382a807c5c4c36751138c343419dc6abf1605573c91620af1a6de45587eab7341265f950548924fa65fa4bfedba0659b2f9eb80fa23ae88bc
-EBUILD libmbim-1.18.0.ebuild 819 BLAKE2B d3b37644e4b06d321f51a145f0d23d6cb36232744bb766fb6beb0c738a7dcada12d733eb27b50622f6c4a5eae0392ce606b67a6f7f6668fc0b6a6f46d0252f24 SHA512 45ab3fbb709839c8834d5ce305ca358ad9ee6bce593b086a60b40d31998b1083e27336ba310e8d2d7b3cb2a99006059f77b601d140ed9c9eaeec54ba32149708
-EBUILD libmbim-1.24.4.ebuild 837 BLAKE2B 2d9c7ba727896518e4199014bdc792096a85e47714cfa12dd03b6a5f5144674e8b660a98ba68236ab3cb01676ef69f5c36a886d438563b0e77ec5adc77f7cce6 SHA512 eb25b94b6d01446ab6dc1e75d7e22406bdc3dff92e4bd46980be0b0435961e3f79628cdbf1d82406831deaa3e4189c0d1c7b6537e54191d613806763a2def220
+DIST libmbim-1.24.6.tar.xz 511468 BLAKE2B 89c4fa25573d4e58ec993e4fa24e0ff3ab6146c905fd3110240d2dbd3ba20af8c135e5eb552b2c48b1166444e52023e314d70d4fe5904ede5e2c6d3d05724955 SHA512 b0b15aa5ffdc65e9d7af211df771f85021488258f7c50638ad109173a61ef38872b9ab42005cd972fd3cb24e617bd3fe7b0b79d335e2144558daa218fb2c4653
+EBUILD libmbim-1.24.4.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
+EBUILD libmbim-1.24.6.ebuild 822 BLAKE2B 0f7231820b6ac4497a1e70c1ae5ab473cb6b81022aa4e55e007899369115d59ac59fed6381da6024891700a1bed1d1fd26c45d021ae2d177ff4aecf5ed19a29b SHA512 e9882fd9e6fe5442924e87aa19ba803c5f4d808e8543a177114d471a1b734b64bff9db06d16ce83d414d46a6382bddc9ccee3ec3bc62de1226de345a76f448b1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libmbim/libmbim-1.18.0.ebuild b/net-libs/libmbim/libmbim-1.18.0.ebuild
deleted file mode 100644
index 75d6ea792a6f..000000000000
--- a/net-libs/libmbim/libmbim-1.18.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib
-
-DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
-SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="static-libs udev"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	udev? ( dev-libs/libgudev:= )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-BDEPEND="dev-util/glib-utils"
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-gtk-doc \
-		$(use_with udev) \
-		$(use_enable static{-libs,})
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libmbim/libmbim-1.24.4.ebuild b/net-libs/libmbim/libmbim-1.24.4.ebuild
index 7b8777e5076d..bbdba255bb73 100644
--- a/net-libs/libmbim/libmbim-1.24.4.ebuild
+++ b/net-libs/libmbim/libmbim-1.24.4.ebuild
@@ -3,15 +3,13 @@
 
 EAPI=7
 
-inherit multilib
-
 DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim"
 SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="udev"
 
 RDEPEND=">=dev-libs/glib-2.48:2
diff --git a/net-libs/libmbim/libmbim-1.24.6.ebuild b/net-libs/libmbim/libmbim-1.24.6.ebuild
new file mode 100644
index 000000000000..322e88fb7990
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.24.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim"
+SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="udev"
+
+RDEPEND=">=dev-libs/glib-2.48:2
+	udev? ( dev-libs/libgudev:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-Werror \
+		--disable-static \
+		--disable-gtk-doc \
+		$(use_with udev)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index aa546906753b..e92b6a3d4309 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,13 +1,5 @@
-DIST libmicrohttpd-0.9.65.tar.gz 1633346 BLAKE2B ce6ba2b6c52e30194872c66ab5b9e358f0979dd99ef24ce59fddf9e6fc2b76b01f424f9c9b511cf88c2dde2ca98d3f6a25cbcd26bdfadf0b9db65efd36435dc7 SHA512 751b7a5970cef07f260660254bfdeda4882e9e28d5cbdfbfed50e2c4583caf8f19c96ede6d368babc4223e7fbdf85d85eec37dc96abf333377dc13d6a9c6be12
 DIST libmicrohttpd-0.9.68.tar.gz 1884342 BLAKE2B 3f74c48917fa19753a617242fa07b99a69510a14a802609d038964d927516f8f52b4330d0eee2c7b98096b2d840158e4945310edef290224ea256d9616fb4d94 SHA512 9daaab5fb35fef6f2a19b7e08eeb8473aeb0a67631808a8d7a7f78a09cb621ca5d32dbbbca616865a40afb92f8c6495f9e2ba1674880af8011a2bc798c070a13
-DIST libmicrohttpd-0.9.69.tar.gz 1884511 BLAKE2B 6470b52e58d82a7fee17d8545e546cb9d3fa38012bcf3380d238afdf0f1b5391e19df53a89ac977ac9452d23610dc851f5da5972cace8d8f1088e1040d173572 SHA512 1633d2e606f476489e8af549fff88735e3b5641c85d59071edc8b2e1177fe1b6302578b69b8ff6669d3e1954c20cf0fa1ee52b42378362edd26197d8992e469b
-DIST libmicrohttpd-0.9.70.tar.gz 1886435 BLAKE2B 09ae33c66f151d9ce03b8333b26c32e2c0896d150441f39da632fe1316c66123f343d021d7fc9a974fbbab7e642d253138d071d4ee506477de46bffd3ce4691c SHA512 391293688d5ef51cf8d918294000384cb291f46bf767295af5a97123c06c75573d480a6c4b2486712b53636fe3e5dc1f8827ccf4335ac435ec85c3529733d8f5
-DIST libmicrohttpd-0.9.71.tar.gz 1894695 BLAKE2B 46bee477972a1bf791f9edaa7451790e03fccfac9a8b79fd6fb4038fbd2c3c0f268df787894cd21ddba2640fa087537f681dec4765fe03064a3c9f79aa708b26 SHA512 dab92c0979f8016844970ce4e110469e608e2e15b4096cf518350541248f123e40a4c0289ba025302e318e0bf47a957e9a3dcdee6f55936504b6c1c4f02efb86
 DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860dfd8cf69b21e44ee05ae2f7561b766a72d2dbb7f57849a31c22454e211befa74e058f78814b79e7876b3d14c7252ab5800 SHA512 9695e2fb08785e4b60342226ef3a0af22da4d80f127e7db9ec80ce844f70d0d781b30af207d58d8eb691b85a5fe4691cb9ecf887ca86f5e059a05259ae041316
-EBUILD libmicrohttpd-0.9.65-r1.ebuild 1265 BLAKE2B 2d824f55d76f8e0808fbd3ce6020670fa36cb2a84aa5a0f214e1f7f0332b751dbc8c7ff28b785a58162a8f4ca3443520470b9c617edd3df092b33ccbc4c41e22 SHA512 88f138438c69164eb12e6f74385cbe01463c32f1096e3bea96142a703a4ccb538ce46318a4f1ae170b2e38d191870c28cf7d9ec67223b5a548964a21444817cf
-EBUILD libmicrohttpd-0.9.68-r1.ebuild 1252 BLAKE2B a151461c9b8f4f65d040e7b4bb14bbc77a76d287c137754b952003a2fd45d6d68385cd40b965a9729aebf2757003f089ad17f7bb39c06be42c6c30414d6f9e1f SHA512 399295c2e4eac2bc8ef0e8a8590a317e292494bee5f77e22ce8257cbee2f0abf8ab0d51caf9fb7292fb271c4cba6a32263805216f9a9bb17763d0b79812fb341
-EBUILD libmicrohttpd-0.9.69.ebuild 1287 BLAKE2B a9607356e4ba7c1c6e348b038968aae662e8185b78df4533767dd5577be96e50b351c5d80e76e02a57b40ef83565627f8bafa9848154e89647ef1913c01458fe SHA512 f6a9f15268e8410c038a2b02b8e10d94be4d7dcd63aa772db138817cead05bcde3bd342fb26df49b52d43775fe190220205f7a13abebda327771ca850a51799c
-EBUILD libmicrohttpd-0.9.70-r1.ebuild 1251 BLAKE2B 9479488e6702f6ca4cbf57ec4791b33b136b91f8a92a1f5ab54e38262038e138399bef68f1daaf9ef68b566488ab586e464310420df886717dc790ce9c67d1eb SHA512 0cda74bdede70b9e9118f0ab6d52b8f404f348fbdf48dd1b2a6d4cb99f795f0dc46c589e9a21f8a7ce315b03c86c2ed268633a76bb269be6a617e949229589a3
-EBUILD libmicrohttpd-0.9.71.ebuild 1294 BLAKE2B 25be4be610b51c671f74d1c8261350a1b316536b8abecad71a5fd980a8fc7c02006ec6f751409aafb6f7262f6b8f613419c6634dd4f74e0028441c70d08e7049 SHA512 c520a4c3231fb4aeb8550b1de44a92007e0e040c6e272625fe45497d85a04756eeff0a587ee0ba149330504dd661eff8bbb6a72b22297471239a4e4f27411720
-EBUILD libmicrohttpd-0.9.72.ebuild 1243 BLAKE2B 97562fd5237bf9a3937aabd8c000be131f65c309de84f945bcf998127dede3a9f5881c5ce95545239c9a4ba2e7f4f98dd82ec376df4ac86168ebbe9a35840b21 SHA512 bb8e51b5934a6cce6df69c19e9419efd568b87c2580e4db8241c34e35944550e89b04ba3febc07c11e3dcba679dd23e1823071304eb00dd73dac1f5e9aec3245
-MISC metadata.xml 647 BLAKE2B 210e02de356ea49f45e8919b506d8ce7bf3ecbac06209b383debd0541ce2e58277f4da8da096095a449c42b30fa031b5a03ecb6a7e5585b3d2f999c8743e7e8f SHA512 3e9713c2fd86e78c91065a463648c68ad96f367e13d02b58c9cb7f9ec9ce190290182216ea807f55fce44cefbb4eded3cd511c799d34744eb9b5895aa121fc8e
+EBUILD libmicrohttpd-0.9.68-r1.ebuild 1200 BLAKE2B 3973e2a7077ad323d8177237d0a4e067303d6a9234bea971b0f541b67d680234d5edee136c34ee6b1078ee186a969f273d7f01b2067adffab2f9301f816576de SHA512 59fc30ceb6fa7dff759f115f8ce626085204e34e4d887d79a851fa5f9827b2570c047b76ae9ff5f2be3bea61e6e294347805c1161db827b606be93dc91588e6c
+EBUILD libmicrohttpd-0.9.72.ebuild 1236 BLAKE2B 21e77d98dc6839be7c55dfdefec799cdfb49f5631f05c61da8436ef27640201916c0987d9beba802dbabf823ec80f7724e38a379a085d45be3101459ed074c7b SHA512 1df698bac5e462b9475d0fbf7b0b2810852b23d5cfb0e3cd003eabc4fbd4de10b28679a9c776c4ce7a4d732f06062f81ea4a61a7bb243149809c70d75aa53007
+MISC metadata.xml 594 BLAKE2B 2cd0819db9dbf19c9c7c04aaa3e373d77aa448edf18629ed2ffce1d5dcda573cfb788e3f86354c07b99660f27a91845ef3c7c8e8a8c76cd604015165f373098f SHA512 098269a2b2464ec0a55430c1a60808e3441b307a0aca9df0a062a17e49e9da38e27f8b77be897cdd9048107649a96108fab2e7c5c0d6502fda072f690b031f3d
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild
deleted file mode 100644
index a63868673689..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="+epoll messages ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	( net-misc/curl[ssl?] )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
index 00526a94512d..05e8225d1ee3 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
deleted file mode 100644
index 74e07fa7baab..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+epoll ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls:=
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-messages \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild
deleted file mode 100644
index a73721de9062..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="+epoll ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	( net-misc/curl[ssl?] )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-messages \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
deleted file mode 100644
index 18d6a3dce369..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+epoll ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls:=
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-messages \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
index 09b440b4bf51..40ebbfa6764d 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="+epoll ssl static-libs test thread-names"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libmicrohttpd/metadata.xml b/net-libs/libmicrohttpd/metadata.xml
index 0abf39ec25ed..a3803466a893 100644
--- a/net-libs/libmicrohttpd/metadata.xml
+++ b/net-libs/libmicrohttpd/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Evgeny Grin</name>
 	</maintainer>
 	<use>
-		<flag name="messages">enable error messages</flag>
 		<flag name="epoll">Use epoll() system call</flag>
 		<flag name="thread-names">Assign thread names to internal threads</flag>
 	</use>
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index 2704426a2878..b136f5741c26 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1,3 +1,3 @@
 DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
-EBUILD libmnl-1.0.4.ebuild 782 BLAKE2B 68b0ea681670a21e5d342f7f65b519d1f0932493d854774c6f5d9da8bb3deef5d3e7d2dc461af641662667c4b267aee35e60e557c7eaf8eff9b85e9224309588 SHA512 4d544f20e5d37d4fb8ac55c91d01c32403c29aba5bfb03b6f32e72c8864217be2006bdf97e3e467630b5660eea6652996331adfbcd0a9e8dbf33f46f6d5e20cd
+EBUILD libmnl-1.0.4.ebuild 767 BLAKE2B 93d5e003dabe1820d9d45d43c38f8311169813fcc4e453a4b01ba8ad619c165602818df542a23d568534c0794f41e1b7a143f00584e353f85eddd181d49141ab SHA512 12076722d6fbb531a7661ed4be7a024ed762bd213660c1e5f21c1335482de0ad0c6676a7817b06a1f898ff50f4119ac4ba01bcbb4efada362a9c9238700228f5
 MISC metadata.xml 746 BLAKE2B ee4224d1afd9af317a58360a189e8d3d97b2199c01b35883fb1644fc42518a7c79f0900d10aad99287a47e77767564f83e18ea3fa45e0678bf25f9b1e8588ad9 SHA512 f7e4824b61e60bdfa64e4d9db37051ac3240c6ce66518a2f74d643b49b2cd206daedd088eb9eba974b6a51f5195c8281742398428b1103a3b83beba869347bb1
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index cf35872a9050..2f7f8486b0a5 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs usr-ldscript
+inherit usr-ldscript
 
 DESCRIPTION="Minimalistic netlink library"
 HOMEPAGE="https://netfilter.org/projects/libmnl/"
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/0.2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 4c05da1c175c..55f487bc222c 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,3 +1,5 @@
 DIST libnetconf2-1.1.36.tar.gz 294950 BLAKE2B 20eca2ba26353dff8636c48c06fe2dfc79603234c2def66a12dc7946050a81fb8d2a7c082aa6b6b3b1632eecba84e129739e659fd76a8c30bc500526e3ef48da SHA512 6a992a8d6e933661ba8f4de56f951e2fcdc1c8807d220528866afbdf0a5b6bafb6a99d78eb5cd8a7970519687a6121cb49517946a2beae5e496b80c2d95a34b2
+DIST libnetconf2-1.1.43.tar.gz 295502 BLAKE2B 49bd58d785a0b7b132c4503b0b8a823ff3578e6e1d30e0c0e4aecf6ebb6f769f465069ebbfce7fd090e64e0b798ab8977535c634f45e677cec00d7c73edaee20 SHA512 2aff10ef003d5ee1f72a3c01a0fd07f7a1ac3b1961c88a9616632255d7392d386e0acad97fc68b3f5f1a0b4804dcb0900afa625208ab0dd33cf03706f7a89f5d
 EBUILD libnetconf2-1.1.36.ebuild 843 BLAKE2B 9df9be4d65e1c09f8f190b2460815a33d9337f66807cd6a817dfb236f0ffd7752e962b840870539a8d1ac6bcdcfb3cd3e2de7f167873a225236188e59f04a871 SHA512 f53a4cedc5abf3451623fb8dbd8dd6ab5216b1e8a78d1d564361c28c38f14210b166e1552c3d43c7840bcb4f8cfa7d7f96335dd25319f6ab0c6b28c6df1715d1
+EBUILD libnetconf2-1.1.43.ebuild 853 BLAKE2B b57b0fcf601341f4b0f0e3705cffa2f94804f44616b570f41478df538414d230de2f9551eba8fe642d2e4182d7b9677c5990605fab1a6b91f0ee1307f736e03d SHA512 671b5c08558904431e084f2f953de248034905f34011f42a1d651dbbdaf16e9889654e230969fdf7227b694b68acd59e747df4b0cec95e855ad76324fdb751c0
 MISC metadata.xml 451 BLAKE2B 978f667c90ce54ea7919efb05ffdd032f7eb8d4f8360987da83e6f6610d5428afbb0ff8b447e0d82a1399cad2fb2f75bb62a73e98b3342ff7e1c3adf2e6c425f SHA512 9b66e4d2309627dee98cedc5debe1fd0e6079593b1733a5d8eac7af420a23082e86426f742ea10cf0928f730f15127e9808a27bb347488086982b665ea305504
diff --git a/net-libs/libnetconf2/libnetconf2-1.1.43.ebuild b/net-libs/libnetconf2/libnetconf2-1.1.43.ebuild
new file mode 100644
index 000000000000..95d4cfb62dab
--- /dev/null
+++ b/net-libs/libnetconf2/libnetconf2-1.1.43.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C library for building NETCONF servers and clients"
+HOMEPAGE="https://github.com/CESNET/libnetconf2"
+SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	>=net-libs/libyang-1.0.225:=
+	net-libs/libssh:0=[server]"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-libs/libnetfilter_acct/Manifest b/net-libs/libnetfilter_acct/Manifest
index 5eef7894804c..03eb83081253 100644
--- a/net-libs/libnetfilter_acct/Manifest
+++ b/net-libs/libnetfilter_acct/Manifest
@@ -1,5 +1,3 @@
-DIST libnetfilter_acct-1.0.2.tar.bz2 292718 BLAKE2B 502261b12c76d24cd67ff79ae72f7aee2ae48f9953df201bc34e7a28ded69501ccf3493ce441b733e4ec5b40b33ccbadf4c0e2cc46971bdb4bf3b9b117683347 SHA512 6bd299d509736ce3335e051137851d7f1a3751eafa380b55e9c73a25afb5d45c904ce9acefd4f934f1d21f2ff85b06faed4b072dc74d74e3a8b93342d59f5cdf
 DIST libnetfilter_acct-1.0.3.tar.bz2 296999 BLAKE2B c696a5830c2445fd8369182c413a8144f4b0d669dd8ef57e59d54bd8ad406e15bec72ede8d2ee0d7bbb61fbc2218380168e03ed62daaef9e026cbe83e79982c2 SHA512 5ca332840663941182343fdc0d5e45116bba71a97a913db0b385ea37ef31a04f8267a2279b7a2862ce338c6eeb093bb3ef9908f57770e64acf5d2b2266d3bfe5
-EBUILD libnetfilter_acct-1.0.2.ebuild 1106 BLAKE2B a828d15fbc4e5cd6efc7bcacf34a239c79aa521ef87b1d82acc51603d847a50011546ef7d5487ec9752bae410009b624ca36f0ccdcc1faf1573e75a75a23c67e SHA512 4da76e74cd60b0821ff890872864dd817deb71e5ffb3267b3480daffbfc1cae30ef5fbe156f9e3cb8c91e05f3e0e505aaf04955e55638fe6d521104b716c40a2
-EBUILD libnetfilter_acct-1.0.3.ebuild 1113 BLAKE2B a0487be971aaec317aa96a563968f30f9aed11a932bfebd24a0e9618eda1090d4dee46d94dc685062bbaa24571aca82366810a928cc065f981915833b8aea921 SHA512 f446a70fcf86b65701dfbc31bd6ab653ed3702dc9aab7193a064a9c9db26738e0dd8a28b38df50bee875363bf3e24f36376cecf23ef0262195e2ccf63a84311a
+EBUILD libnetfilter_acct-1.0.3.ebuild 1117 BLAKE2B 2415cbbd974df0ecb08bfb2f9f7297a8befafebe1a4abd161d13dd353bebfa471dcf5948a39188c8eaf329da2e9174b8a1c52d7ce46a81af0f850013eb9335df SHA512 7f6067c654065015491dc174c5e69299528c18a6de23aefdbdc5a5484fa359c39d6a093b736399ed8325632880ab6342f43ce11e77814ab0dcf9caf7c8a5adf7
 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
deleted file mode 100644
index 1cea6cd972aa..000000000000
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info ltprune multilib
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="examples"
-
-RDEPEND="net-libs/libmnl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README )
-CONFIG_CHECK="~NETFILTER_NETLINK_ACCT"
-
-pkg_setup() {
-	kernel_is lt 3 3 && ewarn "This package will work with kernel version 3.3 or higher"
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}"/$(get_libdir)
-}
-
-src_install() {
-	default
-	dodir /usr/$(get_libdir)/pkgconfig/
-	mv "${ED}"/{,usr/}$(get_libdir)/pkgconfig/${PN}.pc || die
-
-	if use examples; then
-		find examples/ -name "Makefile*" -exec rm -f '{}' + || die 'find failed'
-		dodoc -r examples/
-		docompress -x /usr/share/doc/${P}/examples
-	fi
-
-	prune_libtool_files
-}
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 9f94207d6a7e..f29d830b8c16 100644
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils linux-info ltprune multilib
+EAPI=7
 
-DESCRIPTION="library providing interface to extended accounting infrastructure"
+inherit linux-info
+
+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"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="examples"
 
 RDEPEND="
 	net-libs/libmnl
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( README )
+
 CONFIG_CHECK="~NETFILTER_NETLINK_ACCT"
 
 pkg_setup() {
@@ -46,5 +46,5 @@ src_install() {
 		docompress -x /usr/share/doc/${P}/examples
 	fi
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index c7879fa737c4..42f3cbb4b085 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -1,7 +1,7 @@
 DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579948b0d28e9ab88d39ebe08e97fe8be0eb3f10f64b36d0f85e9e35408019ab22404b3452e4c6d7b2812ea316031f3e0c4367c23019 SHA512 05b3b63928d46ed114048848c48094a762c6a7acc93fcdbe9473e82cc67851ef1a0d33b68b8fd388271b76b519c4d2ac93fd802043fa9a9da46cda5b262a1fc7
 DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b
 DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 966 BLAKE2B d569562f6203d2ec131f7082063305e07a0c92807e81ae3641f1a8f61a9bdd0051803cd1b30eaa5a9bfd5f31ff06bc5b68831913c2526469c2393fbc4971f929 SHA512 77a66921f7aba5b1badc9739ff8de3356654be97f2ad1cd9af8313945d55e3de4df4b08830cad5d8110591713414eea340ee2b53567da11933dbccf26bb4605d
-EBUILD libnetfilter_conntrack-1.0.7.ebuild 974 BLAKE2B 9611f3e60d003c259632df0b0ca2ed3f650d4e6b4dce86496463d14ca0ca27e72e6dd91e0e3e9517c2b12af9ee9ec16154868692feab38f28269295f749d2b12 SHA512 bebf993b3b9198f3bb30572e00fb65237ea7a45c0ab2f8e77f8ac1f4c003c61f502346017a377be90ea8eca8a3202ab05fc5311375ba6c8576e0ed71b8fd796f
-EBUILD libnetfilter_conntrack-1.0.8.ebuild 977 BLAKE2B b3dbc99be8449e4927cf7d3dfbfb48f024cf32f441f6c87d7d68bae84e4d16c36280a84bfb1f69f1317b7220c184567dec75113bd9517918e4bcbbdc86570254 SHA512 2267468d53df3d320cb1d29d3c39247cb22686ebd3d9d67c57974eb458a364d0cdf6ed03ae9006011bc1f3dc7ddd30c5f7daa9e56ba02e0f7935c1691e06736b
+EBUILD libnetfilter_conntrack-1.0.6.ebuild 959 BLAKE2B 42fa1e8732e6550f5dfa61d220fd8224b894b0c3f7b3073e00eac3101a756b9a0fc8e491df988da4629ebe7aae32e9cdc66ceb7b97df2a6da01d4076a3ab9082 SHA512 a791b161fa2a4a7d900f926e929a7789057b2ebaddaa9882ae652559d3a9f59b9bac6e690cb15289f873a63a93b507d09d9acb3879695591335331314173fd35
+EBUILD libnetfilter_conntrack-1.0.7.ebuild 967 BLAKE2B 131804387b9edc374245bb662e0489065b5da66094ac8d9672d4899f3db64308e78f54dd6d0dedee71e0c256b8540952d09fbbbefc3fd451a7f94c8d57a3c591 SHA512 1f9c9bac46710dec83260cff557efaee5a0ec4e2656b459e97270e18d466ccfef69e6035e2b0db5fdb0f695482152ceb45bb61d9ad6a37614b40328dd6eacfb8
+EBUILD libnetfilter_conntrack-1.0.8.ebuild 967 BLAKE2B 73c1e8535d4f0680053fba85aac571a77053f5a3868b6d4762a929bc5251f4ba06fd68bb24bfdfcd336027ed91c0d9b53e04671ce7a92caa9b59e3d32fd93399 SHA512 195ddc976102f88928ca070722a775540b0f7318fa8a23604511957ce8a269478d6752d8387f14d94a01bac43be724fdfb453776f344d4b104059a8f93fd805b
 MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
index 88e9f74dcc26..62ad204c78dc 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools linux-info
 
-DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
+inherit linux-info
+
+DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
 SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
@@ -31,7 +32,7 @@ pkg_setup() {
 		die "${PN} requires at least 2.6.18 kernel version"
 	fi
 
-	#netfilter core team has changed some option names with kernel 2.6.20
+	# netfilter core team has changed some option names with kernel 2.6.20
 	if kernel_is lt 2 6 20 ; then
 		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
 	else
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
index 91126c80f7a1..319887c21a9d 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools linux-info
 
-DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
+inherit linux-info
+
+DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
 SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-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="static-libs"
 
 RDEPEND="
@@ -31,7 +32,7 @@ pkg_setup() {
 		die "${PN} requires at least 2.6.18 kernel version"
 	fi
 
-	#netfilter core team has changed some option names with kernel 2.6.20
+	# netfilter core team has changed some option names with kernel 2.6.20
 	if kernel_is lt 2 6 20 ; then
 		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
 	else
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
index b4386fd62ab4..885bab96515a 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools linux-info
 
-DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
+inherit linux-info
+
+DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
 SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-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="static-libs"
 
 RDEPEND="
@@ -31,7 +32,7 @@ pkg_setup() {
 		die "${PN} requires at least 2.6.18 kernel version"
 	fi
 
-	#netfilter core team has changed some option names with kernel 2.6.20
+	# netfilter core team has changed some option names with kernel 2.6.20
 	if kernel_is lt 2 6 20 ; then
 		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
 	else
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index 4139607e4855..b7ea0e6bdb0c 100644
--- a/net-libs/libnetfilter_cthelper/Manifest
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -1,4 +1,4 @@
 AUX libnetfilter_cthelper-1.0.0-clang-export.patch 12273 BLAKE2B 644fed60ba6e7b3476a4264fef8ad3fc553c3c6fa889a24d0fa85b50e1b1d407ed58f3fe9187f4933ea9d471b1ef0b6baa8f2922957a1733fc1a7eed6794219c SHA512 e7eb99bbf29b95b18c7ff25d8c6fd080f8b77a451cd5d7fe737705c3f5c93f2a078f703fcc91f0d04f3ac0e18bcacc34483bc764bbf6a441d72d41fe539a594a
 DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45
-EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 721 BLAKE2B caa40b0eb37deea64593fb27d9accdac6ae55487acbae95b70a4f11d8b57a4075a02fb544f3bc4506ffb08b02ee73c585f23b3c9efd717900d1172d04137eda3 SHA512 d0e97116e83bc2b29f34bd8a8c37bf0d81894319af52c44dbbfbf15433c7af357e9df331d30f0fb7254b115e4bc3da2dc885df22d68be9924335b36f9dabe228
+EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 711 BLAKE2B 635855439c1cd9754f2e5aa8ad6199ef0981684159c2903be245efcdfe44f231f13769c4b7c8a14d66d790755cc675979d79dc17ddabc8b0dc1fba80b663d7b4 SHA512 c1674aee271237e98edb8242f4b547e71b7fcb4d5eb0ad7a3aa37104a6a2e03b58bc55e14e3e4e1e46516f0489772de52ebfa39eb891e096b07b43a86a75ee22
 MISC metadata.xml 380 BLAKE2B b3be5da421fcf323bc491a3d1d7d131c0c1ee03bd14929a3e577c6121dc135b89610967f2acb99f10be2eaf947cd45438328fa5391f38a7fbc49ac1e170876e6 SHA512 fa7fe723f37affb303cf3c826c5edbc75ae79b5b4da381f496e9b8fe5fc0071bf45fa8325f9e15e2e7c7f794060d8e924b1fc872acfe0d38426da5c80dec2a2b
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
index c5facfb44a4a..960e302de273 100644
--- a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info
+inherit linux-info
 
 DESCRIPTION="Userspace library for interface to user-space helper for conntrack"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cthelper/"
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
index ad2af25cfc16..8e65f5cb8e75 100644
--- a/net-libs/libnetfilter_cttimeout/Manifest
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -1,4 +1,4 @@
 AUX libnetfilter_cttimeout-1.0.0-clang-export.patch 8628 BLAKE2B 8e0b283c0ee2b5a41116bf3c87f30ed0c13c9711160b64c6f8b2403e9590bb058e42afa5be38d60a2c6156462d31f55dff07d008f14e54661dbd0e60da80886c SHA512 d288dc0ad2fe6e15fa425a5e125e2d953e34bd6fbb7f57f7b7fadec030e7caefa39a4fbe9e7be90ce5aa7f5b4a44ad0e9df1c98ff6100f134ac3839653a542b1
 DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85
-EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 737 BLAKE2B 21ae9c689c59ecce4d576a2de1f2f4e2f8e815ea088796112f19c6e034ba294a5916c8bac6deeec7e2cc4ac02f665a13abd8043e26ca379fcd657f20a0cffed4 SHA512 f13841a5678e63785457a343144a13bc10cfcc98be50bdcf7b978dc9d8aa1cdcd515543008ea6cd37cae03fcc5e873296ac7feec76fca527b48dfa8e8a44606c
+EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 727 BLAKE2B 9ce45489db53beba78627c1cc133ac01317c151f19e1d5774b79d7de27cd8562fdb3ca0dfadcf12fd448578514616ef1b800cbcc417c76fd671cf00432723604 SHA512 459a9731246e797b6e3a75122b12a8a963154d4c2e5e64acfdf0c6041c8602aa200ef6c329cc41b8e383b04b245c71feb60eb812ebe4eb8d35073e2fd5b31ded
 MISC metadata.xml 374 BLAKE2B 93797c22573c07b7d3897cd10159b7cef6162c4483a13b93ddbe034cf883953c990ef6f649a177c252706306dcb716057ecd35167a35da1c3a955c586e33955f SHA512 7d6b4b79303957a1668019f24f08a0d116ddd21abdc387ca82ced9bed93b05fe5bd896fc4216d02961fc588204353204d1ea2c6d144efbdfe1cce44d7b26f143
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
index c668e13398bb..5079b1ffc74b 100644
--- a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info
+inherit linux-info
 
 DESCRIPTION="netlink interface for conntrack timeout infrastructure in kernel's packet filter"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cttimeout/"
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index e937306db3f7..f5d9b30d7652 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,4 +1,4 @@
 DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41
 DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104
-EBUILD libnfnetlink-1.0.1.ebuild 1435 BLAKE2B 259e0e263a7b4d20cd3a1e7b0f3509b8ce8d23a321d682516073d67b7b796a7630f85a9716599d3a74594498336b00fcc3e9728bc9fe58a0469808ad60fb0d8b SHA512 8ec685455a36fcea0e2600ed6d4afd8d05a37a15ad81ca3684655755cf3e677c465f90bdeb5b582fc99182c64e49bc3c98c4d85c984a60a27bff6a498fa4c4eb
+EBUILD libnfnetlink-1.0.1.ebuild 1436 BLAKE2B d453c302042290662961665b908278ec9c6c56d6cf17281d96b80148695ffa5dfa9577068281c106f226a42769020fddd2bbed6b2505db0f39f2efdef6c244c4 SHA512 0f4a66f774d584ad453a2e8cdb92b8e919a1d91e4a47311cd5350c8604b91511bde244d78bdce975406c23b040bc9ee107710c3b80c891ca578949d6b2bb0f75
 MISC metadata.xml 364 BLAKE2B 688c9d5bb9c4fe16699fd7535d4201c069573e833f805a8321a30aed5d51cc988439d463d9b780387c641bdf477798673fdf3a92153b9f61760f5de79cad3843 SHA512 cde7260e5a76b9e921692fd265f3e5da028492bb920db58ef3b12dab29cfa402cab322b4f5f48f1949e37941a6d6065039f371861e5fa7fd1de56feff62c97bb
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
index bc3f07fa53d5..53e90911786d 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 
 PATCHES=( "${DISTDIR}/${PATCH_FN}" )
 
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 878796317dff..b32234209021 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,5 +1,5 @@
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.27.ebuild 1310 BLAKE2B 3170cdf362491732993df563b5b4a02df6cc18a0e655ef475edd16f01ec8f56b1df2a27bb25b4f420b1d28f65e8a14b0b69bf0e6d2e5a20575cd522180c9a96d SHA512 2500df4ebe811bf79c16334fdaa72465b644debfa2b70432408c100f5ed5039c408e474ea1e133ea07f01a040fa28f2bcffd100220e8b8571ce49dd315f0bd1a
+EBUILD libnfsidmap-0.27.ebuild 1302 BLAKE2B fc4f5897de7896f328bfd2e14c422f84cedb50713d4ab92245758f8cba71f781f72298644774495bf1b9cfb25b8c28bdf30a7d16d86a8b25b2b42fb3c4fb3191 SHA512 2dfe7a494ccebfba195810b6ca9519209bac16d1ad3c55aab9e92836b6ec0a5a8ed3b1b3ed9ee4c4c7cd15fae4c6acaf78e01f1ce2f1a4a80e191c39ca91184c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
index b4fd1d02e3fc..e93e96fb27fb 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools multilib
+inherit autotools
 
 DESCRIPTION="NFSv4 ID <-> name mapping library"
 HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
@@ -12,7 +12,7 @@ SRC_URI="https://fedorapeople.org/~steved/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 91fa581b2614..5d80690e8d44 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,8 +1,8 @@
 DIST libnftnl-1.1.7.tar.bz2 387829 BLAKE2B e21ca38edbc7c651a061fcd6db80278ba99b4fe0c92c1912039fd0a1cd4b7636c87e17f538eaad8c6b963748c7c77800eaa83ddb80d344865504329984ac9c96 SHA512 80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407
 DIST libnftnl-1.1.8.tar.bz2 389632 BLAKE2B 5668bc3839abb99b44d2eecfa4fe391d1669b31d5f653f859ef2ae80ed355252bff20bc74773ec68024e0bf9e93c8993765b84e8d562fc2b2b1f7e3f5d3fed91 SHA512 173d8a7b95eb964a9fbe7ffcb46541a6bae976b4d4f2a28fbf9b03bf3e50a29b1ea12faa49926d2d33bc088580a833fc6e15ff59a30bcfe67c91c524f00c778e
 DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25
-EBUILD libnftnl-1.1.7.ebuild 1193 BLAKE2B 00516c30541f17a36a56687be25edc8a559d91f5d553073a5062fb2b19d8f91925dbb4c769f4000ac7b47bf735620123a7ecf49e5190469cee3a57c442e4a422 SHA512 d16a9cab86c9f84a7ed9463b2eae753e1f44de4e1f0bbafaa2b0a003d48a9b4cceef75e15958844232406c230a8e23a394a82efd11b233442b71a0f970f368bd
-EBUILD libnftnl-1.1.8.ebuild 1200 BLAKE2B 6d0bb8f977e3a2910288ab3a5a3e7576b18f523c2c94172fdab12dfc5e4ce7604374da769ed66077dddef9cbe616695163ddb24f5e0f403d0e7a070a019b7377 SHA512 416d4570ac5dcb1d147e9ad0d7fd2c75dfe38ad7a2841cd99199723cdbf896abc68c4e5f551f8dd1f6745a999ff68724c15570b96d1bdea2cab41463c7be2ec9
-EBUILD libnftnl-1.1.9.ebuild 1200 BLAKE2B 424e6d8fa3e9d60dc519e71b5304f3ce1230d7afae8c03a9d867ce399996e44f3803c0119605ea070c24b64b5977823e46ec2ad94c6c7f7ddf443135347333b2 SHA512 f9ab83d57c21eedefb3c6999fb6a4cf0e52b547522563b89bb2ed1b1a5db5691eeceb2b17729122b3e619fb31070fee70b0dbbcb8386bbc0f5323c053af05be3
-EBUILD libnftnl-9999.ebuild 1379 BLAKE2B fb6bcbbefa618ef5175256ca380a636085c561f188d366597c7d9b3d4ae89102d2b56703732deb7cb5398dba880e0f48eea23b38f8d972e4249e5c93d74ffba2 SHA512 63d0e7972a2a3e3bb92fec82afbf2b72de4b68d622b5ae71f2dd948f2897f077ba76e9b96e45698120127b6da935c6a505a1b7fb32440a3f4fb3b41c19061ee5
+EBUILD libnftnl-1.1.7.ebuild 1167 BLAKE2B 94d818ed22c7eb28202fc481beadec1c83e3e6690a4e1980faa47ee1427fe345df0e19cfb1afb86e38d579b15279554cca0a94867bc1d11fe9a7a577bf03ce2f SHA512 0775729fa5cc11fd3126e86ef18e2c965a3d987c0fcc8e6c766f92ffdf3f9577ffca6aed1ab02395f85089267f7e335dc4cd34be3507231800ce7469a62a96f5
+EBUILD libnftnl-1.1.8.ebuild 1174 BLAKE2B 4d768841a0625afef9522b2addb2dcb7a6c60935456392d14bc52f111b9a226478ebe00e81da64d13c53bbe11f31e21d2fb89a19fc78136fe1f7cd13eaa44e9f SHA512 7446d029fdeed5157d19db65a7a81cba8bf25037cb73588825983cdf76a178291975215be798eb20554cd6078b29be1dd5f958f6760f5d13203b28c78998f6a2
+EBUILD libnftnl-1.1.9.ebuild 1174 BLAKE2B 4d768841a0625afef9522b2addb2dcb7a6c60935456392d14bc52f111b9a226478ebe00e81da64d13c53bbe11f31e21d2fb89a19fc78136fe1f7cd13eaa44e9f SHA512 7446d029fdeed5157d19db65a7a81cba8bf25037cb73588825983cdf76a178291975215be798eb20554cd6078b29be1dd5f958f6760f5d13203b28c78998f6a2
+EBUILD libnftnl-9999.ebuild 1363 BLAKE2B 4ae61af654e23b0ba0bf2289291ddbf104f497cdf0d62397961ad5269f2864b99da1f6e803fbb158732e4ad16f284f4cc5fa2dc2081252a67690d43524b221a2 SHA512 0fb3a1814221ebc9a3296b6e08db738080285334308e3f8c6cc7e1a805e7cd7115f119c536f24d2bcccc50d07940e79da5894b7f5d6030cfef1d1c0f765ec460
 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 0626a8e5c8ff..2592a59415cf 100644
--- a/net-libs/libnftnl/libnftnl-1.1.7.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools linux-info toolchain-funcs usr-ldscript
+inherit linux-info usr-ldscript
 
 DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
 HOMEPAGE="https://netfilter.org/projects/nftables/"
diff --git a/net-libs/libnftnl/libnftnl-1.1.8.ebuild b/net-libs/libnftnl/libnftnl-1.1.8.ebuild
index 992fe51d51ef..e08a48df5f0b 100644
--- a/net-libs/libnftnl/libnftnl-1.1.8.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools linux-info toolchain-funcs usr-ldscript
+inherit linux-info usr-ldscript
 
 DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
 HOMEPAGE="https://netfilter.org/projects/nftables/"
diff --git a/net-libs/libnftnl/libnftnl-1.1.9.ebuild b/net-libs/libnftnl/libnftnl-1.1.9.ebuild
index bad28dad954a..e08a48df5f0b 100644
--- a/net-libs/libnftnl/libnftnl-1.1.9.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info toolchain-funcs usr-ldscript
+inherit linux-info usr-ldscript
 
 DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
 HOMEPAGE="https://netfilter.org/projects/nftables/"
diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild
index ee2ad5f135b6..434a775727d0 100644
--- a/net-libs/libnftnl/libnftnl-9999.ebuild
+++ b/net-libs/libnftnl/libnftnl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools linux-info toolchain-funcs usr-ldscript
+inherit autotools linux-info usr-ldscript
 
 DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
 HOMEPAGE="https://netfilter.org/projects/nftables/"
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index c4b0aef3ab55..9519aaeb9287 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1,7 +1,4 @@
-AUX libnice-0.1.13-gstreamer.patch 1195 BLAKE2B 26ef177454864e7757768cdfb51f8a4dcc450c9dc14c12b53f89950c90f48e4a6fe5774ef5fa456445e144037f332ae8d0fbeba6e92dac85f002c51638afe97d SHA512 fdbeded042b13c33c703a6b5032b7110eb1ce84ec3614e62f6482688a00eece723b4668a1925fcfab645bf61e7fcaf0d4d444525953dae397d8edb9a842c498b
 AUX libnice-0.1.15-libressl.patch 1961 BLAKE2B 7e06399def0beb5c744d97fc6ed3a73eb9f5e5ec005339aac12ef5de7d0a2fd32efa146c9fbc5c542fc870e406d250c6c80a21e8c262092012a1db7049e0fd19 SHA512 745db3ad3c7a3fa855587ba4848549578e327a7741c2e3c6731c2a15852d9385f17c92ae98a3ddd0485f371eea070c527a63a20ba86424bf37ca2f690cc0f409
-DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
-EBUILD libnice-0.1.13.ebuild 1536 BLAKE2B 77e8d401efe63bcf333ddfad14bcacfa52137711cfd8bb1afac2ca6e300b8ab6fcbdf5314f71919f5f2856978a3e0a156772fed24af89f94807e7e98351e266e SHA512 d65139922d64ea895eeab67c48d8b1aa99f48836090fa395ae45406f8d69d80d3908ef6d22e01c273131e2b896d837d6236ee670272aea870019ef07aec1ac0b
 EBUILD libnice-0.1.15.ebuild 1720 BLAKE2B 2c7679c69ec3d63aeccbe7ee63b1435f9e2b584405c4f79d6227483c248c4e827ebd9c093f166d652aa2500c45c0a67f39eabc2101f94b82c4e489649640205b SHA512 5f3232f225f1ab0cc1385d2ca9b63309035126557c4e9203a10caa246aa048d0608ca6b49d30928a77945ec87f48f376bfde5af8d7f96dc54eefda88d42606f2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/files/libnice-0.1.13-gstreamer.patch b/net-libs/libnice/files/libnice-0.1.13-gstreamer.patch
deleted file mode 100644
index 136d85456c40..000000000000
--- a/net-libs/libnice/files/libnice-0.1.13-gstreamer.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 76ff4aee9fe963842dd17748d14c68552c5dcda3 Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Mon, 1 Jun 2015 16:10:16 +0200
-Subject: [PATCH] configure: Fix configure failure when building without
- gstreamer support
-
-Error introduced in 20ea22e0a11a9bdfe4d8125b68083249b694338a, resulting in a
-configure/build error when building without gstreamer:
-
-configure: error: conditional "HAVE_GST_CHECK" was never defined.
-Usually this means the macro was only invoked conditionally.
----
- configure.ac | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6031cec..64a571f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -231,9 +231,6 @@ AS_IF([test "$with_gstreamer" != no], [
- 		[
- 		have_gst_check=no
- 		])
--
--	AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
--
- ])
- 
- AS_IF([test "$with_gstreamer010" != no], [
-@@ -260,6 +257,7 @@ AC_SUBST(gstplugindir)
- AC_SUBST(gstplugin010dir)
- 
- AM_CONDITIONAL(WITH_GSTREAMER, test "$with_gstreamer" = yes)
-+AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
- AM_CONDITIONAL(WITH_GSTREAMER010, test "$with_gstreamer010" = yes)
- 
- GUPNP_IGD_REQUIRED=0.2.4
--- 
-2.4.1
-
diff --git a/net-libs/libnice/libnice-0.1.13.ebuild b/net-libs/libnice/libnice-0.1.13.ebuild
deleted file mode 100644
index 90e98c97427d..000000000000
--- a/net-libs/libnice/libnice-0.1.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune multilib-minimal xdg-utils
-
-DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
-HOMEPAGE="https://nice.freedesktop.org/wiki/"
-SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+introspection +upnp"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-	upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-# Many tests fail from time to time, for example:
-# https://bugs.freedesktop.org/show_bug.cgi?id=81691
-RESTRICT="test"
-
-src_prepare() {
-	xdg_environment_reset
-
-	# https://bugs.freedesktop.org/show_bug.cgi?id=90801
-	epatch "${FILESDIR}"/${P}-gstreamer.patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# gstreamer plugin split off into media-plugins/gst-plugins-libnice
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-static-plugins \
-		--without-gstreamer \
-		--without-gstreamer-0.10 \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable upnp gupnp)
-
-	if multilib_is_native_abi; then
-		ln -s {"${S}"/,}docs/reference/libnice/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index 977d45f73392..542c12b01680 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,5 +1,5 @@
 AUX libnsl-1.3.0-rpath.patch 479 BLAKE2B e500165f8ad8af21f64eb570286d8eefe51547e56e07ab70dbdc7a6824cefd010edf99c6c0b8fdf9f00ffe5e0feffab01cecc6a96dc7444536371adac7157eaa SHA512 37457cae1ed15dbfc9d72bdd6701e20abb027da1e01e48a5202ac209654a014a0f7352701790a643aa7ff12b7be0abff998596a5e09afb6f1f76eb5458f600e2
 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.3.0-r1.ebuild 917 BLAKE2B 1b528f58e7c9af79bf49920f1e30c691503e39c02620d08393ad9346e96f0f3563d8dd785e08c91f99fc8997857c6c05d5a9fe7f8df43bf05fc293c812058d39 SHA512 aebb22b6488cca26c6f1815a043eb0a602a0356e8bdf8dd6d6d0d6f788d633c017a316c625034a3a889f485488cb21c1bd856d3cb3d5f9dc2ed3d322a4ab4ca2
+EBUILD libnsl-0-r1.ebuild 565 BLAKE2B f1227ef218ff7edb1c5f299fd31d12d4b91467991a5c3036227284accf455bc7524a58f352b13f591396a0535877e5b49d6cf301aaec4da3a8f5124b23b99a74 SHA512 ea2b7ced6307d96991b3a05ba7152b6817c10f21712e14d4e7b389bd0728d3482894e4f0de604ebb381edc091870fd05369d4046df786b64661ec75da8e7dc56
+EBUILD libnsl-1.3.0-r1.ebuild 918 BLAKE2B cf6a7013693ab93c28ae83f6dc196a69acf8c9caeac2fd50667e1e55a118900dc7f2ceda066c0a1c3e022f53f284588f2a27668035bd1349de63159e6e8ffd29 SHA512 081ace3e5f3b78b4a09e1245fe086dba122e3469c750bf0d513701a9ebe1959c6d1c4c04d0d2aea0b1596c36b9ef56ff915a891e073b90ad6675911e8a865b76
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-0-r1.ebuild b/net-libs/libnsl/libnsl-0-r1.ebuild
index ae0c841aa3e9..f523651c7a2a 100644
--- a/net-libs/libnsl/libnsl-0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/thkukuk/libnsl"
 
 SLOT="0/1"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
index 812614e3944b..e16f5f60ba89 100644
--- a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/libntlm/Manifest b/net-libs/libntlm/Manifest
index 735de98ddde6..8487a913995a 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,3 +1,3 @@
 DIST libntlm-1.6.tar.gz 688608 BLAKE2B 8e545619b1fb00d778bbebf6ab9748005928a2669dab8c3d9c6285127b551c1bf039e1748a710e5eb551e7cbcb1a8775b57c21b163ca2a0206a4b9948b11df8a SHA512 d68bc6b5cd7f5f70385ba78275a810fa46e60f761f0949f2262eef35ae052661739ef17ce3fc4ab75f7e8cfc788b1ccd7766d4ff0ee78db08ea4de3e224653f2
-EBUILD libntlm-1.6.ebuild 546 BLAKE2B b88ee1341a628e1ae974650f73e709b1e5a951767b1b9731812e6ac54d481ab878a717b0e6699543db8dedefcc4b9e492c6069b8e526f5228519fb0ed2a10f56 SHA512 ff721f9d16a7f55078a795ff2dae04e03dde21ae674f7dc391470f3b6cb971f08988aa4c8d71dff3f9e4c957941c8e76be979824c2617c0dcf03cd1bc7965656
+EBUILD libntlm-1.6.ebuild 547 BLAKE2B 9654965d1079713e706a6c93424a876f003afe70210d2cdbc6a93e4b46a4424b022804893516687629e203df44ec0e948d809d75d2ba1e44fd60d02cf5b72060 SHA512 8652fa3ee3b4d12032627d2bf9fb021e8b88b055e10e9aa5b62e3421985b8d35653574b02b741338f909b6c489e426887298b87a959c7b09b331bbb8e87690be
 MISC metadata.xml 561 BLAKE2B 400bca5cfe90103ba77808cdf4fbd777b3c19dfabff4336df9bde7e8529da948a4b48b06f1f5151e6f62aa45e5a4cad51b4af7dd2799c9aa8dea89f390936eab SHA512 60e06d45b1482e819824259dcc992d355961754d481700ab41f1e3050ec70893f9075c19bc846591f3aaba9a135de5610686cc82feff1b8119a1466865b08a94
diff --git a/net-libs/libntlm/libntlm-1.6.ebuild b/net-libs/libntlm/libntlm-1.6.ebuild
index 3e6348ee0afc..d7355b7a51d8 100644
--- a/net-libs/libntlm/libntlm-1.6.ebuild
+++ b/net-libs/libntlm/libntlm-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/net-libs/libomemo/Manifest b/net-libs/libomemo/Manifest
index 4a91b89f7261..1edacd6a79b7 100644
--- a/net-libs/libomemo/Manifest
+++ b/net-libs/libomemo/Manifest
@@ -1,4 +1,4 @@
 AUX libomemo-0.7.1-so-symlinks.patch 1055 BLAKE2B 9dac207e32fb339f52e25571eb3381f2486f5427857dd238f619a841b01db34c9b79708119724af7d2aad2fe5f285925e3be174350f934b166dd3a4794585052 SHA512 d7bf4c51fde4de7e478e44cbc63b8f90f2d6fc357d66ac5d8e8999f03e411257a392284944164d5dfa5388a191c1aba11b8d551c611403a026f1ed0dacdfbca6
 DIST libomemo-0.7.1.tar.gz 23770 BLAKE2B a3909650e399075f62026bd048a667a276a6cd7197ac18ddf9e3c12f57e5fd9cb2f5532ba69d0836af87e1415a5ffdc1746cf90a596dcf255265a64e921f039d SHA512 e5769dee4db7be246853e47e29ded9eefad2f62422951ce5dd0c1acee3bb92131c0423f09bc716be0f55fb02c747f07a6d5b2c656bdfeee0ee148252c51a1050
-EBUILD libomemo-0.7.1-r2.ebuild 1086 BLAKE2B e043afbd7347e7feaeb3c868a1f6543b8666df8923a7cedbf186b50ee6099ceebc2f8952ac8b98620fd6b80e5894496129f2b6b8158b1c1bc8ff483b7c2c83d5 SHA512 ee743c91e7d90005c04804b6daada3d37ba8cec19d498eefd3feda0d721277e26dd4123a8ed4a0a4fbde8b884cf50533bffdd07d4c357bb4831c690285008ad4
+EBUILD libomemo-0.7.1-r2.ebuild 1084 BLAKE2B d257336bba275514d635cede0eb7abab6fefc1e007cf4b401905be77edecd2b7da012f23d1ccf1604daeca715d83f04cbe3c884a754de6ab23929f5e551e7eae SHA512 13ac6984937e4f5281435d8992b99708fbc7115f61c22393058285d346467bd60d45bd569c38cc3c99d8163b0e1167589a1739779b8ff8e9bd57432cdd5ed260
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/net-libs/libomemo/libomemo-0.7.1-r2.ebuild b/net-libs/libomemo/libomemo-0.7.1-r2.ebuild
index 2350a7e5f4dd..38d49c0e3988 100644
--- a/net-libs/libomemo/libomemo-0.7.1-r2.ebuild
+++ b/net-libs/libomemo/libomemo-0.7.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/net-libs/libosmo-dsp/Manifest b/net-libs/libosmo-dsp/Manifest
index 68ed237ac037..099d2d1497a9 100644
--- a/net-libs/libosmo-dsp/Manifest
+++ b/net-libs/libosmo-dsp/Manifest
@@ -1,4 +1,4 @@
 DIST libosmo-dsp-0.4.0.tar.gz 43664 BLAKE2B 10f1718868971492cc93bc13b8a0648ee8c15bbbdc06119b9783851fdfb9959f52cbefabf23ec18b03d961b8a3f7ae81a936008ae71e5001606ba24b78de4ac0 SHA512 364a4ac3fca3e10216057d647ae1ea77550f3d4d3707978c457f363dae66ec252e8eb60dc53db5f45f85bcdda26d54b13d56b60eb8eb3133479d21482ccf96da
-EBUILD libosmo-dsp-0.4.0.ebuild 811 BLAKE2B 00e09e10c28384615d2821067acb831e087c9f1f2ad9eccc881da4f88d0f627b7f5757867107066bd16d5df3b023e64a0d539d2f723cd19c70c66fa43437f336 SHA512 1ad43f8e798f668cf55c8fffea069ba4d067a1ca160b8c19f8ae62c7d9f27db9900823951630ad56ff334824268a282b85ff8f120938eedf55e2e5dce2261978
-EBUILD libosmo-dsp-9999.ebuild 811 BLAKE2B 6c73d2336c7bdf51d7c886b80ad8788107357e74311aad858f90e4cef0ec09014217bcc07391902655499f85a076e0f643f23dbc96a3b8aebf6b94c4d07602f6 SHA512 7d0ba59d2b53cd6aa6131180557d35feabeefda0c7128ce2652f9c57e8a5fab16358e7b1c7c9f72b2c9441e8d3089c37b29c42a75047544b621a4d093ada3447
+EBUILD libosmo-dsp-0.4.0.ebuild 815 BLAKE2B 3ab2064e1409367526d124d7145ac9bd4980d777ad9e76362287ebea312b6037979481c817e1e66322f378a4a4dcd2ba6f5d62a8c13f232323ffe72d2c7be876 SHA512 08fa28095c3ac0f7a237d149c6fcf539a094298be53c71ec40e8c8018f62e0d105ac4eeda6cdd973cdc23ce1f429f0409292f1c565df43eabf95d4162dafdcfa
+EBUILD libosmo-dsp-9999.ebuild 815 BLAKE2B 72db0fc7b534ab356ef0f3ee25ebee7ac1a11441ed1c61b4da2e1d4c5f52f332465d87ca33ddd2b5fbe337a8ad567e0b522c0df6c036a56495c8e6471dce98fa SHA512 00bd71d55aff1082f605220bc9de6150501aef9baea55cf3a3d2c1ca201fcafc09d020a6a3974fb08aefe16ffb0b7c52a2a2cbd4525580fd7a393946cc9bfec2
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
index 17146e52489b..78a00cfa66f7 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib
+
+inherit autotools
 
 DESCRIPTION="A library with SDR DSP primitives"
 HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
@@ -20,9 +21,11 @@ SLOT="0/${PV}"
 IUSE="doc static-libs"
 
 RDEPEND="sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
index 6d74de097a23..0fc0e3c4f071 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib
+
+inherit autotools
 
 DESCRIPTION="A library with SDR DSP primitives"
 HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
@@ -20,9 +21,11 @@ SLOT="0/${PV}"
 IUSE="doc static-libs"
 
 RDEPEND="sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index a461f8e8245a..525607261840 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,7 +1,8 @@
 AUX libpcap-1.10.0-usbmon.patch 620 BLAKE2B 463f446051bd6df5afd679ee95c13792ab4ce1962cd8cd1de7acfc1c40c887741ee0a8a5725566781833711e4c8286942ba6e0fb2ee262e2177df82f2175942d SHA512 77fc6eb400bbf265ed1290bead8c317bdcdbeaf5a73aacfd95c3a1e77dfe8d5a33dfe49043462051552e3550273219b10939fc2cf4eda7298317c7b4490428ea
 AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174191e13d28658e380baa2d48f828736a0ff176de4b5fdaa7c0bf42c36509dfffd0c6d49cec45669d03201fad8efaf90c75 SHA512 57f51c1f2fc093bacf43a96c7156e82946a3f11025b3afe3c24c2704fb4a9a7750e0526d41a17d52d649f55b44d642d5daa3a76f0ae18aaca582591f20acd1c1
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
-DIST libpcap-1.10.0.tar.gz 920263 BLAKE2B 40b9f3562161dbdd30065757ae045bc3b6447a954dd3019e932cdc9c794e0f47e8eb0480144bfd7765122a3efa750caa0c77abbb98ce29ad79a84ceaedcb9e3f SHA512 d77f05aff76aefbd280e5e24eb4a23b6f3b31c9aacff77d556259325273083f185c451b7ad40b57ac63c9114510e8f768fb99907b1ee54fa95b80f21d7d6500f
-EBUILD libpcap-1.10.0.ebuild 1941 BLAKE2B 80cfa66cd7b10758d36518de9f0ebd262c3a5a610e20a591b7e133dbb7f2461e100d5510223194b95252e777b46d3c108c216768cf27d9c1e63fd9591b87018e SHA512 c844e8cfd6d14cf9e8a8e0bc9ec23e232d1bbdd51ea26e3723acd259fe0a57cc9f518de09061a44e4f049118a231c8a44a9f346a3cc190b4146c0789d5f3988e
-EBUILD libpcap-9999.ebuild 1722 BLAKE2B 23bf6d429b4010ef74e9db6be8512a9ae5b7cd013836ceefcdf88ad6d680a8000a39953b0d259679a826e99bc2af7d04a1e87db06d30aa10d6c06e1c99fe8a8a SHA512 b3f929fc29f5d2f96fffe31554d65ecdee1523b7bf4fb8b4bc911999223816bdc376254a208cf142c1e8d9ba36177a4a19909c18e95ca7bb72b93652d0c96b3d
+DIST libpcap-1.10.0-upstream.tar.gz 934559 BLAKE2B 54e809af242b18d600b88f29bbe31b01784b5160366242f313908b58dfb1e6ee2ceae8d359f730881e15c1b26ed90c553869dffb25a74eb3cea9f597dd490b1d SHA512 007710386ff3435ef97fc99293076eae3c39b424e986141184c712b0285f8589357a1b25085f7eba28730de04312042c724d193934a399797e95a56f5301da7f
+DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d9f24ad43e503430a3fa969a8ce668cb7926e1d19adb7e7cf11fff9dafa09b04507052ccc98f7b2a81f053ff01ec6c7ec8f87 SHA512 8a13aef00120080793da800f038d13124d412dfcfae6c0a952bcab544b50c8b69f6a672438bbe5bcdbfeda2e0d541bccefefbfc69f94e1635c0e9eaf77f19902
+EBUILD libpcap-1.10.0.ebuild 2418 BLAKE2B 3675c881d73801eee1e38818e7e0fa954bdcbdf162bc10c93c9d9fb68b8b75d2b670104e4147a89bb3174f23d7daaeb3720272c76ec75d357d0171816e2b2aa6 SHA512 41e504348a2d39382a78647954c7f79dd1e1fd7a4898b4c8697b76c34350bf28ed2a9bbe90182003b0cbcd72cbb40ca48d6d2ad6cbf10e5e05910c84a16f9d6b
+EBUILD libpcap-9999.ebuild 2309 BLAKE2B 24a952820fa0260ab8d69058e9095dadb8a4f8e65507d9d81339334db3c203d14f2153e6e9c0eef2da7d188c6eafd69fcd23c64abf53f79e8b517d1f0dda343b SHA512 e3a07417a2a4ef534480f63e7fe574f6b293efb5ff9da1ecf94b139af9caa56c615c2878845915e9cb29a20be6e4c8b18e624489c5e94a0f0e3ca1cf31705ded
 MISC metadata.xml 918 BLAKE2B 634ea0c95e68eeed1bab1a2e41d6bde245eb4f432fcda4ffb5cc509317d25e1a2c0ebc56a78d478913ee3c281458743b11327328a712fa509baef8654698e150 SHA512 2a81d02fdca06a6cca8afb80d013f4677ad8bd8de07191801bd73270b0140992674050a6fd883945ca1b6aba08a6ba7dee7e38a9eebf3825dda338d11cd5e14f
diff --git a/net-libs/libpcap/libpcap-1.10.0.ebuild b/net-libs/libpcap/libpcap-1.10.0.ebuild
index 84b0f8780fd2..e17ca9253266 100644
--- a/net-libs/libpcap/libpcap-1.10.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.0.ebuild
@@ -6,16 +6,25 @@ EAPI=7
 inherit autotools multilib-minimal
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
-SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz"
-S="${WORKDIR}/${PN}-${P/_pre/-bp}"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	# Note: drop -upstream on bump, this is just because we switched to the official
+	# distfiles for verify-sig
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
@@ -32,6 +41,10 @@ BDEPEND="
 	dbus? ( virtual/pkgconfig )
 "
 
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+fi
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
 	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index b716f8505940..b0505e64ff65 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,20 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3 multilib-minimal
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+fi
 
 LICENSE="BSD"
 SLOT="0"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
-KEYWORDS=""
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
@@ -23,15 +32,17 @@ RDEPEND="
 	rdma? ( sys-cluster/rdma-core )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/flex
 	virtual/yacc
 	dbus? ( virtual/pkgconfig )
 "
 
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+fi
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
 	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
@@ -41,6 +52,10 @@ PATCHES=(
 src_prepare() {
 	default
 
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
+
 	eautoreconf
 }
 
@@ -62,7 +77,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README*
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
 
 	# remove static libraries (--disable-static does not work)
 	if ! use static-libs; then
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index aa59d3e9c28b..5b73c8c8a16d 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5
-EBUILD libpsl-0.21.0.ebuild 1477 BLAKE2B 0f7d248494463a3c1c646eb3a6d547b197fb908ebfa358a7380a6242aa742efcf89dca21c6542227bcd8cb8d5930121e52ce5fdaff92488b69a1a2d209253e59 SHA512 6fcb6db787a0cd285c7528044ad89579de9501fcfe1b2c76587f8993830851626e425254645140665b8877672e9b806771f0a170465e92a0faef80f1c3b2a7c6
-EBUILD libpsl-0.21.1.ebuild 1487 BLAKE2B 0dc61f37275faf7cdeac5d472c5c264deba831b54fe41b1b0b7b07620cae859f2ee12cce7e97c5ddf67dbc36726537502b33a0002d99539bcb5fd04e0e531ff7 SHA512 aedbe164ec50c96e2df5c65006436ee704c4e7d31dc99687ab64b5af1c02c8b35682146d9a6334a00dae5a7b4eaa3f8a77f8249cd0250eeaa1eac290d8699c12
+EBUILD libpsl-0.21.0.ebuild 1480 BLAKE2B 1378cf3362cd30e1392df9f5034e0831721058464342f89430dc7136e781e0167f29e281a4bedce7d2b9ad8067908ae57f41abdd44f683b13821ffc2cd18ae72 SHA512 96b7fe20ec7cf9304695473b3218e1ce99283d4baf52b6799f488af6d2d4f78bde3234adc5e5ebdeb590fbba9377a810b647924bbc61bd7cafa396b148f45c8c
+EBUILD libpsl-0.21.1.ebuild 1489 BLAKE2B a2f798bcd3e850cb024f611ba695c80e5823cb7aa20a09588ba6b2c9f9bf1bf3be525aae114d85d4c8302edfeba0b28d37769aa8c61d66a7403e326849696be5 SHA512 a8b32de4f4443a198e1519a6f023e6827af75579e8db7d14747c0912f8eb1058e3814da95fcaf2d63313118a05b71b17547aaa469186a696ff11250447984170
 MISC metadata.xml 343 BLAKE2B d19e87c4ba9e09228a0fa952aa84158e3af40a273fa6397c46398c5ec2af03b21265e16f93083847e5cce2518d560ae85bea0c55993333e1c7875a06391e95af SHA512 9aba846b595571dbc7087579243f4c41aef47f25e64289a3798b047a6e49b1e2bb0a823b7b92c22b9d9dea776bc5f5bb8117ed5ab49f4269fba8066caa8ca09a
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index d939d58cf048..d07938849562 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,13 +12,13 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
 	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
 	idn? (
-		dev-libs/libunistring[${MULTILIB_USEDEP}]
+		dev-libs/libunistring:=[${MULTILIB_USEDEP}]
 		net-dns/libidn2:=[${MULTILIB_USEDEP}]
 	)
 "
diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild
index dc12e522645c..2a840c6e4b23 100644
--- a/net-libs/libpsl/libpsl-0.21.1.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ IUSE="icu +idn +man"
 RDEPEND="
 	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
 	idn? (
-		dev-libs/libunistring[${MULTILIB_USEDEP}]
+		dev-libs/libunistring:=[${MULTILIB_USEDEP}]
 		net-dns/libidn2:=[${MULTILIB_USEDEP}]
 	)
 "
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 4e42bd534bfe..563a6905279a 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,6 @@
-DIST libqmi-1.22.2.tar.xz 947124 BLAKE2B 662cf58cb3fe48b5bbe167ac552b12ecff2944d1098e47b5a8c216a65c42c5e5c462f16625c4572e0e27e69a55cdfad76777468a42f8887f5b3984313c70747b SHA512 5785b56a60db8fb2566b6a712a18ec2ae74ce1da257473ab6b7cdea3163298ebee6c60a3158a7041aa759bd717eee4b16d9eeaa6b15d9b6e911bc8c8c44bd3d8
 DIST libqmi-1.26.6.tar.xz 1127552 BLAKE2B 1dba56c867c688c991fde7bb019234a05d77092f0725498d677a7ff620c56e58e17c873c773d96ee2131bfeac8cdbec86dadacd8fcc2f751f4e9a8d2c75efe5b SHA512 6c5e05fc158a085e1f652ff31cef65762c026cb09eb630153fddccb15e19187141e74c79818ebe00a058c5624891981cfce4d56545d4150ebb3b6e8d7bddb5ba
-EBUILD libqmi-1.22.2.ebuild 1125 BLAKE2B 0f46e9c7304e7fa676f02af18dab551ed8bbab8f0da220da37d4304f966eebe85a4574b6a693d12ad4159b753a5b05fbd6cb7dd63ebb817cbd2bb79291a28ed3 SHA512 58546939e8a9f18dd2d0028bcefb9b937f94dc034f0554cae9be7cd5d79769a5a02ddb79e9899f6442ee648f2c3f962ac42e329443d6368dd35080202e421910
-EBUILD libqmi-1.26.6.ebuild 1166 BLAKE2B 113cbda395e408443271776adc2a825126d3d88419527dc3448868702f1ed3368235db43482fbd833cac6ef2b1b7b44da8b06dc226d396401ea6357c2685bc5b SHA512 40a6b05f26783e4bbcbe84aa7eb40388774c50270a5de62b1310af47092a8b65f911cd7c9508ace3407d0ffd29d2ddd8b0a2149c2354add7c11248ff2296e9f4
-EBUILD libqmi-9999.ebuild 1169 BLAKE2B 1bada98c611f1dad5b52af359ae5e56b92ed3b70fbbd88495c05f49454a8c9c6c954c3f62a187f294c3b093f98aec62e27e3193c4869c77f6b3954a4a01f7389 SHA512 535d09ac3ac4e2d4eda22f28e9825314915c982987ca0d929872234f873cd7e832c76becb50adc997989bfc365d093869834f0de1e6e6d6e8d49bf32dfd69f08
+DIST libqmi-1.28.2.tar.xz 1165204 BLAKE2B 17f7462d84b74099a5ef4fa6f28e777a4587be0a7652b38c4ab5c0f50bbbbd0b8b293df22d7a8c470444df23fd405e3b176e8c449019787c5305fef13d0b27b2 SHA512 10d11b780aa381e93669aad2540c609bcd3f789302ed76d80b9845a24f84d8741b8c39287a2007ec80d8e0e517686023d08a7a677426c77f3b12ec172edc05e7
+EBUILD libqmi-1.26.6.ebuild 1146 BLAKE2B e2bb050d6c6ade7ee0e493ab39297082ab155e6d3361d95222252a3e05443daaa64d0aa07eabf938825297980252ae9de5ddd0420b69adb68f447bf81890982f SHA512 51c72da9ef8d66a75c84d375d9ce27948b3570a7559e2a44d35e7fb4b4ba4f8b4e852e594e975544eefe8f490516802ff4c3b83fa216e7f13a372ea361661084
+EBUILD libqmi-1.28.2.ebuild 1228 BLAKE2B beb397e75288d176644eccb208603199dd814a176c0351bde511559dcf1c2a566efe1623ba1b91410e784cca944204378c5a91b1f6fa9a753dd4496858b791f3 SHA512 b7efe428b4ae2a5c65e55a905b05e987f552605f571d64eb11b55dcaa3da705d0799936d08df14de9a6e5edaa91050818fe9c6bac63cd0938a8b370b9644f6cd
+EBUILD libqmi-9999.ebuild 1223 BLAKE2B 526c92280dd6838c08a7bc56d975a472bce40b04627cbf2a69402cee7a32fd11b2ca4a658a333b2215272226a380b93aedb8f58bd7669da931c037b4169b9059 SHA512 ec855e747177f058290f8b0375dec0d0e73bca68d8eba4a70203d0013d5a9938c121423c1bbdf23649e20a62c8e3a413627bbf5d555eee05a486cc0434c99205
 MISC metadata.xml 424 BLAKE2B 17aae2f0c88f12dd7de0c2ef76687667b5e6c1d0c42e2f584b868f025d0069a56b95d11d8d4f137f8f6e783fdd30f49d191bfd6b42f479057f9967fe66d77a17 SHA512 9104fe16ee4aff27aa0c9861456518ebb0b022b1d37ab7c260c31aa3ad19136bb3338072a1dfdc53a024a3b31e8e6e6bfec14eca2b92d53f8d62b00b213e060e
diff --git a/net-libs/libqmi/libqmi-1.22.2.ebuild b/net-libs/libqmi/libqmi-1.22.2.ebuild
deleted file mode 100644
index d7fb5078343c..000000000000
--- a/net-libs/libqmi/libqmi-1.22.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0/5.4"	# soname of libqmi-glib.so
-IUSE="doc +mbim static-libs"
-
-RDEPEND=">=dev-libs/glib-2.36
-	dev-libs/libgudev
-	mbim? ( >=net-libs/libmbim-1.18.0 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable mbim mbim-qmux) \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.26.6.ebuild b/net-libs/libqmi/libqmi-1.26.6.ebuild
index 9a4f1b1bd6f5..c54d74cda658 100644
--- a/net-libs/libqmi/libqmi-1.26.6.ebuild
+++ b/net-libs/libqmi/libqmi-1.26.6.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=7
 
-inherit multilib
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libqmi/libqmi-1.28.2.ebuild b/net-libs/libqmi/libqmi-1.28.2.ebuild
new file mode 100644
index 000000000000..ae2df1d55498
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.28.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
+
+LICENSE="LGPL-2"
+SLOT="0/5.7"	# soname of libqmi-glib.so
+IUSE="gtk-doc +mbim"
+
+RDEPEND=">=dev-libs/glib-2.48
+	dev-libs/libgudev
+	mbim? ( >=net-libs/libmbim-1.18.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )"
+[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--disable-qrtr # libqrtr-glib not packaged
+		$(use_enable mbim mbim-qmux)
+		$(use_enable gtk-doc)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 51ac0339e070..0518bf890c38 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-inherit multilib
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
@@ -34,11 +33,14 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--disable-Werror \
-		--disable-static \
-		$(use_enable mbim mbim-qmux) \
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--disable-qrtr # libqrtr-glib not packaged
+		$(use_enable mbim mbim-qmux)
 		$(use_enable {,gtk-}doc)
+	)
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index b94b59c94887..7666fdc3f347 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,7 +1,5 @@
 AUX libquotient-0.6.3-no-android.patch 930 BLAKE2B 15ae94889d5543b9d8e6113752df00fef0bcabd2c44adf4146d2751077ec08db17048d4c8716bd245b4f6856e581970c1d230511a681dbb6ae64178bc3fcf75e SHA512 ef3414f3e3dda3926c246d0360be227c52a1ce0aa970f65aff29d2dcbe2c605fc2f583cebba4ad3f8934b872a035a3cc7a9895847eaf9faddf0f46023647f7b9
 AUX libquotient-0.6.3-no-tests.patch 1421 BLAKE2B 97f6b9c3cfe5b32607d64fadbd8e72aa0d1f5d14382edd2792fd564cc226cc473ccda18e770d1b449c158b156bb67dcbbbc36f8587436bec28295b8737279f9e SHA512 76d47d6837c4cfb86be95253ad89fb31de60181b12433a579072b567d18c49a040aafeeb51f333ae4038b141724fbaf68a28a440a1a986f5c61eb25b093b2139
-DIST libquotient-0.6.4.tar.gz 559830 BLAKE2B 23a2d5bed5a5bcd30ffa00465291f5670d187d44991fe424bce5a2ce1ffc9d4fc09b0cc1e44e7b2b2470f82f6a3bcf4be2d6d9185d2952761a9a94d6f4fae2ce SHA512 6f505a697b6bd123004faaaae4ea6788ed985dafd965c5768cc838be98d6b27f65d5fb04c02d41c6a9ca2ce622acbd49264a9a14a99a087126d2852a926184ce
-DIST libquotient-0.6.5.tar.gz 560003 BLAKE2B b23437c3ef204da731723946e372685cb492ee5feab3f71f5770a27c1fa2d2810676ed2c9dbdb95499055e05a3589db92c75190471ba4dc14f3aaea8f2282216 SHA512 9079de0eec103f15cb7092319546b8be213b460ab172444e4f2f2b10d06db85485fda48546b3291db9014fddd8b22542119d6bbeb69bee1f2a208ac87990c3e4
-EBUILD libquotient-0.6.4.ebuild 865 BLAKE2B 2431de16f13e607f793b629182c954b0488c8dd107123398b7d5e9d13c88c3c70d7e92c2d3f519552a8dc12c581dc323f67b41b09624338cd254a539e5d5dd68 SHA512 7befebbee995aa9b4211c05149d119556ed30e50656ba0a534ba08acd60ac4a495006a9324b2201b7273df5673af22d2cf77c597e7d8a7467894986f368c0e8d
-EBUILD libquotient-0.6.5.ebuild 865 BLAKE2B 2431de16f13e607f793b629182c954b0488c8dd107123398b7d5e9d13c88c3c70d7e92c2d3f519552a8dc12c581dc323f67b41b09624338cd254a539e5d5dd68 SHA512 7befebbee995aa9b4211c05149d119556ed30e50656ba0a534ba08acd60ac4a495006a9324b2201b7273df5673af22d2cf77c597e7d8a7467894986f368c0e8d
+DIST libquotient-0.6.6.tar.gz 560130 BLAKE2B a8f12af320e0f67b0fe40ec3892cfb2bb7686f066633c061936007e0eceefe5133d3c021a0d1856504f606b5c1bdb66ffa9d8d304b0b631be34f938ffaa061d6 SHA512 7560194bee5b6478ac8efd15d6cfef9cc003073744b4860e3177e51e49135cf2ad96c69e8cd21e64c1f9902ea4d27c26d84d200fc862c5c0daeb0cc4bb4ea65d
+EBUILD libquotient-0.6.6.ebuild 865 BLAKE2B 2431de16f13e607f793b629182c954b0488c8dd107123398b7d5e9d13c88c3c70d7e92c2d3f519552a8dc12c581dc323f67b41b09624338cd254a539e5d5dd68 SHA512 7befebbee995aa9b4211c05149d119556ed30e50656ba0a534ba08acd60ac4a495006a9324b2201b7273df5673af22d2cf77c597e7d8a7467894986f368c0e8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libquotient/libquotient-0.6.5.ebuild b/net-libs/libquotient/libquotient-0.6.5.ebuild
deleted file mode 100644
index 0474fff2b604..000000000000
--- a/net-libs/libquotient/libquotient-0.6.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt5-based SDK to develop applications for Matrix"
-HOMEPAGE="https://github.com/quotient-im/libQuotient"
-SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libQuotient-${PV}"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# downstream patches
-	"${FILESDIR}"/${PN}-0.6.3-no-android.patch
-	"${FILESDIR}"/${PN}-0.6.3-no-tests.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DQuotient_INSTALL_TESTS=OFF
-		-DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/libquotient/libquotient-0.6.4.ebuild b/net-libs/libquotient/libquotient-0.6.6.ebuild
index 0474fff2b604..0474fff2b604 100644
--- a/net-libs/libquotient/libquotient-0.6.4.ebuild
+++ b/net-libs/libquotient/libquotient-0.6.6.ebuild
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index b887b92a5a60..277cd7e0f1dd 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,3 +1,3 @@
 DIST librsync-2.3.1.tar.gz 194573 BLAKE2B e18c5d76b45701d881f64bf642ec40844bca507b99ab3161b1bf9446a7a0e2cc954d5d5b37a0d8894fabde2a8f6e2896ef1fc51942cf5c40b2f8a1bb94c20ee0 SHA512 89e5b5ad960b8036acce41df09f5e50601d7eb57d48a2bd21c4ee54a3a375f62ee514036b9a562277b5656735b84cadf6f54cbf48c364bbf0c04f2d95ae3b5a6
-EBUILD librsync-2.3.1.ebuild 593 BLAKE2B 1a232ba68df36f9b079768694f54199b20ad7299aa1b2c94f5a24fee39659bf4dc431cac6d3237bcd1bc3c185fb404dcde5e1048537b9451cfb68d8b483f9b2b SHA512 19af315973863969b89207fbd0914815f149e8fbfa8f5154c161c19e7fcd8dd138d08ff4e885b6d0e369e410454bdecf95712a7404a53a457204372fe1167547
+EBUILD librsync-2.3.1.ebuild 594 BLAKE2B 5df6a99d740e44862e52a48bee73080e33137b612cd01587f5721a94a6bf6561ed53f2966c9d5e22cd9c71f87f12e43004e39e80bbfd5ad3fb031782019f9abd SHA512 1e2c13dae7ff32a99b039e837548a505c50ddea1f1e8ff742fe6a0b10334c0a30dd9989658ee2d382c1befce6fd2bbc5d03eaf2dd92aff00d636a4b6e5917c70
 MISC metadata.xml 387 BLAKE2B ddd9f98cc4a0e9974d3a3dfc0ea802f6821e4dd2d86705a8541ca2a85d0185396d2a70b44588bde7761244ab3654036c22d06c21f4e3b3cb76a29a3898d22dc6 SHA512 0c4185c4f98435361d1ee075718f7a8a5b9945087b56294add0813c9b5e3a69d88ffe98bb52ac23529aa4ffc44068eafa26d6ef59759ae50d52962dc129b992c
diff --git a/net-libs/librsync/librsync-2.3.1.ebuild b/net-libs/librsync/librsync-2.3.1.ebuild
index a8a8e5749026..5cdb27d2e655 100644
--- a/net-libs/librsync/librsync-2.3.1.ebuild
+++ b/net-libs/librsync/librsync-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2.2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	dev-libs/popt
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 84ec71acf048..fda00b3b4ab7 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,3 +1,3 @@
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.5.0-r1.ebuild 899 BLAKE2B f66a0085abb97bf1f087d0ed1cd3a5253d707d2ec13393da363a6ebd82e5024afa6bc2cf8d36915228855670a028248e5a5c941467227584a33f6f36f53ab811 SHA512 8a07b75a6023c47651b16dc97dc7df80c39387e54e19052d8c608a087825f0b0ddf62edacb666c922c9f6e6714208cc48e8e68ad3649eac7c049ad4da9d85c59
+EBUILD libsmi-0.5.0-r1.ebuild 900 BLAKE2B d3439e47c97c7bc0d30dcbec6fae773c23c4956e99da0312e99678728a22250a99e5aba303057b1080bd5add9c3e26f8dda1db4ba73c0ad8a9d7b7998d9b5367 SHA512 5d122626c97849b08ee395820b0461d5dcf5075e9c91e4e71514b3e4612e59a178146baa45f0bff88c709af25b00cc6e2bd5f516acd9495447b03a2833ba3f55
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index 6b0294947d29..712c25b0a296 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 61ac3bae6ced..8e90e5e77d90 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,6 +1,6 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
 DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
-EBUILD libsoup-2.70.0.ebuild 3000 BLAKE2B 6896ff81e8d0eb822357c8c198e0774a9e563e239433033049e1b89214df733edec33e3f59eaa966978f9c224ca51afeeee821dae29c544e030c0b0fe44a949e SHA512 fe281bafa2b5ad22f69e55ec6631b05a28382a0cb067dcb2f0f480c04616f712458b7504599a95066ba95730ac0cf1306dc12109b2f7c536a3c52088d8facdec
+EBUILD libsoup-2.70.0.ebuild 3001 BLAKE2B f169f2ba7739d75aa7fd76078727aefd623fd86f43c7e666a2b5c86fda169c54626623cb7d6abf33304b56a7012cf5b9a3b7ad2dbb136ca0db0e10a3c785277b SHA512 17c345485bd99b036af6487369afb7566576f8e2963c1e5fc7cb75003a0ade7206dfcf9ec969ec7df511d3288172af856a3d2d7e14836f55ab4a0cfb843d69fe
 EBUILD libsoup-2.72.0.ebuild 3111 BLAKE2B e5ce14664d617661914f6c757a34e3d428d2da5a8418b6aa821292dbbc2fa15877c0fcf8e7c0873ec5664eba002e6f6410e9e984472aef56cc5b59978f37cc3b SHA512 d5c38cc670d5c1d2cb3fa5d74698d7f9f3fade310302e173e4052cea68f7bbb09ce701d8c3f6efef3dc2988b582715799d855a2816fd36c532137f93e269bba2
 MISC metadata.xml 577 BLAKE2B ce68b60f9438bad0b1fb848dada28796f4c9a8f6ed119b29c26139bf7c146edb7e701f7565e425c27587a911e62bd1ed15cb6d120696ab1ac0f631f9f8145cc4 SHA512 a2937c0036d3decd995f8e83321b7b1e2bd9f6a5fe83ff7061dc1443ef5cfb4714d38c32689cd46065a7efbb5c8f120eed5ebfad650e7ccf4f1d98d9d45afb0d
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
index 55d0bc8ab39e..fb3e43069562 100644
--- a/net-libs/libsoup/libsoup-2.70.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index e3735d19e58e..dde013e24797 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,5 +1,5 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871 SHA512 fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d
-EBUILD libssh2-1.9.0_p20200614-r1.ebuild 1495 BLAKE2B 162fe67f78e6b6fcc778b8c1669e21a84ba2207a49bb99d904ba1daa69529ef86f331fb3a63161ce5d9df19057a972af9328d4581d216bf7fb702e389c4bc95c SHA512 19eccd133c45ed716f361c313010ddeeb5eca78a56e0d4c28a3a87a94a55111ffe6dd4a0a675206f788c9cd67c83724d6a8c8b74b67798fc301ee3177975ac29
+EBUILD libssh2-1.9.0_p20200614-r1.ebuild 1496 BLAKE2B 630ef120ca21476542fca2b20c9dcb2a3a17577db76f3eb16c5b6fc0a4cbb833807e9d60199f451ceb3b85316a268eb9db2b740df05bde1adbb42a30b271398f SHA512 4b386b05f0d9e92d8b79ad4c52406f3a9b641bec345efeb482b011cb71a6cb9505e66858e58ba5a3821d63603604d9ae36e64b25f01cdaf528aa4b59da52b45b
 EBUILD libssh2-9999.ebuild 1253 BLAKE2B 749f87eca997579814b3fccb96001407335f8c8f38c047d9eff7c74c80fad0fb2c6444f6157a6f27eeda3588d1a77f83f8eeb533efa906bf291f7ce012f666ca SHA512 acc1d8d82e90e46163d0a947bffb4128de39d80d59ba9d203911012b1417a3ff3ce08a86b1729763546e8a8c8129c4576ee2c31c5c30dd173b3a20ee3f953811
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
index 3e48a3afea49..1ee9017fd30e 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
diff --git a/net-libs/libtelnet/Manifest b/net-libs/libtelnet/Manifest
index cddd6f1bfa59..acdc78704e2d 100644
--- a/net-libs/libtelnet/Manifest
+++ b/net-libs/libtelnet/Manifest
@@ -1,5 +1,5 @@
 AUX libtelnet-9999-doc.patch 1317 BLAKE2B 07293a3658b80cccb147a75279ae7f6b9843101a0414233db33d8e4a2b6fd47283dd35a69942aff2f52775c359b5acf67f739434d5161ba13ed84eca62c95c45 SHA512 de7aef7504a3243fe01bcc11a78bc274f8662dc6fa472a1b6ab8fb84a1a518491d2343e4dd9817e6dbb0ba67fbd68406fd85ce4d1ae6e4e6469b3f71c3594d99
 DIST libtelnet-0.23.tar.gz 241922 BLAKE2B 0436c3eb2085c0fc4262f30c86f634af33679a2381a54dbfe92e6f6196b825b100c9c35f78505191b7fea5360a16d9b960e35ff145cd177aaab50968b2fbe946 SHA512 da16a97d04bc6bb5959f431e0aaa03d08ac38e45ba870d7fe6161551ecfdbd5c37a2209cfb40a0f574e6ea0b5c2866c7461cc91d940d5bb5de09fe1584eeb780
-EBUILD libtelnet-0.23.ebuild 525 BLAKE2B 29c0e2acc438660d3316afc8978575ba453fcb274f7fba788690ae16154e8eef50ee33e44204e6df847363c670faab9567b7acde201e9f2f1fcf0704d4f743d6 SHA512 86b5b05952832d2852a7be52ee039195a8d0952b11be32ebdb152817777173e4676f25ca16c787a28955d662fba79e800d929c90c11792b0378bff2f0a0a437b
-EBUILD libtelnet-9999.ebuild 670 BLAKE2B 8548e2c2c2d138c94586f3b1874a047cad412522456678674595b659ab0cdb54a5cec709e4516da1c3f53628b30c05adcbd528f4f1fef147934288e600f590a5 SHA512 a680d12564f83bcbbb7e7ffa1bf6c14a2ce80465c1cd7a4db658b05ddf6987184ae68599fd64dbf9fc6cb7b4ddd67793058f4fe7b1c2c91e734823306d9d1c1a
+EBUILD libtelnet-0.23.ebuild 525 BLAKE2B b34c9786a5bbb01f4cdcf624affe9be4e869ca48bde96a94883f34edf15c5424799498a47da6f801c35b6273352197926d63467ca3274d5cbe3348f16f2b640f SHA512 73480b147a663b3a4ef29276ea3063dc74985f13f79f679cb40fb2ab71ed380cea4336a06bc021efa29fca4d5e6918f4c531b103de3d37c04ef43399ac6e4482
+EBUILD libtelnet-9999.ebuild 670 BLAKE2B b34ce45ad667eb5f3e545e498040148fda6160f06d6d98f983b32b389e358945fd2b145aea9a3cdb8d909ee82cdc389b8c440df33f86a5df24e75ba7f47b2eb8 SHA512 6b44868724045fd4df9157f86deeb84dfe06a1d08f5dcb3a0b524481129bb8ffba3d32f92913837486b4d6fe15df63ae2df09c51d46ba033cd62a4487840657a
 MISC metadata.xml 352 BLAKE2B 35d61ac47c3cbe79d89b33487dc05c167799f4352f2a339ba47054c0f27a135745bd6f24d6b77fe13491395775c1f05878958f7aec11c7d70286f74370e714eb SHA512 8e0b4ff5329576c1b209652dee6e5ad1717ae7d2c9938c570d12641e9d1eea9769050539f73b5d6074290e6a95f87de96c054b5a3bff830ef237e5e6b1208f3b
diff --git a/net-libs/libtelnet/libtelnet-0.23.ebuild b/net-libs/libtelnet/libtelnet-0.23.ebuild
index f497242059f6..9577f3cce082 100644
--- a/net-libs/libtelnet/libtelnet-0.23.ebuild
+++ b/net-libs/libtelnet/libtelnet-0.23.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools
 
-DESCRIPTION="Simple RFC-complient TELNET implementation as a C library"
+DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library"
 HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
 SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild
index 44e62916c511..9edf0466d6a4 100644
--- a/net-libs/libtelnet/libtelnet-9999.ebuild
+++ b/net-libs/libtelnet/libtelnet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="Simple RFC-complient TELNET implementation as a C library"
+DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library"
 HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
 
 LICENSE="public-domain"
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 2a93259e0e63..fd6ba8f979fd 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,6 +1,4 @@
-DIST libtirpc-1.2.6.tar.bz2 513150 BLAKE2B 81ca8d1897b84897b31bd81c17e446213b798e00de80f03736f73eaf6b2e9e436b1569243bf9a8c5ad22de7da51339432decd2a8d3f1b8135151fd7e0f703e54 SHA512 bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a
 DIST libtirpc-1.3.1.tar.bz2 513399 BLAKE2B 8cc42292cdbde55a0095669bd9ccb3666b9e33d6ec9880ac79d034d42155d1b585f4181ff92f8290d7b5cce01bace2629d1ddfe0d61813f00851216f2be5ed0d SHA512 131f746800ac7280cc3900597018fc8dbc8da50c14e29dbaccf36a6d110eded117351108c6b069eaac90d77cfec17014b08e9afddcf153fda2d780ba64260cbc
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.2.6.ebuild 1493 BLAKE2B 66e243917d5d90dbc525e8db028ac5975cfacd43e32b66ddd188f2fe946cb63e2f6f1c21f70ca1b1585839649dded33a1e21720103d44566c8a48064963f9036 SHA512 73fbee0d4359bbbed64e965b64bdf80e027119dcd7b103775fb08c86738e1b2730c587e58c5547ac01694b6e3754ab11f636b9d674a4e113cbda53301748c5bf
-EBUILD libtirpc-1.3.1.ebuild 1502 BLAKE2B 9753af0afa16b59eae8ab760084398a43d08ca23bf0fd2ff9b238fcd5f47079de41878e014d3cff2642dd24f557df4350da0c92ad1abf9a798d7205dca7b5741 SHA512 353ad95d991a705bd37c759dfc253aad64bb5f461c80473c129f34dbc877155d1280ee4c9f65e0bc67f3acde992376f5a906f68e61d5142f85767871ce85b6d9
+EBUILD libtirpc-1.3.1.ebuild 1478 BLAKE2B 966d8a329908ac935ecb62303453fc382424414f020791f6b3a12feee8b347b59151b15a75e1909a727b1b3e23bea42232ae15343beaa1580656f3e5533f1854 SHA512 93f7f1c03e4e244da42e2c9c18dfbf8c162e230639947597b23266c2b12d533260f12287552434bc40f0e42b997e5c120936ee770053cf8fab33f9cd81d08c6c
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.2.6.ebuild b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
deleted file mode 100644
index a4c292c39f1b..000000000000
--- a/net-libs/libtirpc/libtirpc-1.2.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs usr-ldscript
-
-DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
-HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_prepare() {
-	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
-	default
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable ipv6)
-		$(use_enable kerberos gssapi)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	# libtirpc replaces rpc support in glibc, so we need it in /
-	gen_usr_ldscript -a tirpc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc
-	doins doc/netconfig
-
-	insinto /usr/include/tirpc
-	doins -r "${WORKDIR}"/tirpc/*
-
-	# makes sure that the linking order for nfs-utils is proper, as
-	# libtool would inject a libgssglue dependency in the list.
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-libs/libtirpc/libtirpc-1.3.1.ebuild b/net-libs/libtirpc/libtirpc-1.3.1.ebuild
index b10ca76d3ce2..ec87a4616753 100644
--- a/net-libs/libtirpc/libtirpc-1.3.1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib-minimal toolchain-funcs usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
 HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index ec53878846e4..9a1c81cb1f88 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -7,5 +7,5 @@ DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a400
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
 EBUILD libtorrent-0.13.7-r1.ebuild 2009 BLAKE2B fceeb5be7ca37af96e8966e70d334caa1196b593729fad4cb71cbf62365852ae1b8a02f3cc94c861e7755770da87e295a9aad9f11d86bf885087503585da7b53 SHA512 63a67a220bcdff9cb6e00868b9d690015f31d1fbe7c180065932a23ec9b62ebfc187260d836ca7b2ee941f09ba41f5217ed12819b37fe25bf4e97b2998b81562
 EBUILD libtorrent-0.13.7.ebuild 1873 BLAKE2B 37d41ca5ab236f80046e85c9e03a7d8d0ed44646068e053c1d72469aa9494b42861d37e597c7b5742810a5d57d7c77cb850ccafa23f917aed48636cd1e9b31b3 SHA512 7df4060143925e046ca628713ca901f32d8f32b9d144d5f3ce52a1a067fa3a367f817ede800407e80957c426b6f918ea8fdf414755f48158fc0b8a5da05058be
-EBUILD libtorrent-0.13.8-r1.ebuild 1725 BLAKE2B b3fe8b8b7c4dc858b94ea4ce48463d504b88ba25f8b9574ed1b55f9a3540cf626320b640897f285fe86bcefcb884914caa21e6ce3064cbe825382093d1d51aa9 SHA512 8f9549c28a47b2e732add5ab15902a68bb4b6ff004fa1c6be87a0eff16a9d89a364d77bb01cb3d82ddb9ecabe693f0da562a87383b01c17098d455c7e9afe4fc
+EBUILD libtorrent-0.13.8-r1.ebuild 1715 BLAKE2B f665d40e00fa4eed28f684793157953789903158acae3297fb57b44d8d73c623fadffb0c10b43cfccef42e8117e88c147f966c85e6d1f4146c044d50ea5dc88b SHA512 ed26263625e79df16975f322f85fb6b573fc946cf43f25aa03f4ffbc0cdc3a6fde60ff7622898d5a84b351dd5599d6e24f425c77ab72e46136f11ea6a809941e
 MISC metadata.xml 457 BLAKE2B b08e4d271938f1d1ea299326655b2721d4e3f8f0e922dffcc49b1722dd0d939831fcec2bb419ddfd272c3b3c870ecde292a5873e242320424f2d1eb2ea1812b1 SHA512 ab108e50c770537a5c09a265efdd322ad2a0ba479ae3166af3df1e379961154e7b60e78c87326471f1bc5724ccaff0cf09ec9afb69958ff59b8027bec72e7552
diff --git a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
index 44be3294c262..a622dab16067 100644
--- a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="BitTorrent library written in C++ for *nix"
 HOMEPAGE="https://rakshasa.github.io/rtorrent/"
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index d1babe3c9069..b41db6bf1a71 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,3 +1,5 @@
 DIST libupnp-1.14.0.tar.gz 788668 BLAKE2B 8e77f49c6eacbaff2d4194f281f73e882d282b1af400b2d8e08111b7cb0b89305f3f06b8e0ebdf8eab35de39bcd2cd30be3ecb575d560c652e96bd7831eade40 SHA512 d7cf50e168aff2ef3ad08b4c383108d5044e4c9d2923088bb93423ee5fc555c32f0254f307cb86ea7c18197612cf2d2c6c681f82d99a6f01a68f86a21c6eecb7
+DIST libupnp-1.14.5.tar.gz 782662 BLAKE2B 7b1a4f115d4fb545b26909d8f6feb0a017160876506f35a5932a0898e68104eb43d92f82872359bc7bccf27a05d41632296041bb450e8109758a0ff6b7dd8e58 SHA512 6a1587943fb76b860fa879b050ae46189cb9c6a514df3f00eefe8c3eaa268aa5c0307895b38cac22fac57a2918b925ecefde7c46b7c50f87cfcf86afd9ee180d
 EBUILD libupnp-1.14.0.ebuild 1082 BLAKE2B b0cb48b4ecc17ab31c3f81f7494e08dfe6d88131c7beda7af563f2121dbd668acc487ec44404889b7dbe528b0653625dc86618c93e9169ea1808a47b0b612781 SHA512 c60ace6978721467d52116c7d9d5ae23cef7ace0c48bc67b47d0a455f3dddcf05c207383105e7b241e76a6868f09f41564d00850e8ac933700ae67e0ff095b4e
+EBUILD libupnp-1.14.5.ebuild 1109 BLAKE2B db7b89b42927e6e24cfef3cb8198b17005262b07e4437901178d6e41fcaf02f5e1058e1bd1b2247fd2df94c1699dca5bfd6078f5e3f8ee58640d73a73291a824 SHA512 312d40fd88bbda79fac54af5bfc803c9b49beb7ac7ad8c7e254da6c4e8d1e5aceff084348095bc5a0db48714ad70bc8e0eaed258edde2eb5b6c7ea9498609a5a
 MISC metadata.xml 703 BLAKE2B 3c45d613ca370a5dffac938932461d7686e839670743ca7514ffb30c8f632baac6fbbe1fede4e9a1f0caf83808c1d0af4cf184a59763a21a0e2cab9b7e7ca20f SHA512 aabd69bc4b6182452c45172a09007369ce428307dc94dcfe397886045ceb5b302381f0ff0e7fe575fea3fb5d8979ecf5173c7fb0ed402c4045e79a7e494a963e
diff --git a/net-libs/libupnp/libupnp-1.14.5.ebuild b/net-libs/libupnp/libupnp-1.14.5.ebuild
new file mode 100644
index 000000000000..4d8eccaa915d
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.14.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_PN="pupnp"
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+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}/${MY_PN}-release-${PV}"
+
+src_prepare() {
+	default
+
+	# fix tests
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use x86-fbsd &&	append-flags -O1
+	# w/o docdir to avoid sandbox violations
+	econf $(use_enable debug) \
+		$(use_enable blocking-tcp blocking-tcp-connections) \
+		$(use_enable ipv6) \
+		$(use_enable reuseaddr) \
+		$(use_enable static-libs static) \
+		$(use_enable samples)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/liquid-dsp/Manifest b/net-libs/liquid-dsp/Manifest
index 53d87288c1f0..4836c05bbefe 100644
--- a/net-libs/liquid-dsp/Manifest
+++ b/net-libs/liquid-dsp/Manifest
@@ -1,4 +1,4 @@
 DIST liquid-dsp-1.3.2.tar.gz 1119114 BLAKE2B 4530f3929b97f04cf2e02283af0b0482a7e19783f73cd60b02aeadb26df9f7d33a43847496858b6178526abef34fc5121e94bde38df3796bbdf7149251a29e25 SHA512 1af317512f56078a79396fd3c7a0135c97ef63fd187d52db1b62ddabca683a37fa6b358adafd76d81c3cb06c54f9c7c8fd66f8bb86c0bfebec9e9ef1441ca5d2
-EBUILD liquid-dsp-1.3.2.ebuild 1030 BLAKE2B 729fbcfb0b60e6cb1be154bf7f2917c126a583d279ae6c37357d33fed4b983088389d3fda8fe28f74f0087b7251332bbed2acf1a6fd04078d8910d1138a300a2 SHA512 67003de4fb88633dfb031e032a164a3ad5a2b26a5d04a0da506aad275c4819f7418ef83dbb55ef3cd7410db493df6d79c10bf42b558b2620a2efc22ed13b3de1
-EBUILD liquid-dsp-9999.ebuild 1030 BLAKE2B 729fbcfb0b60e6cb1be154bf7f2917c126a583d279ae6c37357d33fed4b983088389d3fda8fe28f74f0087b7251332bbed2acf1a6fd04078d8910d1138a300a2 SHA512 67003de4fb88633dfb031e032a164a3ad5a2b26a5d04a0da506aad275c4819f7418ef83dbb55ef3cd7410db493df6d79c10bf42b558b2620a2efc22ed13b3de1
+EBUILD liquid-dsp-1.3.2.ebuild 1021 BLAKE2B 09beb1c4e579d9407b7880dfd572a31d4ac91a4b59cce658272883e743b667767f60222b433cb30fd89527ec2bef4d2fda36116e914fffac1509165071d184e6 SHA512 9ca428e972f49227da323432bdb8972e089c69e5b37c08174f5248c89b6403fc9fb6242175cfae4a2a8f20be564ac9e135f1d3a74756e19a9c401dca09e7e623
+EBUILD liquid-dsp-9999.ebuild 1021 BLAKE2B 09beb1c4e579d9407b7880dfd572a31d4ac91a4b59cce658272883e743b667767f60222b433cb30fd89527ec2bef4d2fda36116e914fffac1509165071d184e6 SHA512 9ca428e972f49227da323432bdb8972e089c69e5b37c08174f5248c89b6403fc9fb6242175cfae4a2a8f20be564ac9e135f1d3a74756e19a9c401dca09e7e623
 MISC metadata.xml 416 BLAKE2B 6f961dd0d9e7e9ee5b6b65eff224e6a73cb7b4ac13432a239da0e28e76e73b49f428d2203294aba8c9568b2b384222a75aed92f046c537d55af738b76dfe29ad SHA512 7dee49689a60f0b24a9435987f3752f53c36c84187e19850bcbe5e2d14b1fd7bf52c3d8de83f91f3e25b3984bbbde9a08150b24d6b62552602ef145821bc95fe
diff --git a/net-libs/liquid-dsp/liquid-dsp-1.3.2.ebuild b/net-libs/liquid-dsp/liquid-dsp-1.3.2.ebuild
index a8e81740c38f..342db248e427 100644
--- a/net-libs/liquid-dsp/liquid-dsp-1.3.2.ebuild
+++ b/net-libs/liquid-dsp/liquid-dsp-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib
+inherit autotools
 
 DESCRIPTION="digital signal processing library for software-defined radios"
 HOMEPAGE="https://liquidsdr.org"
diff --git a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
index a8e81740c38f..342db248e427 100644
--- a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
+++ b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib
+inherit autotools
 
 DESCRIPTION="digital signal processing library for software-defined radios"
 HOMEPAGE="https://liquidsdr.org"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 1cde10f53c4b..8e23c0f2a633 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,13 +1,5 @@
 DIST mbedtls-2.16.10.tar.gz 2677333 BLAKE2B 5f94003547d5c4ba8daec8270b6e91fea1bbcc94aa7a7417018ec57b8807fbdbd057640fda24cf65171bf7dd872eb091d21e7508df28b57ddfc512736f9c6482 SHA512 13837316b04fab6bebacdd283f437b5f246df0785c866cf3d94019d040ab0edf417e0b409653f5abf98a4944345eb088010658c9de10f9e96a5624d33741898a
-DIST mbedtls-2.16.8.tar.gz 2662927 BLAKE2B 80dabffe644c792ce8a317629950bee71a2376be8f84de29d5cb92047ee433347e7e91be513d638b2954c0c7b2393eaef81b7d449753efffab25694b8a8b52d5 SHA512 645d58d42594a2b547b904634acc1e7e8583465e075c190183e1179638f05e1f8f5c56561ab172fed8dcec4a1742429663abdfdc25d607410ea64a35fbb22168
-DIST mbedtls-2.16.9.tar.gz 2668396 BLAKE2B c637509e8960916bea714b0558b729bf43544d64a560b2e76beba78f8d1355e982f0112bd9e5dd5a14698fa8292d23ed0f41670b220d48d26d6b5a17884481d4 SHA512 f72538851c7a24ac14b5c153220260a49a083bfff44a52e9c1e77c51109bac779b5b4caac21f995176fe8f9d27843f3495692d6c7e9dc733cbcec896823ff0e0
-DIST mbedtls-2.24.0.tar.gz 3912697 BLAKE2B 4355fb4db90e3d72e73adcd8ee96c7db2809154c08a00c1a3a8a8f8d6360689f17317a6dd3564c85e1fadece1a49f1ce30561ad21faf48a5bab78e223f2cd070 SHA512 5437ea57eb8b8af9446a796876aa2bfe3c59c88f926b1638c7e8a021a8bef9f4bc6cb1b254e7387e2afe095bd27c518060719726bbaf5478582a56c34315cfb8
-DIST mbedtls-2.25.0.tar.gz 3994272 BLAKE2B 27a326ba08c341ed47ce280401a4b73606138aa8946fd8d8df5d084496eecc6eadf4eedd65270725a360d4b171c86cefeccb6b1515847587f0f11ed15b7dda9b SHA512 78e68dd9a2939fb9e40d796dcc2de36671c900921eac800688bfc3b5f47fda88be2eb4c7dcb34a01628983cd66323b15606ef2a29e7cbfda0d86aa3f6c948647
 DIST mbedtls-2.26.0.tar.gz 4080986 BLAKE2B 549f00db4bfbba4a88de0ff76f32140d7421ad3ab58e3cdf08ec40e0a3da5dcc7a1bcb6eb1ce491ebb544dcd15eb6bc634f04e6ab0f773dc89fa44b6843542ad SHA512 959f6dd0759bfd8dcc497a0527b8b9e9975adb9fee01461e6bcc37475cf9e4eae597687e05e077dfe51d0542c81bc3b90e6d9a692353dca331e020e02d642196
-EBUILD mbedtls-2.16.10.ebuild 2504 BLAKE2B ff6d66f0ab34e7a3b0b1ebff01a54c331ab83d75ed52b53b73be1fe0963c1d396746a47a71490d968733b47926537ba0aa3ec86bee3baf3a02dddfa3626c2242 SHA512 7ba7912b12300c3774b6b467169d042e40977ca4eb1bbba99913298e111d467bb7496f7af825215beb8b3565ddac501778360233a5c269b88510103e68838e30
-EBUILD mbedtls-2.16.8.ebuild 2498 BLAKE2B 3bc8c2d29f0b7c6c1e053d9a9580c2f20328308a70cc9e2f3028937de615c3d08f617597133296a006707093829d19c28a613d1e8d57f18d91ef5e4e8d068542 SHA512 36107a890ef9ebb8dde5596bd3d8fd0a660149adca8f8fcea8a0eb733e0422305ad38bdb35afd2e4ae6ec489a1885a37c3e2bf5b11e2de879c50a337d0a6338f
-EBUILD mbedtls-2.16.9.ebuild 2504 BLAKE2B ff6d66f0ab34e7a3b0b1ebff01a54c331ab83d75ed52b53b73be1fe0963c1d396746a47a71490d968733b47926537ba0aa3ec86bee3baf3a02dddfa3626c2242 SHA512 7ba7912b12300c3774b6b467169d042e40977ca4eb1bbba99913298e111d467bb7496f7af825215beb8b3565ddac501778360233a5c269b88510103e68838e30
-EBUILD mbedtls-2.24.0.ebuild 2558 BLAKE2B 3c800e117bdf590f4b2b36ed8cfe1100bdd3e5a7f30f1c0b75d8a87df0564b9d48ac54a4004a9aa106ddac89e1d0d38889d1a12f15cdfe8dd73044431bfbeb80 SHA512 efd6824356a5fc621fcf8b6f7c0937721fe8c044a5c49bbf965ee09f339aa0cbe8b38efa2cf65e87ba7d6f8f89188a45a6df95a8a08abfe024a55ce879b87ad7
-EBUILD mbedtls-2.25.0.ebuild 2558 BLAKE2B 036a5b0e4b5e8d6058d8ce94ec66ece78eab2795e0cf6a0d9404dec7cae625fb33caa92e28084511f36b16715faa0a31454f9a26a7a634cd5b3a63c97180f491 SHA512 181843ea26633f5b89764d58954218766f93acd521659f941e5a473ed68a01cd6a1d69b6a28706cadbecb57030ff675bfd6a8fb284fe4aa133b4eb48348fe23f
-EBUILD mbedtls-2.26.0.ebuild 2564 BLAKE2B ceba3ed755c845206d9c167207b6f18206450c40f90a385ee9e0f61feba88418d6ac244b4d19bde43449ce8389b8c5cbb825013bc9baf3af8ce6a76aab7326f1 SHA512 f44df9b8e6ff0599a6701b60005d245cb3b37e50f267e6a78036b558dcff2a57f7d6a489b5e688dc2db46736e7993fb4eb1f6666a4c4abe56bdd2d3e38018462
+EBUILD mbedtls-2.16.10.ebuild 2498 BLAKE2B e5a02a09396268de8cb7ac62ddc6a2984518055825ab1ce10324bf9fb447d6fc6dfa6f58f7af40de51d24c312937b981d69b52df3c51b64332b873014f661a43 SHA512 bb350189b5414f94e483733702cdc39fa98818782e8b4e2b2311b82b83d035d454116ef7056e3854923256b19a45ff545f1442449087396aa29fb615575151bd
+EBUILD mbedtls-2.26.0.ebuild 2557 BLAKE2B e3834a87aa733f18aea7201d8d45073e32d11eb9da1b7d6eb36b4b2cdf3b44bae517929b6b21c834862c4022c09a3f7d713b9244d5eee49cec59b17eceedf12d SHA512 e47c6723947cb735275d8a3c0f17e09c5e10a1aae172cd3ec5b57d3d4b1e478c5652080ef6d770850848a11adaba025c86b1d18f80580d86fe757cda6f945b46
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.16.10.ebuild b/net-libs/mbedtls/mbedtls-2.16.10.ebuild
index 324eaa4202fa..c62c3e605f65 100644
--- a/net-libs/mbedtls/mbedtls-2.16.10.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.10.ebuild
@@ -12,7 +12,7 @@ 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"
+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 )"
 
diff --git a/net-libs/mbedtls/mbedtls-2.16.8.ebuild b/net-libs/mbedtls/mbedtls-2.16.8.ebuild
deleted file mode 100644
index 6114da3d948f..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.9.ebuild b/net-libs/mbedtls/mbedtls-2.16.9.ebuild
deleted file mode 100644
index 324eaa4202fa..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.9.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 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
deleted file mode 100644
index c7e0dce91059..000000000000
--- a/net-libs/mbedtls/mbedtls-2.24.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/5.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
-	)
-
-	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.25.0.ebuild b/net-libs/mbedtls/mbedtls-2.25.0.ebuild
deleted file mode 100644
index 18d14d0312f2..000000000000
--- a/net-libs/mbedtls/mbedtls-2.25.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 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/6.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)"
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
-	)
-
-	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.26.0.ebuild b/net-libs/mbedtls/mbedtls-2.26.0.ebuild
index c1bb84ede013..5a1740fb0eba 100644
--- a/net-libs/mbedtls/mbedtls-2.26.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.26.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/6.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"
+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 )"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index c0ae231a1552..0bc1c28f2a39 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -2,6 +2,6 @@ DIST miniupnpc-2.2.1.tar.gz 99595 BLAKE2B 07736eb15a985096178273c4578bb3f0cbf32a
 DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3dc04370801bf8893a17cd0af47072456b75bc3415b587371972a7c5c36623665391bbf4b9c655d1da3c0e5b8beb7 SHA512 8b5d41556c66e6330673a63eb3be2397cb057c37f648d950e8dfa0bb00e646f343cfbcbd11a6547198d4fa6b1ca2a82b46724e284ce76e96d96ad6b3b5b41c3f
 DIST miniupnpc-2.2.2.tar.gz 100008 BLAKE2B 76bd18ad455be91a2b7680f59f59828a592077f3694ea5ed0f42222370d9e3d0e328dac1a6d530abcf28586384369d7c858c32fc3105f79cacad762ac5bc70fc SHA512 d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116
 DIST miniupnpc-2.2.2.tar.gz.sig 543 BLAKE2B e1089a0c3d937cb4e52b511ed0cc7b43a686a6c08df5ce5e008f1f5ec892b6a4f9f1c45ad4eb252c2aa57fd932a5c5dd4300adfdcee145f27cae51469f244179 SHA512 525f4b5c60ca1375df8a05cfffec3cf8e99ae070510621de2871926b6e84faec28cceb4feb983380e12b7271880872083ea4f4080c74572697476bb7ae795cf7
-EBUILD miniupnpc-2.2.1.ebuild 1523 BLAKE2B ea2dd919c4f75f297f19821ea9c1a4c473961aa78252fe3bd715ebf55d2272f95ad49de13a3a525bccfa8f5dd4e12f1ae76ce486957ce2b394335cda9b846fd8 SHA512 44d76f3bbaa507b7a8b61a50ae9d712c34c8cf8a7087523cf025827a4133660bbb2c6c79e58869642884fb27b81295abc75cacb60dea9fef735a0fc30c837c12
-EBUILD miniupnpc-2.2.2.ebuild 1532 BLAKE2B 396ca93467257de798b1dc3a7b1a4b689e7c7f51ba8a69e55a4ba5e9569ae6305b49c6436bf5e3d3fe243563c0926aaa865a24c2b416ed2b0fec9755695e8725 SHA512 62bb629dd461c08340a98de6f86b58de34c1d940214666379ff3fae38c3ee301e610ad848347d283f7e40473f629fb6f319c4ccb9e83ae8fa54217011a499502
+EBUILD miniupnpc-2.2.1.ebuild 1524 BLAKE2B 8b08e48755c0e7a0570630fa7303cdae350fd76b75c9e9db2f7be6afd201f98a080a23c0d5ee61f6681e7a457bd13a2508ec9c28c4e2dec59ad27f1430344830 SHA512 d19c2f2dd2a038cd5d14e4b25f53cf98ad72870bbc421d8329db942f10867b6230b2c43fb13f0affcb5e202fa47f302adab89d77b2b1d1ef2a715e12e3710462
+EBUILD miniupnpc-2.2.2.ebuild 1524 BLAKE2B 8b08e48755c0e7a0570630fa7303cdae350fd76b75c9e9db2f7be6afd201f98a080a23c0d5ee61f6681e7a457bd13a2508ec9c28c4e2dec59ad27f1430344830 SHA512 d19c2f2dd2a038cd5d14e4b25f53cf98ad72870bbc421d8329db942f10867b6230b2c43fb13f0affcb5e202fa47f302adab89d77b2b1d1ef2a715e12e3710462
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
index 69cd49ce7d3b..7ac6dc55a8fa 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild
index a899a8dd2a1d..7ac6dc55a8fa 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index cd8187a33747..dc30d1f1b742 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,18 +1,6 @@
-AUX nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch 1041 BLAKE2B a513bcff2b9efb52a61e843c8f5d28558786db6dd3f38fc53d1c7461199ef5bfd81a4d30eb5c1279ef36979f585135c9511e4f59f93b015411cc3084fe1a7a75 SHA512 42f5efd626946ff7825be47ba9b2729216342213a1e886eb969f27a9c3757db1ac788d03592240156386c201de7457e1366df37a838da582b4f2afbc07f4f7a5
-AUX nDPI-3.2-0001-Added-fix-for-serialization-loop.patch 916 BLAKE2B 85c6f19146c2eb5b50fd524f6584566d9abe81e55b2c5d108f0022577201170ac48ee9f3240935416988cb37df90efeb12e38bc46b9428bd946da7c463d748bb SHA512 430881fcec23252aca4de4786b16abbc6845d879872560b268dcd6c5dc36b8d4f6ae6888103efcc7d4e4dd91f00c3e3e10dcf52ae5811b97e3877605ede41968
-AUX nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch 2643 BLAKE2B be3d1a9bd632d4b1837d22248af94179debd48e4c99715553839f1f630cd0aec2ce345953d8f8fa1d01c682b6a466f565e850343541bf3a1a92d49a55d912d5b SHA512 41d849d2a1e204c82779896f5561cdc20ed1a4aa62391255bf7ef862589e1260ddd77bb44c6a9462cb3cc80d9de0aca731c8f78e3c06ca69dbead66a09b26018
-AUX nDPI-3.2-0003-Fixed-invalid-allocation.patch 794 BLAKE2B 3f8814e0c836dd0d2f05f5516154c43624a9b9cbf4a24f63a47334e808cc9e28fdc3c51d31f743dfb62fc8ca13187ed21e66122d50a03fd4d6bdaff85f49069d SHA512 2b20d6b92497dd23f72d2c486f32b749dc2e2b86547443629b57dc00aa163155eebef2d5ea123386f257a582e437f886787421ce2232be0f7d35853b6997cd4d
-AUX nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch 6861 BLAKE2B a5e3c17b895167da57ec472444bb5933eca44120c4281a455e494c1ab62806619f3eb860ba1deaded8049a03c4953d2c4c8951187c1aabddfc3ae7d5e8bebc95 SHA512 173ff8a9568cf2e56e0ea1a271de0090f02fd2a0bc17be6e02b1bfed0327ddc78014fbe6f2fc5850eb5a2141f133cdc70f2ce614ff5f6e820cb577cfdb8d5513
-AUX nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch 1063 BLAKE2B 75774a72b8d9b6814cf5a7b9f68bdabd07ec1703805807f6e4c46bc1392d0044b7513019e35a04b0209bcc34088bdb49b98f1c6eba72162a7c5665d14c3397a2 SHA512 68f17871e32de9abb1f5fa1e73d5ffbf29e906ee8088d28c764d140833c64ab41ec1fe97f0b8a6d5ccdc65c9f7beac31500508303f74dedf5ab84327a2a56c86
 AUX nDPI-3.4-configure-fail-libcap.patch 911 BLAKE2B 6f376334d7c53a2a6c6a0e5babea2c6e2c1c744159b9113e5346e4fd312e42487655f728ca838d32e26a681287b795f0f9236fc70db9f626dbf1526e4c654bcf SHA512 638a1c0a791459f8cdcbdcc71ff16eee8ca43a1d1fd4346b61f30b127b5bd5047f7bf86c87c23784001588b029e35a633bd73423066839bffac754162a86f4bd
 AUX nDPI-3.4-fix-oob-in-kerberos-dissector.patch 882 BLAKE2B 189f3bbd5b209d7b7ea8d1febd06901dea20acc7153fc8ece674f7f67c2217e946ae519af77b9553e8938f7bd90e7c56e1c68849c78726f828d0fec9cbf80f86 SHA512 1aa8201959872163cc4864745149700982ef0188e4a341b0a33e9eb0b1afdf5d9dc244fad070b32ceb0fce7b9dc42622cd4e7a327a42ff24e10ce0211d3da984
-DIST nDPI-3.0.tar.gz 26902734 BLAKE2B 79380ce5138b8ba99169ce3a2afeaa2a2bcded9bc7834d32af6911e9cee60395613a390d2d5d0530b9ff9263ad707e78f49d35098428c66a9c95a98aee2d8df8 SHA512 74c4a41201e809b476f4c23b99c2391b7bcbc76507a11261d216caf2350db8fd4ae3dac69d1d2179b12217901da1e04676aeca05d3a8e63d1a162469b33ab4c0
-DIST nDPI-3.2.tar.gz 29586049 BLAKE2B 4ea7f1cf39b5363b724c2db84c006de2f0e05ea275586241c3e1b9a53681f1da83dc752e69d379d6b8c8bcf8b15b146e8a2de127931d3b2061112aef297f7d79 SHA512 bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
 DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
-EBUILD nDPI-3.0-r1.ebuild 966 BLAKE2B c0b61a5243af862d1373a734ba8f0ffe8f95c40bb0ffac40dc72b1bca0a704eece2893d4c8d876744ee298a05243b21490f89218d9c493f7cdcd4ae4c3da2527 SHA512 8f0e6004fea392c1573477976b83de81e2bb3467bbcf4ffa18817f79c5b1cca00a6c35fbeccc753e41edbf7a8d15d1dd74bd68bd2af9d4726265c60bf8a3ebbe
-EBUILD nDPI-3.0-r2.ebuild 1176 BLAKE2B 57e01bdf62c55c2c69f1bd64599a1838eb050371ac0f18e5beca7d453840e1abee0aea3cce222ce044fb7f9a084e5030459164eac680af892b897fdc8f1c1d10 SHA512 c82c47552699b3feaff9e2007fa357c0eded3175b28fa5817d64c35283fed2e9ed7499a5ac0944664243a859fcee4e41db0d1382eb8c0cd52bafec3388702724
-EBUILD nDPI-3.2-r1.ebuild 1750 BLAKE2B efc6ab0d48a8d5db4237d1f8b59705c9e489cfc2fafd431339c9a2c7a90ae3e9a28c9ea17313f34ed1912f93be7c9d32ce2528ee40960fbf354e6fc807b3ab2b SHA512 cc1662b4a436d51e586ebc67b4c4c88440e85203586a2fddfcb6c9d6593969665a6890b4b6211e717b4bbf4cd80230834af0a1dd1a8f1c14e6df63799f0c507e
-EBUILD nDPI-3.2-r2.ebuild 1816 BLAKE2B 1ff85ae67f95fc476ee4ec7c72d68b22f5bc559ac4e791297b3daff664f7fc2c85a8e432f69e6d7e107accc5dea99183600233f65bd2f641decd40d69697208a SHA512 a014ffa4d3507fa55fadf149b832a1f02adbb3ce8b148b24c46cec186a680f2c04c7a79b78c4e5cdddbf13d3e9be68acbadd428c15a07c185e389375e6792028
 EBUILD nDPI-3.4.ebuild 1542 BLAKE2B c33be0c27e0521e4b75b10a0fd49b8f208120fff45653c9f9da4f8320c7d31b25df5374e33fb8517551bdda081029eb14e5db2278fdaa1c6ab28ed45e13ce9de SHA512 e3825dab00f2e399df07f6753f2e53900d5caaf9f41da325f30ee4c2ed7669f08278b2b96e12c06fad6057eae4587c909de3222b50982f63afb26cec7e206e11
-EBUILD nDPI-9999.ebuild 1293 BLAKE2B d69406384a02ff5fa67aabcf6d97183b362b4fcf7bfb06fa4ba95e53469007305e197459e9250b4be800a89506a3542df3abf07ab60aef3d9aab93bcca5daa0d SHA512 6def195805ee8aff6339bb0a38a098048a95391b6aeed6319946d550e79aac36251d23d4401854b043e7f46003490d15736b67b1c3af044ffcc11b939bc38ff3
+EBUILD nDPI-9999.ebuild 1285 BLAKE2B 7f9f9faabe4713bf484bdbb0b91ff2f78831f74943627c67a550241cf7f120a65b12bd18c89fbbfb1bc052b613ef6c96d5bdafd2ecde3d5803c21b4b9edaa237 SHA512 796059fe7321238a0b5aafa7db7b439c4bd1b8f4b7c0a3d865a453a1ecbdf2a7d535fc88ff0b6eab1cda6a0758221fe9da71cc9e2cd14e889f14cf3eb41fa89b
 MISC metadata.xml 292 BLAKE2B b19942da80630c9c576f1ee8c3a6d150dcdc2fa587b10cf175d0eb440c7a2d07224d795e84dbc54647822524598399c4e483e72cd359df926fb76d2909729383 SHA512 16a16e996a75b5a2833aa6cb54df6d8ee9c643987df0addde6c21e01fdf9a6c68c804048e6fa3ea8ad583c654d786b59246b0d7c176a3e234e6de32b066dc5cd
diff --git a/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch b/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
deleted file mode 100644
index db26330d699f..000000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 15bb7ae4339cc2a4a626a52fcf49abfb1d237d65 Mon Sep 17 00:00:00 2001
-From: Alfredo Cardigliano <alfredo.cardigliano@gmail.com>
-Date: Wed, 26 Feb 2020 09:55:24 +0100
-Subject: [PATCH] Check NULL strings in ndpi_serialize_string_string
-
----
- src/lib/ndpi_serializer.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
-index 05b346bb..9a3cd0bd 100644
---- a/src/lib/ndpi_serializer.c
-+++ b/src/lib/ndpi_serializer.c
-@@ -1270,7 +1270,8 @@ int ndpi_serialize_string_binary(ndpi_serializer *_serializer,
- /* Key is a string, value is a string (strlen is used to compute the len) */
- int ndpi_serialize_string_string(ndpi_serializer *_serializer,
- 				 const char *key, const char *_value) {
--  return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), _value, strlen(_value)));
-+  const char *value = _value ? _value : "";
-+  return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), value, strlen(value)));
- }
- 
- /* ********************************** */
diff --git a/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch b/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch
deleted file mode 100644
index c2fbf28383fa..000000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7b2f89ef25eafdd76e8b540f1d8ba1fdec185ef9 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Fri, 20 Mar 2020 18:05:52 +0100
-Subject: [PATCH] Added fix for serialization loop
-
----
- src/lib/ndpi_serializer.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
-index 9a3cd0bd..80221005 100644
---- a/src/lib/ndpi_serializer.c
-+++ b/src/lib/ndpi_serializer.c
-@@ -1054,8 +1054,12 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
-     */
- 
-     return(ndpi_serialize_string_uint32(_serializer, key, value));
--  } else
--    return(ndpi_serialize_string_uint32_format(_serializer, key, value, format));
-+  } else {
-+    char buf[16];
-+    
-+    snprintf(buf, sizeof(buf), format, value);
-+    return(ndpi_serialize_string_string(_serializer, key, buf));
-+  }
- }
- 
- /* ********************************** */
diff --git a/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch b/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
deleted file mode 100644
index 69aa892d2d11..000000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From e4512dbcb9e1db0500290b712257e501d1440d71 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Tue, 24 Mar 2020 12:18:15 +0100
-Subject: [PATCH] Refresh of ndpi_netbios_name_interpret
-
----
- src/include/ndpi_main.h     |  2 +-
- src/lib/protocols/netbios.c | 15 +++++++--------
- 2 files changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/src/include/ndpi_main.h b/src/include/ndpi_main.h
-index c909adc7..9335f215 100644
---- a/src/include/ndpi_main.h
-+++ b/src/include/ndpi_main.h
-@@ -132,7 +132,7 @@ extern "C" {
- 					       u_int16_t** tcp_master_proto,
- 					       u_int16_t** udp_master_proto);
-   #/* NDPI_PROTOCOL_NETBIOS */
--  int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len);
-+  int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len);
-   
- #ifdef NDPI_ENABLE_DEBUG_MESSAGES
-   void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
-diff --git a/src/lib/protocols/netbios.c b/src/lib/protocols/netbios.c
-index 19cffeb8..1c65b185 100644
---- a/src/lib/protocols/netbios.c
-+++ b/src/lib/protocols/netbios.c
-@@ -35,17 +35,17 @@ struct netbios_header {
- };
- 
- /* The function below has been inherited by tcpdump */
--int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
-+int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len) {
-   int ret = 0, len;
-   char *b;
--  
-+
-   len = (*in++)/2;
-   b  = out;
-   *out = 0;
- 
--  if(len > (out_len-1) || len < 1)
--    return(-1);  
--  
-+  if(len > (out_len-1) || len < 1 || 2*len > inlen)
-+    return(-1);
-+
-   while (len--) {
-     if(in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') {
-       *out = 0;
-@@ -53,7 +53,7 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
-     }
- 
-     *out = ((in[0]-'A')<<4) + (in[1]-'A');
--        
-+
-     in += 2;
- 
-     if(isprint(*out))
-@@ -69,13 +69,12 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
-   return(ret);
- }
- 
--
- static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct
- 					    *ndpi_struct, struct ndpi_flow_struct *flow) { 
-   char name[64];
-   u_int off = flow->packet.payload[12] == 0x20 ? 12 : 14;
-   
--  if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], name, sizeof(name)) > 0)
-+  if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], flow->packet.payload_packet_len - off, name, sizeof(name)) > 0)
-     snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name);    
-   
-   ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS, NDPI_PROTOCOL_UNKNOWN);
diff --git a/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch b/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch
deleted file mode 100644
index ba8353eef98f..000000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From cd4f8051ddfd1bae53393174462c823cf5e15ec0 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Tue, 24 Mar 2020 13:39:12 +0100
-Subject: [PATCH] Fixed invalid allocation
-
----
- src/lib/protocols/ssh.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/protocols/ssh.c b/src/lib/protocols/ssh.c
-index f3b50b60..6813b2a9 100644
---- a/src/lib/protocols/ssh.c
-+++ b/src/lib/protocols/ssh.c
-@@ -294,7 +294,7 @@ static void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct
-     ndpi_MD5_CTX ctx;
- 
-     if(msgcode == 20 /* key exchange init */) {
--      char *hassh_buf = calloc(packet->payload_packet_len, sizeof(char));
-+      char *hassh_buf = ndpi_calloc(packet->payload_packet_len, sizeof(char));
-       u_int i, len;
- 
- #ifdef SSH_DEBUG
diff --git a/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch b/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
deleted file mode 100644
index 04f264d52ddd..000000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 60e3ac6b39cb25c974785b8ccc49edaae458a891 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Fri, 3 Apr 2020 15:31:23 +0200
-Subject: [PATCH] Fix for serialization of strings where the first element is a
- zero len string
-
----
- src/include/ndpi_typedefs.h | 10 ++++++----
- src/lib/ndpi_serializer.c   | 36 +++++++++++++++++++++++++++++++-----
- 2 files changed, 37 insertions(+), 9 deletions(-)
-
-diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
-index 98b8ccf8..2c513e26 100644
---- a/src/include/ndpi_typedefs.h
-+++ b/src/include/ndpi_typedefs.h
-@@ -1446,10 +1446,12 @@ typedef enum {
- #define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192
- #define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024
- 
--#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
--#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
--#define NDPI_SERIALIZER_STATUS_EOR   (1 << 2)
--#define NDPI_SERIALIZER_STATUS_SOB   (1 << 3)
-+#define NDPI_SERIALIZER_STATUS_COMMA     (1 << 0)
-+#define NDPI_SERIALIZER_STATUS_ARRAY     (1 << 1)
-+#define NDPI_SERIALIZER_STATUS_EOR       (1 << 2)
-+#define NDPI_SERIALIZER_STATUS_SOB       (1 << 3)
-+#define NDPI_SERIALIZER_STATUS_NOT_EMPTY (1 << 4)
-+
- 
- typedef struct {
-   u_int32_t flags;
-diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
-index 80221005..57c61604 100644
---- a/src/lib/ndpi_serializer.c
-+++ b/src/lib/ndpi_serializer.c
-@@ -43,6 +43,14 @@
- 
- /* ********************************** */
- 
-+static u_int8_t ndpi_serialize_is_not_empty(ndpi_serializer *_serializer) {
-+  ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
-+  
-+  return(((serializer->status.flags & NDPI_SERIALIZER_STATUS_NOT_EMPTY) == NDPI_SERIALIZER_STATUS_NOT_EMPTY) ? 1 : 0);
-+}
-+
-+/* ********************************** */
-+
- static u_int64_t ndpi_htonll(u_int64_t v) {
-   union { u_int32_t lv[2]; u_int64_t llv; } u;
-   
-@@ -442,14 +450,17 @@ int ndpi_serialize_end_of_record(ndpi_serializer *_serializer) {
-     if(!(serializer->status.flags & NDPI_SERIALIZER_STATUS_ARRAY)) {
-       serializer->buffer[0] = '[';
-       serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used],
--					buff_diff, "]");
-+					       buff_diff, "]");
-     }
-+    
-     serializer->status.flags |= NDPI_SERIALIZER_STATUS_ARRAY | NDPI_SERIALIZER_STATUS_EOR;
-     serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_COMMA;
-   } else {
-     serializer->buffer[serializer->status.size_used++] = ndpi_serialization_end_of_record;
-   }
- 
-+  serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-+  
-   return(0);
- }
- 
-@@ -556,6 +567,7 @@ int ndpi_serialize_uint32_uint32(ndpi_serializer *_serializer,
-     serializer->buffer[type_offset] = type;
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -607,6 +619,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
-     }
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -660,6 +673,7 @@ int ndpi_serialize_uint32_int32(ndpi_serializer *_serializer,
-     serializer->buffer[type_offset] = type;
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -713,6 +727,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
-     }
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -761,6 +776,7 @@ int ndpi_serialize_uint32_float(ndpi_serializer *_serializer,
-     serializer->buffer[type_offset] = type;
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -811,6 +827,7 @@ static int ndpi_serialize_uint32_binary(ndpi_serializer *_serializer,
-     serializer->buffer[type_offset] = type;
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -851,6 +868,7 @@ int ndpi_serialize_uint32_boolean(ndpi_serializer *_serializer,
-       value ? "true" : "false");
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -908,6 +926,8 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
-     }
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-+  
-   return(0);
- }
- 
-@@ -967,6 +987,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
-     }
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -1030,6 +1051,7 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
-     }
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -1056,7 +1078,7 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
-     return(ndpi_serialize_string_uint32(_serializer, key, value));
-   } else {
-     char buf[16];
--    
-+
-     snprintf(buf, sizeof(buf), format, value);
-     return(ndpi_serialize_string_string(_serializer, key, buf));
-   }
-@@ -1111,6 +1133,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
-     }
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -1174,6 +1197,7 @@ static int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
-     ndpi_serialize_single_float(serializer, value);
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -1232,8 +1256,8 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
-     ndpi_serialize_json_post(_serializer);
-   } else if(serializer->fmt == ndpi_serialization_format_csv) {
-     serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
--				      "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
--				      value);
-+					     "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
-+					     value);
-   } else {
-     serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_string;
- 
-@@ -1241,6 +1265,7 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
-     ndpi_serialize_single_string(serializer, value, vlen);
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
-@@ -1320,10 +1345,11 @@ int ndpi_serialize_string_boolean(ndpi_serializer *_serializer,
-     ndpi_serialize_json_post(_serializer);
-   } else if(serializer->fmt == ndpi_serialization_format_csv) {
-     serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
--      "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
-+      "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
-       value ? "true" : "false");
-   }
- 
-+  serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-   return(0);
- }
- 
diff --git a/net-libs/nDPI/files/nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch b/net-libs/nDPI/files/nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch
deleted file mode 100644
index cd34875890cd..000000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6735bb35c65c60a777557c3277546d5801729995 Mon Sep 17 00:00:00 2001
-From: Alfredo Cardigliano <alfredo.cardigliano@gmail.com>
-Date: Tue, 21 Jul 2020 00:46:37 +0200
-Subject: [PATCH] Fix oob in kerberos dissector
-
----
- src/lib/protocols/kerberos.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/protocols/kerberos.c b/src/lib/protocols/kerberos.c
-index 2bacbf51..2ed824fa 100644
---- a/src/lib/protocols/kerberos.c
-+++ b/src/lib/protocols/kerberos.c
-@@ -185,7 +185,8 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct,
- 
- 	      body_offset = koffsetp + 1 + pad_len;
- 
--	      for(i=0; i<10; i++) if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
-+              for(i=0; i<10 && body_offset < packet->payload_packet_len; i++)
-+                if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
- #ifdef KERBEROS_DEBUG
- 	      printf("body_offset=%u [%02X %02X] [byte 0 must be 0x05]\n", body_offset, packet->payload[body_offset], packet->payload[body_offset+1]);
- #endif
diff --git a/net-libs/nDPI/nDPI-3.0-r1.ebuild b/net-libs/nDPI/nDPI-3.0-r1.ebuild
deleted file mode 100644
index 42766ed5abf6..000000000000
--- a/net-libs/nDPI/nDPI-3.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/json-c:=
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_prepare() {
-	sed \
-		-e "s/@NDPI_MAJOR@/$(ver_cut 1)/g" \
-		-e "s/@NDPI_MINOR@/$(ver_cut 2)/g" \
-		-e "s/@NDPI_PATCH@/$(ver_cut 3)/g" \
-		-e "s/@NDPI_VERSION_SHORT@/${PV}/g" \
-		< "${S}/configure.seed" \
-		> "${S}/configure.ac" || die
-
-	sed -i \
-		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
-		src/lib/Makefile.in || die
-
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-	fi
-}
diff --git a/net-libs/nDPI/nDPI-3.0-r2.ebuild b/net-libs/nDPI/nDPI-3.0-r2.ebuild
deleted file mode 100644
index 50396b2d9db3..000000000000
--- a/net-libs/nDPI/nDPI-3.0-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/json-c:=
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_prepare() {
-	# Taken from autogen.sh (bug #704074):
-	sed \
-		-e "s/@NDPI_MAJOR@/$(ver_cut 1)/g" \
-		-e "s/@NDPI_MINOR@/$(ver_cut 2)/g" \
-		-e "s/@NDPI_PATCH@/$(ver_cut 3)/g" \
-		-e "s/@NDPI_VERSION_SHORT@/${PV}/g" \
-		< "${S}/configure.seed" \
-		> "${S}/configure.ac" || die
-
-	sed -i \
-		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
-		src/lib/Makefile.in || die
-
-	default
-	eautoreconf
-
-	# Taken from autogen.sh (bug #704074):
-	sed -i \
-		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
-		-e "s/#define VERSION/#define NDPI_VERSION/g" \
-		configure || die
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-	fi
-}
diff --git a/net-libs/nDPI/nDPI-3.2-r1.ebuild b/net-libs/nDPI/nDPI-3.2-r1.ebuild
deleted file mode 100644
index a83b9c1dce9c..000000000000
--- a/net-libs/nDPI/nDPI-3.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/json-c:=
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
-	"${FILESDIR}"/${PN}-3.2-0001-Added-fix-for-serialization-loop.patch
-	"${FILESDIR}"/${PN}-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
-	"${FILESDIR}"/${PN}-3.2-0003-Fixed-invalid-allocation.patch
-	"${FILESDIR}"/${PN}-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
-)
-
-src_prepare() {
-	eval $(grep '^NDPI_MAJOR=' autogen.sh)
-	eval $(grep '^NDPI_MINOR=' autogen.sh)
-	eval $(grep '^NDPI_PATCH=' autogen.sh)
-	NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
-
-	sed \
-		-e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
-		-e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
-		-e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
-		-e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
-		< "${S}/configure.seed" \
-		> "${S}/configure.ac" || die
-
-	sed -i \
-		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
-		src/lib/Makefile.in || die
-
-	default
-	eautoreconf
-
-	# Taken from autogen.sh (bug #704074):
-	sed -i \
-		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
-		-e "s/#define VERSION/#define NDPI_VERSION/g" \
-		configure || die
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-	fi
-}
diff --git a/net-libs/nDPI/nDPI-3.2-r2.ebuild b/net-libs/nDPI/nDPI-3.2-r2.ebuild
deleted file mode 100644
index 12a23bb316ae..000000000000
--- a/net-libs/nDPI/nDPI-3.2-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/json-c:=
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
-	"${FILESDIR}"/${PN}-3.2-0001-Added-fix-for-serialization-loop.patch
-	"${FILESDIR}"/${PN}-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
-	"${FILESDIR}"/${PN}-3.2-0003-Fixed-invalid-allocation.patch
-	"${FILESDIR}"/${PN}-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
-	"${FILESDIR}"/${PN}-3.2-0005-Fix-oob-in-kerberos-dissector.patch
-)
-
-src_prepare() {
-	eval $(grep '^NDPI_MAJOR=' autogen.sh)
-	eval $(grep '^NDPI_MINOR=' autogen.sh)
-	eval $(grep '^NDPI_PATCH=' autogen.sh)
-	NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
-
-	sed \
-		-e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
-		-e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
-		-e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
-		-e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
-		< "${S}/configure.seed" \
-		> "${S}/configure.ac" || die
-
-	sed -i \
-		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
-		src/lib/Makefile.in || die
-
-	default
-	eautoreconf
-
-	# Taken from autogen.sh (bug #704074):
-	sed -i \
-		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
-		-e "s/#define VERSION/#define NDPI_VERSION/g" \
-		configure || die
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-	fi
-}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
index 6e8aa6700933..bd4ac3459b84 100644
--- a/net-libs/nDPI/nDPI-9999.ebuild
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3 multilib
+
+inherit autotools git-r3
 
 DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
 HOMEPAGE="https://www.ntop.org/"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 5584c90c23e3..9be3ba2dee74 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,7 +1,7 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
 DIST nghttp2-1.42.0.tar.xz 3973284 BLAKE2B 39431619bd3c9a66eb217065bb29ceba8f3fda376343687b4774ed5e73c634f51142b407f9515ae5ad4363af5cf57c0199f9bfddf5bc08dc587419ec03cf5b45 SHA512 1d93e6262c5538e26fbf36567230b4a239dbdfee26198b1e1d5862bf4459ae435679674c047407f5c604ddff91d7717d8515532e00bcdb2aa75f27ff97dce60c
 DIST nghttp2-1.43.0.tar.xz 3973500 BLAKE2B 0e6c674486c484558a55822501a13ac93c4e890cf62749bc8519690f468912701329b7b9e83b0b68c3f35b72442b1ed47a90050cccd3fc05d79622e1e26634dc SHA512 eac69ba356870a1cba420a06771082897be8dd40a68f4e04223f41f3d22626e4f5b3766d3dbcc496dd212be01f64c3ac280a2ebddd31dd88f7350c20f56e5d39
-EBUILD nghttp2-1.41.0.ebuild 2009 BLAKE2B 4a7a37c6b445be8f5e84a5fba2a5982c33037ad04de4cca1bdd869d600f7416945277510803ad9fe657edf94bf6fee914d75ab4a5bcaa92dfcc223ac36a7ba32 SHA512 5e5dfb11026419e9dfa6101dbd5617ac77dbd3c2fd1877bbf73bf8a88b545aa29c7dbdd7551d54fdb2b07d0ea0d6c6342f0ec67be096f3fbb2766548c4aa3d94
+EBUILD nghttp2-1.41.0.ebuild 2010 BLAKE2B f4754dda18050bde613583d5a7d812c343b6cd63fb4c5aae3bf6fb6fbf48898e4f3a98904e9f19f781b89a1e87fe458d6e6ef42fb537a4984322416476284cd7 SHA512 43aba1520701432892869be2e355afbe5d9182a0edefa44b0320528b41b3e6af55456f383d1480f9daf5dfd196c196eed7b63c311ad32a8966e047274a7f8a49
 EBUILD nghttp2-1.42.0.ebuild 2070 BLAKE2B c24af6d6e8172d24e4a5e15432c6101f6635cc9716d674e80ad685b6f7e1a11f4bf1167fba151fd5f5e81b72e9f2596ef98922138c1b4d2cb658e45106a2f8de SHA512 73ba9c34b5b6be48dc0f3c5749c265a6e888a1de78d14a6edc753b8f82e2b60f586fd71318a0af961e84450e361db97b6b022c8cad74dffc25da20190bac9f5a
 EBUILD nghttp2-1.43.0.ebuild 2087 BLAKE2B ff351fe44bff28d63add114e327f74e5408db5c24cded448ba6511088fb38b55f4e61b3dfffef51d61d3b5b3ed285ef24866d855a3a7d1f4ecb8ba085b580bb5 SHA512 c3371aa0b45058935357ce4676de42e53b54f1bc198d658376dce4f55affdcea51dc67a4a634a609e953ff62e8fd38dcc43454b3d1ed8c5b78697edf6c13a9ef
 EBUILD nghttp2-9999.ebuild 2050 BLAKE2B 273e15faa5e5b28ed25865970e382c39403aa593bd9391ecb579a77585fbbffcca0342eab5d8e0f444338de6c6d1228be301c4c4e03667da9b601bd65489ba81 SHA512 20017f0c1183e58f4d76989c533c01eb202237b9c6cbf72776dca442b898bde08a375f8641bc2beefa70b687f2811501b06ff7e0dacca3a5df5f3e104c8e146e
diff --git a/net-libs/nghttp2/nghttp2-1.41.0.ebuild b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
index 1673a2300ef0..4e440e370c50 100644
--- a/net-libs/nghttp2/nghttp2-1.41.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest
index 2bab7bf0eba5..cb598166fc42 100644
--- a/net-libs/nghttp3/Manifest
+++ b/net-libs/nghttp3/Manifest
@@ -1,4 +1,4 @@
 DIST nghttp3-0_pre20190912.tar.gz 155172 BLAKE2B fabd472e429222502288b7a4030b4aa51f8a1b609590d63b51ab3f918b8cdb462b766a40911986b3f72f2f1b0debee1f0ebdf8802991bf4fc5d4a6d14297bdcc SHA512 89c7b40843bde9d2c2ab24211794b6ae0e1fa15413e92dcf2238b876552f29bb2f0db724d9a205c2a1c98f25a14ef570c9e53df52fb519230b6f78dcc04d2117
-EBUILD nghttp3-0_pre20190912.ebuild 951 BLAKE2B 4339d45c0adaae610beac5b92d535a9e7096ec116c00044cb742e1b932ca1780a8c68b095748467b6aa3828f9926df1e8077a468aba4b253e9285eeb7f12af0a SHA512 08ae274e8f6988065a157e41415fba0040daa558e6b0f380aae410c33d0cc8085508f128eba573d7030516d1d7c344519f06cd72e5f8b056e0654b00e98007bc
-EBUILD nghttp3-9999.ebuild 853 BLAKE2B 18f4a885cbb2e6760300b799d9f114bab49d6ad4e78708241c9bd10a74fa273d56ebc660e45bc92a51c3204f55e9fb3e7a1a5e8dd566bf09a8c63ed2a6e000de SHA512 c1cc2f3e6b24bd9882c53db39c77a320d0775f4b9de415ade0d0c65f74ea2b5d427807dc9f1777451f046850d07d39aa56a30283a4589f9fdbd661aba2129ae8
+EBUILD nghttp3-0_pre20190912.ebuild 941 BLAKE2B a4cc64ea20ab706571df94c2e2a581b0c49b29fcf0c3a63e75752c98f205ee29e89c0ae0d4be0fb4d20040c60522a0f38fb2ea520cac2ceae99b8cb3fd4cefd6 SHA512 3f6f808136cdaefade5647b44ede3ba70abcc9163e197ab913e78d251862de232d85a5bc5361880431490b3012d273d3bdc8277a0e0256d7a94d7cf842cf25d8
+EBUILD nghttp3-9999.ebuild 843 BLAKE2B 8d644057250bae499c19da70a8cd6ec7d9c8963c7559ed91604b4024f1f924e6ce84ef4c6b7a3133881ec286b0ba1f2253cfeb2450fec9aa3eb4ca93f8e4c24b SHA512 2bc088e72cd1e6f4891ee08a36f6aba03d435dbb6872c56f785557e607eeb7090ae6add9996475056f85456e846c043d6128335cb9b755a683049d77ad61e3f2
 MISC metadata.xml 326 BLAKE2B 04521fe96f519c53e0a95a6a720be2e9828cb12ca5b51c6895d23e01e99d88d6b9970a5b01cdc9fc158444c01fd77e192a9071445f389df300e0fe9ec5c0d7f4 SHA512 02b24b1a01a3682c089affbba8f49eb19e1751362aa51306b9fd73e1050d465cf98511be57374321eb9b4fbb99db6c867995b9dcc1cc511b96d7286c039270bf
diff --git a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
index 75b9c45b8a13..f397afa4b9bf 100644
--- a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
+++ b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	GIT_COMMIT="51379a041174ad953dc6ad437712f3b279f81919"
 	SRC_URI="https://github.com/ngtcp2/nghttp3/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild
index 3c8a6602bf51..3cfc00cf046a 100644
--- a/net-libs/nghttp3/nghttp3-9999.ebuild
+++ b/net-libs/nghttp3/nghttp3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~hppa"
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 828ded9b8b38..10ca493d5c09 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,4 +1,4 @@
 DIST ngtcp2-0_pre20190912.tar.gz 302984 BLAKE2B 906b248b0c19395288ed2c5ad55c8d42a9df9d76458104785c1013b9ebfaf1b92a4b87ced8755377fcb627018cf8854be0e4687e4c8a23ae994e5a21f466f739 SHA512 91b93575143960af421e8bd37d686602905fa3093750cfbbe3af1b20d743318281d22162676dc451562768ca08b6d0767b1dc28f3f8f6733235ebd76015a05bb
-EBUILD ngtcp2-0_pre20190912.ebuild 1093 BLAKE2B cdff51ef64cb949a2d7f692c701faebba9c12a8004d0ed0d10d8e144f91638164328ff5c60d36912eef33c31a99fa8d63d4343af739d3ffc9e7c60fcb678a8f1 SHA512 95b2b4a83f6f5e88067f93c88a14d55e7787bc98055fb5522e0215224596bb3c34915bf187a488887624236d1a569c416160352ece7cb08df8c8b02774e7646e
-EBUILD ngtcp2-9999.ebuild 995 BLAKE2B fcb32c83e68b86462c1eeb2bc061178b98ad4496a30e6523ba1c0f7c038dd86df4fc9904d8b536f149b739810a55752eddf8c5ccfe65eaa2d934420216b8252a SHA512 6bcb3f22e0ccc66dbb95b74bb692262990157cb40b3e4e5baec1c8ac9e06ab01e5d3735c5d211773cea8ca54c4c74910725e3dfba9f64b50ce43d5f4eb3ee13e
+EBUILD ngtcp2-0_pre20190912.ebuild 1083 BLAKE2B 285f80c7ebf4cb3fa9ab7b74a39894f09ce0a54f89463082b2923858ed1b2c41fb6a35bf4cd0cce78e793acd28d8a46ae8d4e71c36a2ebdab76f57870129c717 SHA512 de01dfbf633ff6ee98407924c27ec4d655d3549305978faa4b22fbe5028bd08ea354489679decf12c75c2188559b8eab21e04166c42865a881c79a9fb807fe59
+EBUILD ngtcp2-9999.ebuild 985 BLAKE2B e17250a0c0c02ad53500ec3e73420e878530f37b6f5364a260da37ffa7f3fcaa2f45ca820971c2c71075e40247350efd3d57a55556a876810ef4c9100c34a3a3 SHA512 13dac2bda9f4eb281f50bdf008c095f6b3de6e5fa0772bc553993525259ddac9909ff15e7080b7ab1d0a7162e2569a6862a80bc2b0f761259e7a622f3c85aa25
 MISC metadata.xml 326 BLAKE2B 04521fe96f519c53e0a95a6a720be2e9828cb12ca5b51c6895d23e01e99d88d6b9970a5b01cdc9fc158444c01fd77e192a9071445f389df300e0fe9ec5c0d7f4 SHA512 02b24b1a01a3682c089affbba8f49eb19e1751362aa51306b9fd73e1050d465cf98511be57374321eb9b4fbb99db6c867995b9dcc1cc511b96d7286c039270bf
diff --git a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
index b50e3d700512..36e82902fc0c 100644
--- a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	GIT_COMMIT="5122d9e5e1e91c718ebc3933252ee42522c6e942"
 	SRC_URI="https://github.com/ngtcp2/ngtcp2/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index fb6cddf993db..e1fef793bf0f 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~hppa"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index b3e2e9a2339d..71a8c380db37 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,15 +1,20 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 AUX nodejs-12.20.1-fix_ppc64_crashes.patch 1788 BLAKE2B 48a5c5343b654fe57f021644c063b98db32bc634dc1ac5ef4ef9fbc3a1988ae3c7ae51ca989715154f5167ce985b742806de667bf6126bcf535f0ebae448b5ce SHA512 804347c985e59c9e3852af4c3d807ebaff95f1afe88a6ec5785baef51ba6ab9b3257d202fdddc5daa982fd06324a8f828f7d8dca8f99e071c52decea6cb00b83
+AUX nodejs-12.22.1-v8_icu69.patch 2923 BLAKE2B 0e4da87a091dde4f84a980d43223f8d085b50e4cb16fac66d0a275a2257f8b61e1a2996e8a4a469f282c1a7ab622d9b9183b1801818af3ca40051fb4661e8f12 SHA512 e30ecb75b3fdf33cf9efa74250e4b91ab9ebfb81cce4d6f926c6a04cc20bf8222f68b2af4eecbbcd77fa5bc922b8a62be8fe8d918e309baccc09dafa40029e10
 AUX nodejs-13.2.0-paxmarking.patch 2710 BLAKE2B 9e63761ce7160434f7f9e5ef76ffd4d0fd61deb24cacd9ac4736bcc74145090d730c6b1d0a60cf9c815a08f22c7925e0719dae835a0ede0b65bb8af53418e016 SHA512 e5aae8fd9758fc1dbfc77f9dbfb62b90941a4b2e9e06a6d70f47aa6462d120e61a1774ba8526b2033161195040326d1b5ad643a816552154ff69a8e2548b3d70
 AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23
 AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396
+AUX nodejs-14.16.1-v8_icu69.patch 2938 BLAKE2B d69206f4903c63df7bf1882bc9d41510a30d2c8bac8141ac08b949578b17e842761edeb10295b95b7aed96cf1ca38c6bdb3bc4b83d8fe2b795a39d50d779f883 SHA512 55933a40c9ca46b2a00a9d6ba6a2b5f08ce0b85692b602b38b05c323c46778f267c8ac5f960661165b4221c8ea84f92bd5957773b9a5e6ff49277a258df3e380
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
+AUX nodejs-16.0.0-v8_lto.patch 1332 BLAKE2B 75807eecfca7275afdde465ad20d558822e06488ecfc9d22a0e57826abafb3f3b66f77484fcdc078142ba7293d627a25d7d3ccdfecc7610cb076f919900c794c SHA512 26e4e1a64356800de20609543ddbac2e5adad04faf28962cbbfcb6499e3a9d38e391f945353ac3f5e9f997dfb666aa3260b0296e55317f9aa2c8c3f4bd894003
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v12.21.0.tar.xz 23650552 BLAKE2B 532eef3e77d78aa1b6f30ebdc1dee88ed95280c86e44db525ce369cb1c2d9707a30a1a4ec2d8e699f7c1a14ada036fc4d62d0f0c7fa017e72768662768bbbf18 SHA512 48df48a12657e3a2366cd80a1a7040365b7a90053676230f1f93f253a1fcdafc5bc1df5b5ec5c13f616277b5feb7e7653cd145ab9c23222bf7702d7cd1fa74eb
-DIST node-v14.16.0.tar.xz 33301140 BLAKE2B faf380e8f02ea2e6084601fece1e9d3119aeabcebc844fd22a79c18e27cf54f0cd470971cc5a86277a226e59950f511e1173828565bdda1c1f06c52b144cba6f SHA512 ac6f7408df35e2bae8bcad3f461d8e260a2762c77f78d737b0339a592724ff1a98ba171a95e44366e731accfb3208e7cfd6d3edd0f646ddc26a01cfbdbbb655b
-DIST node-v15.11.0.tar.xz 33285300 BLAKE2B 50f38e46faa7a7c206bf6f82827643c4f6c06ed3e1bc8a12f06badc024b88e801e749524123134146547e7af3403110db11a5d1717a2a91c0ccd875ef91de457 SHA512 e6c7d6fb2f7008d911a63c120cf7f82fb78eff2b57a934f57e6c8294be3b16f0ab982b828989772f04199e609d2dc0c90067ec517ec1e27991f1275e0ced204a
-EBUILD nodejs-12.21.0.ebuild 6349 BLAKE2B 08f6f25f315071349f666e05b1f72bc84c5cb0051c1bb57ee9c0d0dd6d4c788d9dbddece7f50499a093cb163ccf3ed31f3775bef8d62e7316c5acfca9d2ee77a SHA512 b97e404361cb96d7052f0af64143840404f129d700fd1d00c0dfccfd0ab14b33ad1a804fc5df0f73baaa62b4d7065afc4cfdd8100329e27ab91fe4bdcf718f77
-EBUILD nodejs-14.16.0.ebuild 6046 BLAKE2B 33b0f4ceee6472129bebeb1db5d9f2f73028e5695eec5f92a877f63b1a33e41f80c8d119774dd0f002032e3a28debdc2a2040109165b9c39bd2a716925a38d4a SHA512 1c598f9699aaa8750455aa38717f005e3ff2284a8cc801a56e4a789c96f298503d7db9ff258c526dfcb0b4986c9f60a900671e25e35b999bd4a71325bed70e4e
-EBUILD nodejs-15.11.0.ebuild 5676 BLAKE2B aee7588049a09db4823eca4588623562e7b0f812f41f03681be5372579ed8eab9bdc38ce2c353e40de9c7fa6da05068be289d6319c1757b1cbfbb361b71c8d02 SHA512 9bbab3ef03347a9530079d12c221ce785770349f155e056a8ea39eba42c48f9cce2ab1315fd8ca9532f0cee354c2192c5072cc29cfb43bd77229f80a205d74f7
-EBUILD nodejs-99999999.ebuild 5810 BLAKE2B 09269b4cc4195a868bb354481ae05dd3c6e8e87f0cb9ce5c4d29ac109f089356b9e8cda637e6811c4d54b3ef8c3d4612524b5d31ad64544acb44337dbaa0b027 SHA512 564ba9370405160da4596f6719b35ceb056c4ca4622c22f8a4ec592494496e73f18dcfb68f1dddfe04f989aaa2465c46118d15c811363b7eb21a75a6444c79a9
-MISC metadata.xml 940 BLAKE2B c1a7dbc678f50529afe12abaa96e87bd065d1bdb88e6ca4d7d58373b282a5d6c6920e43623ce71bc83affb54cc323e6d24df8841dce8001e1cb598dd96b0d4a4 SHA512 87c823b94b22026cbf333671f6d28928de66c5aee29fbe0d9773c4c35415ffc3f7e31559530cfda4f4f2a0a9dcb4964e0c3304c002182c4c17de785e842c0fee
+DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0
+DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
+DIST node-v16.0.0.tar.xz 33784448 BLAKE2B 3286cf6522074cb7b17dce8fce642204777fef26fd4bdb904fdef638061913a1eccda13b8e2f170906dd9098500c8fae7eaea7275e41bf97ea6d9fdd644b215c SHA512 6b976a8959079751bfdece15614a6286088d9145fc4db4ae048aca2ede4b7e38e86e91b1722be51eb4c934749a144a745e425ccf118bed9848c30ff254de2557
+EBUILD nodejs-12.22.1-r1.ebuild 6502 BLAKE2B db0d5b6d59a5ccd8ba664fb2ae26556974645bee3fcf3f80ae939191a6edc2b0de57534f07e53c1b22660a93419085813043285dd0a8b20c035361bdfbe554fb SHA512 f5ea68dc5d4af6eb21c1919c2babc9eb811a69fd8ab28d74d23791b366becf7e6dfaef2b46ecbada92ca8f8213263ceb7cf7faf532551cf71510041cedabd255
+EBUILD nodejs-12.22.1.ebuild 6412 BLAKE2B 7e5671b07a93b739c8b3a84730f0a873dc18c6746fe25a112ef8efc6bcc44c5c68a4df3eb16cea05cbe0ef786857a4b417c463ae3469d3d09c1d1bb1ae5e1725 SHA512 b38fef7e77ac63f589d52b4836483aaa36ec36597f130e83334b3a59a9bc7e7c98fa3d2ada868472db556240b355ebf4415b656823adc60b5f1965a010e97a4a
+EBUILD nodejs-14.16.1-r1.ebuild 6350 BLAKE2B 59f5551677f92602d6b3436dd0a4fca69c46482d5cf374957c1305ebdde0d1047f70f7360fba4670d52149fa1ad0c460b31bdbf34c4424b1f6b5279aed69b4f2 SHA512 1b10ad0e445953c3c258d4e16e4211ba40a229ea49808070c26bbcc53c4f3cc29dae2eb89e8ec8c1dec95a3443cd505f79e99702d2bbcf1ba4797963e58b7d5b
+EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 55b923b81044645154639c0768f2905b612dcea70e703451bc5bb0868f17c7c635017ab9d390cff31c2903e0b0226e5c5c0a5323d73eecb3ea730ca7ace83cc7 SHA512 017c31360f866ea46b435dcf1ba84cb8075bcdf3925da51e1c81a0b3f0a73e3b4f31b0192ea6efa890e64eb9d3ccf548fc57f17bb44f5c20c5cdf0736b287eb3
+EBUILD nodejs-16.0.0-r1.ebuild 5972 BLAKE2B dad7e624c9dee18f61b4d3a3d04655906e9365d0060c61c3761bb346add4187a4ea3c10d2c08b9486fe7d9d1530b1c359474c60a5db4126f1284c240e48f8f18 SHA512 e0c7e5f2003b667c163efa8b8e5512e0e45357b02c09acd450a3d1f09da0be6a70232a170ea2a0c290c47b35ecfc4c3d4fbf11d29426293b8fd3f6391e8bc245
+EBUILD nodejs-99999999.ebuild 5829 BLAKE2B c6c38b692df78a6292fda7f651ab9be5502f202d4c69831c4ae639b873e7d5b846899f245e88bb49bcbfe154750e6512dab01223e57c3188dae61112696b0a65 SHA512 ecc304e439c60d1f7f64e448e81eb12675fda7f8471b0a6341711c435509de81c90eb170c63a4c2b9f4cc5fcbd8fc604c40d6affa41d827f4f5ec46f474f0ae9
+MISC metadata.xml 1000 BLAKE2B 4785dba31037ad28281266047c8e59cd1d3e0e723128831f3aebc0436727b41c283284a450b5c619868e0317d3bc61e239a85e0d47773e9867f2606d5dd59047 SHA512 6556cf00ea009b394a56de614226b8cf0e04e868f47d827dba1907b5d89b957d738e4529b6338126cff9ccbd573c4451e9c2d5d4f93e4e4dad376e88419ef489
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-v8_icu69.patch b/net-libs/nodejs/files/nodejs-12.22.1-v8_icu69.patch
new file mode 100644
index 000000000000..bd6d5c64b02d
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-12.22.1-v8_icu69.patch
@@ -0,0 +1,85 @@
+Port of the Chromium commit 035c305ce7761f51328b45f1bd83e26aef267c9d to node-v12.
+Original commit message follows.
+
+Author:     Frank Tang <ftang@chromium.org>
+AuthorDate: 2020-10-15 22:44:27 -0700
+Commit:     Commit Bot <commit-bot@chromium.org>
+CommitDate: 2020-10-20 02:08:13 +0000
+[Intl] call new ListFormatter::createInstance
+The one we currently using is now marked as internal and to be removed
+for 68. Migrating to the style which already avaiable in ICU 67-1.
+
+--- a/deps/v8/src/objects/js-list-format.cc
++++ b/deps/v8/src/objects/js-list-format.cc
+@@ -29,46 +29,27 @@
+ namespace internal {
+ 
+ namespace {
+-const char* kStandard = "standard";
+-const char* kOr = "or";
+-const char* kUnit = "unit";
+-const char* kStandardShort = "standard-short";
+-const char* kOrShort = "or-short";
+-const char* kUnitShort = "unit-short";
+-const char* kStandardNarrow = "standard-narrow";
+-const char* kOrNarrow = "or-narrow";
+-const char* kUnitNarrow = "unit-narrow";
+ 
+-const char* GetIcuStyleString(JSListFormat::Style style,
+-                              JSListFormat::Type type) {
++UListFormatterWidth GetIcuWidth(JSListFormat::Style style) {
++  switch (style) {
++    case JSListFormat::Style::LONG:
++      return ULISTFMT_WIDTH_WIDE;
++    case JSListFormat::Style::SHORT:
++      return ULISTFMT_WIDTH_SHORT;
++    case JSListFormat::Style::NARROW:
++      return ULISTFMT_WIDTH_NARROW;
++  }
++  UNREACHABLE();
++}
++
++UListFormatterType GetIcuType(JSListFormat::Type type) {
+   switch (type) {
+     case JSListFormat::Type::CONJUNCTION:
+-      switch (style) {
+-        case JSListFormat::Style::LONG:
+-          return kStandard;
+-        case JSListFormat::Style::SHORT:
+-          return kStandardShort;
+-        case JSListFormat::Style::NARROW:
+-          return kStandardNarrow;
+-      }
++      return ULISTFMT_TYPE_AND;
+     case JSListFormat::Type::DISJUNCTION:
+-      switch (style) {
+-        case JSListFormat::Style::LONG:
+-          return kOr;
+-        case JSListFormat::Style::SHORT:
+-          return kOrShort;
+-        case JSListFormat::Style::NARROW:
+-          return kOrNarrow;
+-      }
++      return ULISTFMT_TYPE_OR;
+     case JSListFormat::Type::UNIT:
+-      switch (style) {
+-        case JSListFormat::Style::LONG:
+-          return kUnit;
+-        case JSListFormat::Style::SHORT:
+-          return kUnitShort;
+-        case JSListFormat::Style::NARROW:
+-          return kUnitNarrow;
+-      }
++      return ULISTFMT_TYPE_UNITS;
+   }
+   UNREACHABLE();
+ }
+@@ -170,7 +151,7 @@
+   icu::Locale icu_locale = r.icu_locale;
+   UErrorCode status = U_ZERO_ERROR;
+   icu::ListFormatter* formatter = icu::ListFormatter::createInstance(
+-      icu_locale, GetIcuStyleString(style_enum, type_enum), status);
++      icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status);
+   if (U_FAILURE(status)) {
+     delete formatter;
+     FATAL("Failed to create ICU list formatter, are ICU data files missing?");
diff --git a/net-libs/nodejs/files/nodejs-14.16.1-v8_icu69.patch b/net-libs/nodejs/files/nodejs-14.16.1-v8_icu69.patch
new file mode 100644
index 000000000000..d1e204f0c5d4
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-14.16.1-v8_icu69.patch
@@ -0,0 +1,84 @@
+Port of the Chromium commit 035c305ce7761f51328b45f1bd83e26aef267c9d to node-v14.
+Original commit message follows.
+
+Author:     Frank Tang <ftang@chromium.org>
+AuthorDate: 2020-10-15 22:44:27 -0700
+Commit:     Commit Bot <commit-bot@chromium.org>
+CommitDate: 2020-10-20 02:08:13 +0000
+[Intl] call new ListFormatter::createInstance
+The one we currently using is now marked as internal and to be removed
+for 68. Migrating to the style which already avaiable in ICU 67-1.
+
+--- a/deps/v8/src/objects/js-list-format.cc
++++ b/deps/v8/src/objects/js-list-format.cc
+@@ -29,46 +29,26 @@
+ namespace internal {
+ 
+ namespace {
+-const char* kStandard = "standard";
+-const char* kOr = "or";
+-const char* kUnit = "unit";
+-const char* kStandardShort = "standard-short";
+-const char* kOrShort = "or-short";
+-const char* kUnitShort = "unit-short";
+-const char* kStandardNarrow = "standard-narrow";
+-const char* kOrNarrow = "or-narrow";
+-const char* kUnitNarrow = "unit-narrow";
++UListFormatterWidth GetIcuWidth(JSListFormat::Style style) {
++  switch (style) {
++    case JSListFormat::Style::LONG:
++      return ULISTFMT_WIDTH_WIDE;
++    case JSListFormat::Style::SHORT:
++      return ULISTFMT_WIDTH_SHORT;
++    case JSListFormat::Style::NARROW:
++      return ULISTFMT_WIDTH_NARROW;
++  }
++  UNREACHABLE();
++}
+ 
+-const char* GetIcuStyleString(JSListFormat::Style style,
+-                              JSListFormat::Type type) {
++UListFormatterType GetIcuType(JSListFormat::Type type) {
+   switch (type) {
+     case JSListFormat::Type::CONJUNCTION:
+-      switch (style) {
+-        case JSListFormat::Style::LONG:
+-          return kStandard;
+-        case JSListFormat::Style::SHORT:
+-          return kStandardShort;
+-        case JSListFormat::Style::NARROW:
+-          return kStandardNarrow;
+-      }
++      return ULISTFMT_TYPE_AND;
+     case JSListFormat::Type::DISJUNCTION:
+-      switch (style) {
+-        case JSListFormat::Style::LONG:
+-          return kOr;
+-        case JSListFormat::Style::SHORT:
+-          return kOrShort;
+-        case JSListFormat::Style::NARROW:
+-          return kOrNarrow;
+-      }
++      return ULISTFMT_TYPE_OR;
+     case JSListFormat::Type::UNIT:
+-      switch (style) {
+-        case JSListFormat::Style::LONG:
+-          return kUnit;
+-        case JSListFormat::Style::SHORT:
+-          return kUnitShort;
+-        case JSListFormat::Style::NARROW:
+-          return kUnitNarrow;
+-      }
++      return ULISTFMT_TYPE_UNITS;
+   }
+   UNREACHABLE();
+ }
+@@ -143,7 +123,7 @@
+   icu::Locale icu_locale = r.icu_locale;
+   UErrorCode status = U_ZERO_ERROR;
+   icu::ListFormatter* formatter = icu::ListFormatter::createInstance(
+-      icu_locale, GetIcuStyleString(style_enum, type_enum), status);
++      icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status);
+   if (U_FAILURE(status) || formatter == nullptr) {
+     delete formatter;
+     THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError),
diff --git a/net-libs/nodejs/files/nodejs-16.0.0-v8_lto.patch b/net-libs/nodejs/files/nodejs-16.0.0-v8_lto.patch
new file mode 100644
index 000000000000..a3e4acb02c3a
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-16.0.0-v8_lto.patch
@@ -0,0 +1,39 @@
+From ea694e2b138d2f991989e09fc0e964fec3587b5f Mon Sep 17 00:00:00 2001
+From: Jesse Chan <jc@linux.com>
+Date: Thu, 22 Apr 2021 19:41:09 +0800
+Subject: [PATCH] tools: disable LTO for "v8_cppgc_shared" target
+
+"PushAllRegistersAndIterateStack" is implemented in assembly and
+called from "stack.cc" via 'extern "C"'. [1]
+
+However, LTO does not work well with symbol usage from assembly. [2]
+
+This change workarounds the issue by disabling LTO for the target.
+
+With GCC 10 and "./configure --enable-lto", compilation succeeds
+after this change.
+
+[1] v8/v8@c10863153
+[2] https://gcc.gnu.org/wiki/LinkTimeOptimizationFAQ#Symbol_usage_from_assembly_language
+
+Refs: #35957
+Refs: #38335
+Signed-off-by: Jesse Chan <jc@linux.com>
+---
+ tools/v8_gypfiles/v8.gyp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index ccb5984f47d..377e12d1fdc 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -1378,6 +1378,9 @@
+           '<(V8_ROOT)/src/heap/base/worklist.h',
+         ],
+         'conditions': [
++          ['enable_lto=="true"', {
++            'cflags_cc': [ '-fno-lto' ],
++          }],
+           ['clang or OS!="win"', {
+             'conditions': [
+               ['_toolset == "host" and host_arch == "x64" or _toolset == "target" and target_arch=="x64"', {
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index db1b9aefa8e0..15befbfa251b 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -12,6 +12,7 @@
 	</maintainer>
 	<use>
 		<flag name="inspector">Enable V8 inspector</flag>
+		<flag name="lto">Build with link-time optimisation</flag>
 		<flag name="npm">Enable NPM package manager</flag>
 		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 		<flag name="snapshot">Enable snapshot creation for faster startup</flag>
diff --git a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
new file mode 100644
index 000000000000..aa8392c1ff25
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-12.22.1-v8_icu69.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."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			tc-is-gcc || die "${PN} only supports LTO for gcc"
+		fi
+	fi
+}
+
+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
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	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="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		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.21.0.ebuild b/net-libs/nodejs/nodejs-12.22.1.ebuild
index ded3b9963372..3c19482c9e73 100644
--- a/net-libs/nodejs/nodejs-12.21.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.22.1.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	sys-apps/coreutils
+	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
@@ -46,6 +47,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch
 	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 RESTRICT="test"
diff --git a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
new file mode 100644
index 000000000000..02e8c08318b3
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate.
+RESTRICT="test"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.16.1
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	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
+	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-14.16.1-v8_icu69.patch
+)
+
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			tc-is-gcc || die "${PN} only supports LTO for gcc"
+		fi
+	fi
+}
+
+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
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	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="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		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.16.0.ebuild b/net-libs/nodejs/nodejs-14.16.1.ebuild
index b80ad78525a0..a8e2612d7c83 100644
--- a/net-libs/nodejs/nodejs-14.16.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.16.1.ebuild
@@ -34,6 +34,7 @@ RDEPEND=">=app-arch/brotli-1.0.9
 	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
 BDEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
+	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )"
@@ -42,6 +43,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-14.16.1-v8_icu69.patch
 )
 
 S="${WORKDIR}/node-v${PV}"
diff --git a/net-libs/nodejs/nodejs-15.11.0.ebuild b/net-libs/nodejs/nodejs-16.0.0-r1.ebuild
index 4228e1c6eee2..e9e14a673451 100644
--- a/net-libs/nodejs/nodejs-15.11.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.0.0-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
@@ -34,6 +34,7 @@ RDEPEND=">=app-arch/brotli-1.0.9
 	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
 BDEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
+	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )"
@@ -41,6 +42,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-16.0.0-v8_lto.patch
 )
 
 S="${WORKDIR}/node-v${PV}"
@@ -48,6 +50,12 @@ S="${WORKDIR}/node-v${PV}"
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			tc-is-gcc || die "${PN} only supports LTO for gcc"
+		fi
+	fi
 }
 
 src_prepare() {
@@ -94,6 +102,9 @@ src_prepare() {
 src_configure() {
 	xdg_environment_reset
 
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
 	local myconf=(
 		--shared-brotli
 		--shared-cares
@@ -102,6 +113,7 @@ src_configure() {
 		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
 	if use system-icu; then
 		myconf+=( --with-intl=system-icu )
 	elif use icu; then
@@ -173,8 +185,8 @@ src_install() {
 		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
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
 
 		local find_exp="-or -name"
 		local find_name=()
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 0ff4f3923029..110b22734b40 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ RDEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	sys-apps/coreutils
+	virtual/pkgconfig
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )
diff --git a/net-libs/openmq-cclient/Manifest b/net-libs/openmq-cclient/Manifest
index 7f83d984c2e8..c1805818fa26 100644
--- a/net-libs/openmq-cclient/Manifest
+++ b/net-libs/openmq-cclient/Manifest
@@ -1,5 +1,5 @@
-AUX Makefile.in-4 1877 BLAKE2B cf373e35ecdc205b92864af496c30e464e24d59dbf175396b5edfd13b04943ff61d9271eee1e616eaec5c669fcb99809bbf665980207f7e4c270a7c20efd46d7 SHA512 ea4d441035f275df31c28a05100377b40e7ae282767f74e247bfba31739b7f6462d5e94938bfc4aac6c4f2d78c792a10d941e01e5b8e0c9cf412bf7d878dcf33
+AUX Makefile.in-4 1883 BLAKE2B bf24c8bc1c6082eacfd82560da59f8997b65d9181103e5ef95b49cb9850e1cb5d6937f69baaccec6bcb3f9bbbd4924f5e0f546ac303e828092571abb42aa9ff2 SHA512 0a003cbcd36f0b83ffbd8f8b16a0b836b086d811ab6485446b4138f5765f94e24b1a78cd2cd4c43864dd5a6f886b141bcf4948d7fe2420ad6a8953dec04721ea
 AUX openmq-cclient-4.4.1-aix-gcc.patch 376 BLAKE2B 14f7a71079468da60aa30a422d79dce2be877928d63cf4c4e802639b94df10afa37d2f41c735f4987067a1a2e564c757016e40ae03cb9612b2a97263af690d7f SHA512 c7899238b90072a26a8bf1700940d30218d59629b8acea8699f101948f2d659ea684fb73ba560adbbe171c36eec3ae244a9f1707349647213518a654d48c5725
 DIST openmq4.4u1b7-final-source.zip 6892740 BLAKE2B 0101648b1688411579b5d1133714b79af24788a548643546de80a708028a1c08af92e2534767eb0bd9f9eddbb16e77a1884880a5d4f9cbe4f0166dbce0b2045e SHA512 4bc51a3bc0a82ae41998ae3d60912d807ff069d6165ea9cfdc1c6eefc9e57b00ad91d6ed2efa032e76be744db3328511bb02023d14a64bd3b64c8667982fbe8c
-EBUILD openmq-cclient-4.4.1.ebuild 2034 BLAKE2B ac02d8d893e6120f449d83a283f4fed379b4e3b791c3b4ff21d519ca8c75a818e54166f590a59d5b56ea5f88d66f5af8e12d650d19c30b33e213e88ae6f97d3d SHA512 883e898b3bcde3070ec5e477c93ef6d94658dd4e02fbfde9a4b53498e686e4990416ef91e884088f32849c6639884731ae9df8b5970802aa5f943b2f9e50577e
-MISC metadata.xml 864 BLAKE2B 5b7d8beccae5cf49a47e7986c9720788b8e307b48d45e9890a70dd268d31c7783fbabc2ff616ed82ed6af87dfbd25aabbfb082a220578ad73d2598700dc3c29d SHA512 beb566a77afec231f42d0f44dc4442c621a6341c40716d44f68f32ad517be715925635b721e57a714f38780afa90fbb30e85fb9f8350ef930309bfa0ebcb811a
+EBUILD openmq-cclient-4.4.1.ebuild 2064 BLAKE2B 77ce681c4f8c5cef8f6dbf477c94153a86d9893feec41be3fc3e50f80295390feacdc12a977c104a82c8937f402ef8f2d262011922ee0e3af4f2b1b37d23a7f7 SHA512 fc68b3be57a76a0b2b7b888440aef6ee38abe8ad787d1e6a8957da73f06aba1470de75113feab79a4c0e72458c6ae9aec0ab751c4841a74356a240d5c24f179e
+MISC metadata.xml 778 BLAKE2B 5dcd2b934208e6c8226aa2b1518ba7989da48dc165cfdd6c62506cd67b93f1b61389653933893fa849aafaa6b334f7d1612c33dfa73143be8a043be5c052fca4 SHA512 1530b03bd7e55fa1cb32c7fe2cf065a8c756f181c6a88330d653f0539f29593c8830d20e488b7e0a5d96775ae47f3bc9c90742b94aaea14e0c146ea002865de9
diff --git a/net-libs/openmq-cclient/files/Makefile.in-4 b/net-libs/openmq-cclient/files/Makefile.in-4
index 8d536b927566..188f5ed472da 100644
--- a/net-libs/openmq-cclient/files/Makefile.in-4
+++ b/net-libs/openmq-cclient/files/Makefile.in-4
@@ -18,8 +18,8 @@ LTCC = $(LIBTOOL) --mode=compile --tag=CC $(CC)
 LTCXX = $(LIBTOOL) --mode=compile --tag=CXX $(CXX)
 LTLD = $(LIBTOOL) --mode=link --tag=CXX $(CXX)
 
-NS_S_PR_CFLAGS = $(shell pkg-config --cflags nss nspr)
-NS_S_PR_LIBS = $(shell pkg-config --libs nss nspr)
+NS_S_PR_CFLAGS = $(shell ${PKG_CONFIG} --cflags nss nspr)
+NS_S_PR_LIBS = $(shell ${PKG_CONFIG} --libs nss nspr)
 
 SRCS = $(shell find "$(top_srcdir)" -name examples -prune -o -type f '(' -name '*.cpp' -o -name '*.c' -not -name '*Test*' ')')
 LTOBJS = $(subst .c,.lo,$(subst .cpp,.lo,$(SRCS)))
diff --git a/net-libs/openmq-cclient/metadata.xml b/net-libs/openmq-cclient/metadata.xml
index b06234150687..48f45063424b 100644
--- a/net-libs/openmq-cclient/metadata.xml
+++ b/net-libs/openmq-cclient/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>haubi@gentoo.org</email>
-		<name>Michael Haubenwallner</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Open message queue is an enterprise quality, production ready, scalable
 		messaging server. It provides a complete Java Message Service (JMS)
diff --git a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
index 11ea9ac736ca..4cd376fd7ca6 100644
--- a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
+++ b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit autotools epatch versionator
+inherit autotools epatch toolchain-funcs versionator
 
 DESCRIPTION="C-Client Library for Open Source Java Message Service (JMS)"
 HOMEPAGE="https://mq.java.net/"
@@ -14,7 +14,6 @@ MY_BUILDV="b7"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 if [[ $(x=( $(get_all_version_components) ); echo ${x[3]}) == '.' ]]; then
 	MY_PV=$(replace_version_separator 2 'u' $(get_version_component_range 1-3))
@@ -79,6 +78,7 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export PKG_CONFIG
 	econf --disable-static
 }
 
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index f788e6debf5e..b87198b57e41 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -1,3 +1,3 @@
 DIST ortp-0.23.0.tar.gz 540135 BLAKE2B 46bc411df48f7f8a2fd180ff75dc5f515c36a71bcaced0d3fcf5336ee8e142c6ae6d597ba39a92c38be78ce74d3eb79692f26596f37075829850222cdf381793 SHA512 70560168f1b138ad825e4e836e7ee218bd24b92a2d76666ba2794a4b31cadbdd8fdd40fee78d612187cde6a827005cbd836cdfc13a70947374356fb84a853ea4
-EBUILD ortp-0.23.0-r1.ebuild 1853 BLAKE2B cfee7efd2e97ef8e7eaab5db43b9aa61ab6d6186b27d8ac36024cd7082291fbd68e2012aa6e73b8e203e9248e822a52f044d1a7e2614dcc37002e0f83f98b104 SHA512 044280143c1a646fc34256379ea3f0eb37053b59e0e6a195858d598bcfbd602d741039435aab294620f1092314853ef15072e0433caaffc07a5f26efe3ad0622
+EBUILD ortp-0.23.0-r1.ebuild 1846 BLAKE2B c5a6446d8bd5bfeb4763ad0eef68de5c6261b73577aad218f7698b44d235de74d24b39ea5c485930e7555c4c3fd76e76cbcfe23af2b31ca676e762ec7bd5397b SHA512 c166f61acb3a8635b46bf66c809e769f34c2941c541341a2dea9711535f68f691bb05c34e11d62cc036bd412628c54d9e662ce267fdc2b1445999a5eaf9c843e
 MISC metadata.xml 362 BLAKE2B e561cbf846ef904afde531f0cdba64d3855a93766622d90a393e45f0d5ad3da533afac394ba031edbb4afa6ca8a4b95c101f76f2f96450edecaf617ea24dc996 SHA512 6a9fd13fe951f0cdd6574a83f53a0c21324fa9cf45c878e71fe1c6aefa6a52ca8e285f2d433d2bd62723241b59793c06d66e4e9f6f8be1530f8377de224a66c7
diff --git a/net-libs/ortp/ortp-0.23.0-r1.ebuild b/net-libs/ortp/ortp-0.23.0-r1.ebuild
index bdfff063191f..8694c0c18b9e 100644
--- a/net-libs/ortp/ortp-0.23.0-r1.ebuild
+++ b/net-libs/ortp/ortp-0.23.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils ltprune
+inherit ltprune
 
 DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
 HOMEPAGE="http://www.linphone.org/"
diff --git a/net-libs/pacparser/Manifest b/net-libs/pacparser/Manifest
index a5239655b167..5fc7a60f5fca 100644
--- a/net-libs/pacparser/Manifest
+++ b/net-libs/pacparser/Manifest
@@ -1,3 +1,3 @@
 DIST pacparser-1.3.7.tar.gz 905596 BLAKE2B 122127b6e1d8f68fde4c5ca98207bf2a0fa2a081dbb60aaf34126700a3de9d861e7b5f881e78d3eefdd2a9af97a9ba677339ca2b2a0b4459d26e60a62226e839 SHA512 979238204cd352ecf502a5a6216a35d7c47e82a173c32c6f0a5166f1fe790c66ac74ec1d9d0a58b54038d19e893f8b365ed868664f84ab9d5e653584bf20130b
-EBUILD pacparser-1.3.7-r1.ebuild 1726 BLAKE2B be23ba557045082675408d7de0a8fdf0ce2a4e0e076f341579bd170113a7ef07d90e0deaee776e97bb08bb4779efa8cf89f53ee7cf81415a46d5a86b355cf113 SHA512 4c72a372c1e5a98ef19f9963387e36a0938d797c24761d6ca1af3c7170989a804854c8229affbadf19a976b967d3cb5f8cb8ced856cb0c9cffc4eaf58d521d22
+EBUILD pacparser-1.3.7-r1.ebuild 1723 BLAKE2B 56b6e9a324c029e5510dfceb9d16cd3e0b74e70c188791b37d30003dc45fe17991d282713a8cb2870d4e11b7b8526229a2ef77a7dd6c9eacd21b992fe701aff1 SHA512 b6a02afc1553f7a75df066012d564827d26140642ac4e7de8b8c62d04a5eb887c9ff35723737422031d934385756faa2d5de452d44f651d9f1b4559d05f8ff9f
 MISC metadata.xml 1156 BLAKE2B 6c4e195b94172823c0dc6bbf426c2d8a31d83a0bb7044efa92b9f07f846fa7a2e0ecd4f49678eb517ddeaca43f18942ca9256bc92909cbd1242ed2cfbdbc39de SHA512 e391221061937896f5f27a4d77f959756afdfd1c58f47f4ac5d27e2f289ca70bd7907c86efc6114ec02d03b6f5a88fd3b8d5755bf97dae6e613d7835f2c71704
diff --git a/net-libs/pacparser/pacparser-1.3.7-r1.ebuild b/net-libs/pacparser/pacparser-1.3.7-r1.ebuild
index 5c1ad492aa63..2991d284b661 100644
--- a/net-libs/pacparser/pacparser-1.3.7-r1.ebuild
+++ b/net-libs/pacparser/pacparser-1.3.7-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit eutils python-r1 toolchain-funcs
+inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Library to parse proxy auto-config files"
 HOMEPAGE="http://pacparser.manugarg.com/"
@@ -22,7 +22,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # spidermonkey-1.7.0 is bundled
 # tested unbundling with spidermonkey-1.8* and 1.7
-# and got many failures : unbundling not worth.
+# and got many failures: unbundling not worth it.
 
 src_prepare() {
 	default
@@ -52,11 +52,13 @@ src_test() {
 src_install() {
 	emake DESTDIR="${ED}" LIB_PREFIX="${ED}/usr/$(get_libdir)" -C src install
 	dodoc README.md
+
 	if use python; then
 		python_foreach_impl emake DESTDIR="${D}" \
 			LIB_PREFIX="${D}/usr/$(get_libdir)" -C src install-pymod
 		python_foreach_impl python_optimize
 	fi
+
 	if use doc; then
 		docompress -x /usr/share/doc/${PF}/{html,examples}
 	else
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index afc6f4220fb3..63c9b21ef75a 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -1,4 +1,6 @@
+DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
 DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -6,19 +8,26 @@ DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
+DIST bindgen-0.57.0.crate 199132 BLAKE2B ed5d73da72116acca0124770f6f8e162c161c3375980505a704d3fc73ad20fc8cd81ce59680deb4922def8737914027c1c1e2c9fb4b181ddf114a08522657b62 SHA512 a4bf376aa0f84e625f4c5eed7bdc9775549b0ab9e9edcee708d8b56df6cb49611b7093692e772ed7ad5adb1c3d8055d81b4ff19359a193a5bfb4b200ca8a26a8
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST boring-sys-1.0.2.crate 3121250 BLAKE2B f38c29c9c28a000ffea914e94b7a6284f20d50395a0819f1c7a17230399bc0858054d4ecbc3568e533961faadfecef60cdd13413314d15395165a2ab9e2d24e5 SHA512 b64066d8edd93be7eacb4d3811f960470389cef339c9488a8ace46ce15feed9e147662316bf497a231a07bc86402693897a33432a7b922a3e073f208dd4dbc80
+DIST boring-sys-1.1.1.crate 3301658 BLAKE2B bbc064d2dc0b888e4427702fa15b9123a85f8aac045404ce70fef1d7994ac8d640f9155245c63b4b9489e9c4f7071a4585c62abe23351b8acf9a296a8b9841ae SHA512 23fbcf459c6b7e0023fd572b810de246d4e4e164ca0375b205deba1107a038c167364becaebac44856dd0f8057c72ea3b335fba820ddb8334b4faafb22b38e78
 DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620736f28b29567070e445a12293b460d3c85ff88979abfc74fe7453010ebbcfd64bb2b2d575258d51fab2b1400 SHA512 955e49eeeb803547092b58c086a2582e905578179d93500c1f55dd3fb7a65349f33ddc4c2710c0ee804abbe4e1f2afbdeb998533d362177298a86a4f9a8822a5
 DIST bumpalo-3.6.0.crate 133234 BLAKE2B e59b65a7b3ff3a7a6d2a91c80d16b169dd974a0293e65ef34b5249530e2a6e038bcf56e1c0886e4cd303179a7bcf6302d109136b226cc5776b6451a3eea32b94 SHA512 d7a6d69e1641cc1a120ca64a72e241864288112f5b051973f404bc409be0d77254cd8b31116a508bd8b025b4617cd2ed9ea67f25c3fb9dc5863bbecf436d9761
+DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
 DIST cc-1.0.58.crate 52896 BLAKE2B 118619bbe306aef5cb83350ea04a7660a4af2c365a5f0c30d045cdca73f7d68d6646889295590dff29cbf003b44f9b00d5eab22fcde8a57483aec615278dfbb8 SHA512 0a208c4dd7700ba92337ad0044c0ae1614b105d6e799fc660d07e7745c60d8e4c8d3688af7ced77734a2a695ac2e7c565c2f2b7a886d71714c2f7675ea2a22f7
 DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6
 DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
+DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
+DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clang-sys-1.2.0.crate 36874 BLAKE2B ff4bb39ae79280632aae404566ccde614e059d0a04aeeed1475080755fb07853da63353343b0ad66d97588679f461c7f5e5f69b753372174799c52ee7fc3e7d0 SHA512 64577b5f82878ff465eee0bd5f154522640e9bae7e6d52c1c8b868412a2297ded69b104b85b7ca6b6031d6a6eef60579933cb6502bb7342af1f9aa593428a256
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cmake-0.1.44.crate 14377 BLAKE2B 5922b7dd8618e7982064fd754b1ee54941a4555961bbc832da6fb149afa1317951e4ab710f2a13856aee6af18bfd9612514dc56e795a013c8d4094c8be1fca11 SHA512 7adeb6289fb1072aa739b4f6bbe91f612fbab730c3ea67b6024a31ebfe3fadb2da798495ddabd5cbaaa1106bc4ae185b350f618eca3a72de4ea0a4d526664657
 DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d
 DIST criterion-0.3.1.crate 95450 BLAKE2B d63477b414176eb3b49857b6a6e3f1e30d72e95856756051974bb99289082315bde362dd39254a766480e167707a147b621ae84a887243ece6f865ba784a9210 SHA512 c6beae7350029632206cd201faf3e9aa16fae39e96b9256b702cb4c09b013be88280b2e8b87ec2790c386be8ef6f9e9179482655f3af3ec9e34f8b402fe8bec9
@@ -30,17 +39,25 @@ DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066
 DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
+DIST darling-0.12.3.crate 18933 BLAKE2B 1f817e2f32b8fc6459cec4f05933ad734720ade175c9cd44767b3351f1c07f2a66dedf1c3ce40c14b30d2c18204355d6a2ad65b819c4ead143b4d26b1e6fbd17 SHA512 1e986c70d629e14d67ffee4e9ec1520c04f6f27599dc3a2df3312ace3ef81f435bff9a8573badb8385bddee188db8eaefa35f562fb83a14269e82c4a425eade0
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
+DIST darling_core-0.12.3.crate 49266 BLAKE2B d6286b82db56ebf63d0025b9298eb6cffac91166e90a785ceca4f3785f3c8589f8070a1c96242a3b482c4225f4530cebd34503483ae5b38d83848aae5b6c4bcf SHA512 279e3bf0f3cdd39ce68d6fdc80ab9e390353d2572887d6a25f4659d24dafd962bcd204f047fe19f8216acf08fe1bb2feeccc7c416df795e2d0f3d0fdcb82e9a3
 DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
+DIST darling_macro-0.12.3.crate 1866 BLAKE2B 766fd2d30dffb53553036df283c3cf95c0f472654c222ab44fd9bfe2936ebb688e16ef937990625d1dac2613a689770fb61485f7f9f60b19c71889f1edd044a9 SHA512 e55d05676b9751e5c067d736f3e2446c1d751d8a24607d5bd5d494d660aa474485fb5f781ce1dfc739061683aa4fbf912c12f839869e4ae26d49f385da9bfdf6
 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST env_logger-0.8.3.crate 32543 BLAKE2B 513790f39c63eb096b0fb62687c74262b42b0edc3e6fc2e2f2fdd44463eb4cfbf67560136ec206e252afa1477fabf66917f4fc0e8192e040670f98f3d7c4bb51 SHA512 7f6c3c79b8f4efb8d1d4e4b879c1c78a427f15669244ce1eca869aea9bcad950ffa5b59f3f8e4513e085c2daf1f5857313b374e238fc78b731bba2646ec895ff
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
+DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
@@ -48,17 +65,22 @@ DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7
 DIST js-sys-0.3.42.crate 67017 BLAKE2B a5db2a97a9cc4738d698e3db36c0a1024fc3d60a23dbd0ec4ddd7f887d04a7860b1641729ea4ac24669d98aafaff78d0a3d8a3211f8523e104cd668a11ce2af0 SHA512 5193b77f58741a7cb59ab871d5e66a2629e56c8a036bbe0cd7619e1115e9925e19a5f01f6b0f4854c22f36fcc3c1a335779f5f6923dbd6c617e850247a3c85b5
 DIST js-sys-0.3.45.crate 67143 BLAKE2B ecae52ec5f1cc7a52baf3d82915de57f9351ddf5e9fa35d279336ee2d2d5547e640ab8387d8d85ce9ed2ef02ad63d985d26db0df81b482bd021f8a2bb260dc28 SHA512 34d27c11bbdbfd7745166045ee20c578d3b4b917b5017a24d55349b5064d4f4bfba68dfaf1f16ce7df06ca88f727afd61487e96cab0e480447fdbf920a0ff7e7
 DIST js-sys-0.3.47.crate 67063 BLAKE2B c4c6f0bbc18e6ca8fb01ec052e1f897c69a4fa1276afdfc84d9b0f030ebc267022d5e397ea5e95cbab3e4e62c4b12b51756bc7fd93439ed0c9be506f5090e077 SHA512 28d4d16059421862db91789d9401486708a1e1c32f45717bf18507bc38ae8b52c40f9f7a26fafeb11c335ccf49b552d95225462f6246982a02eb3f2123c8a6b8
+DIST js-sys-0.3.50.crate 67123 BLAKE2B e31d81932e8c219524aca9159013e3e7e24519f154e6789b9b5e23de7da0b89e7ec5bf3f949a28a87a0a9671831d619aff1b84ed0b2011ddb01668b110c4d9b7 SHA512 961f1e2949ae8e662aac866807b2522537ed8756caaeaeca2be837329d6b684dd928aca1a7da9dbc402388625c54177dbc6b8141a1efa4087c78a3240d002d87
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.72.crate 478292 BLAKE2B 23914e92f9ae57a023bbb9bd9cd823cf535ba14ce8d01f171d3223cd227bb9d3884f7596dc2f74c690f7de813da4783e277204dfa690fc1e4f26ee566f1fe32b SHA512 f59caec272f24b8cc29d421baa4ee4145afea8eb9e4a83d8c245602f6bd8de3c91c04008a9920f7f70c9967a3392cc44d8df141c83c6c18d1f14893b21ae4ea0
 DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c
 DIST libc-0.2.84.crate 517732 BLAKE2B dbffb14589552ecb7a6f610afd01feb94d3f5fbd44b5f03eb3f8ffd855d1e8eab4a397e3d40faa854c7ab364a65d11fc05118ecd401b5fe6a6972a82980259b0 SHA512 acbd268e02f360907c6939805973cb45f1f474f71a09efcad9c6a603de9c814a4912764c30ff8c929e06a544bf3e03eac08f42acde33a3edb4dac479f257eaa7
+DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e
+DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 DIST mio-0.6.22.crate 102782 BLAKE2B 8a088fb24797f4b16b6da28fee56a1c8bf1346959905c3501e3d78d16d169125c03495d9e21dc9da4fb6735a48af38b2883544d1c9ea2486d48542fde6ad47eb SHA512 b500b0271779942512c1d02756ee4caf4e00488f6929a06a7be8a46cc44318edaeb80abfaf6367d7201978a3529a6b5424679e07b719ee8194f0dc37aaf56ca5
 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
@@ -67,31 +89,43 @@ DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bc
 DIST net2-0.2.34.crate 20620 BLAKE2B aee9aac0deb14a13c5f90793f1e439c94362403cb329e24607c1970c117bc379049da1b173d1bf827f0e3db38740a2d2e696981daf88c1b2302d81564be5433a SHA512 136ba95ad540545165fc2e34fdb5aab7da8f6b20e7682302ad5796b86cbf3d80b5364679c82caa19151b277f9d18de053968fda779ffff8ac88024940772709b
 DIST net2-0.2.35.crate 20660 BLAKE2B 8bfbbad0c8ccd364f1be6fd67b3087a0dbd7a6301b8133bd28cacca3d32a5baa9dcbbc81cf957bf1591b20512f283e3fd441190e33c3ddc09dea3f9bd5dba251 SHA512 5a5b4ee65654fec31d820a71bc50a0d81555ab661e4d3c1dcafb048588218d6ba347f1ce5423b092f078f3bce55f7c74e33193d1924086bb1d43a5e6efc80540
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
+DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
 DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6
 DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
 DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
+DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST oorandom-11.1.0.crate 9762 BLAKE2B 0589af12d0ad99009655272035738a6a5f57abb47eda2f2dc3be443474cb67cf4808207f95aee0be5417714f1c72c13fca82fdde778565574d670271ee9528d1 SHA512 faf840b52a315125d5f6c80f6101fcbff6ac29217d362915ebbae4f7337c18ecd46b89da96bf67147e84d0f805edb626be0da448af12b0bf537fb0f0a3a25c0c
+DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49cae62cc363a3bac98938328aebd527592270ac4014f558751bcdcf7e4994da5647baf98437200a93849bc9e549f SHA512 f9d8be381ffbb853b9a3bfdb0cf5b29c23fbab9b376ab2cc9a734fb7d573a1ef1ae3a32c5b4f080f534e52505fba1d6051475d62811da01205323420f2045dff
 DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
+DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST qlog-0.3.0.crate 23295 BLAKE2B 1a4216fee65e73f72a85a4227a1765883fd121fe4d0216d28755501b104aeb80dbe5bbe493991c0a2dd635351224f345b283e18e6db2206556b7cf0f3a884c7f SHA512 76a234231b2f4ab7af9ede41525679595083b5faafb3e0e516e08968ee9294f4a0cc74b81df69041b8dcafabdb09494f9cad9a73cbbd1aac3388667d8366dbf7
 DIST qlog-0.4.0.crate 23452 BLAKE2B 219053b98d09189415d45c6487356e565f6240c35508b84dc4b1a1d0d7aff0af8b02889805cc36930c600ec37bdc2941b52d9ca325c719497ee49e5bdbf3228f SHA512 d1ae8fc0ec99ca77946e89c3295183aec551e41f44e5c44178c0b60e997311a6fbce7a44eeafea757303f6f051c3fef08724c85b273dd11014d555f3c5761613
 DIST quiche-0.5.1.crate 3265682 BLAKE2B 1d404317e48a62ac2cb3759aae51f0b91eb87d9c9694333331db528b79cc19a72f0f8da2b0785469ae81237c8b8afa760a4f00b039895330aa8b6e3b3d356ca3 SHA512 7f9af3f104aa788076cf7be2f643c823264cb616dbc9dbafb21afbbdfde4d74edff9e48ef79828ee47e3185215a3177131dec9b48a65e96e8ab4b6214b409fc5
 DIST quiche-0.6.0.crate 3264703 BLAKE2B f5703d86866b4ff11fba3c620e65da26050d744202bb520783c91f9925e030f0bf5ff2c75af02a015006d9b8a3991092df15a523dd316d7973df06c694927529 SHA512 c73a06d8f426193c6a0859a4a1beb453382c6dd67e70e1ea58999a5585d468442ea86457f3dbaed1d6d5dd33fc204a5c9aeed26de1072563d6951c4f386c957c
 DIST quiche-0.7.0.crate 3405961 BLAKE2B e873c97fb6cec335297753f53dc8db74fca8716fb9ef25f5d5d5fbed6e34943205e15eceb4988c3e061e557dfe20efa38c70850938b23d9f5520f89296581e7f SHA512 35d6bb736900c6715dab5a1706729591e884fbf8e652a161ce4b140a799e0d752aa14a414902418a8b97e3e77d27759d61c17a53ba6d8d289238d37bbfd8fb37
+DIST quiche-0.8.0.crate 3522026 BLAKE2B f039c8fa2fbb90201cea4b737d6d8540d4b5f7a558e7034263873fa190bfb3d8c33ae395f4160a40949891a9131ff1f06dfefa131e57cda9fdc6a31d857bbbb6 SHA512 ecab57cf7830c6f4778703f59d55adbd756253fe0bddb1ad4deabab6b5edc213b9e24b849ce8e276952824f93a3a6e52effd92d5fd92ada7a3a3891004c873de
+DIST quiche-0.8.1.crate 3522157 BLAKE2B 69ac246f3de61edf0f0f3f39534c732baa6264fc916c4088e67a5c6a172c1d66d11759b38bd543791fae965b7142922c1a3805a135f9e7fec820f88a4d8e2150 SHA512 053d2312a80a1dd2031d5cd204725321e7c24328903be353f89e15e916aadaa33703e4c0caa7d0afa4aedf5d11c292112ad78fa511db10cc6afd6e329d6c0919
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b91fb0e4dce36401cbc653310c16393c12b73b29d56eb04846e06c04942b7fd41173cd8fcd8dc11046163f7 SHA512 176af1a8148026954e271ece820c67b215223cdf11b80ff4e3229e4871ad87ce9c21c0b5b5c9f1c9e8063102ed0722c3e5194c13bbe77d8688fdf81e0ba8a599
 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
 DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
+DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST ring-0.16.15.crate 5279241 BLAKE2B 1de5d0f5117246e344a04b6958a678d067a93083dfba74b057a48dfe6922bc8b980ecadc94fbf76ef996dfd7ff3cc7b2da6a4c7c9ae31fb6dc334a3b7a377533 SHA512 17c72ba204cdbc80856bc588dea220d2475a2dd1e2990ec9bf76fe4c0acae8a91a8fd532127e2ce679b43be0a52bc05dcda309744876d8faf0c50de0bb8c399a
 DIST ring-0.16.19.crate 5195787 BLAKE2B 308feafd2a3a673ea47b4e62b94352a070cdd8f91369bde9d1612b6627a6ab387d33e6a8a612e66bda396935d90b3d8e0c718eefc627060f40c879792eaed907 SHA512 86dff6211232c6175c395d8716dc767929841efc34af5f2892d1661e794dffd20bd7df3cb1f68f1fef57ae4636398f9d0be8ad0c2925067545e6bad2d3f023bb
+DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST rustversion-1.0.4.crate 16704 BLAKE2B d1ab318021d96bc62d6f202685c9c48e8e3624370bb42f9e7172d51d9b8dd412fcbd22cc267eb55279e2799dfab74ec64f82e6ee36f822e4f2465baaa6fb2532 SHA512 d15a79acc524ceac97a01b1083e109c1eb4b9d4ae6113b77b335a222667c18048a776afa7634200fe21c022812ed90282e09a472aa227c734f09d6ffee62a528
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
@@ -100,70 +134,97 @@ DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
 DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
 DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823
+DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
 DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
 DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
+DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
 DIST serde_json-1.0.56.crate 114541 BLAKE2B 1e393b296983b55d6f516f87ac0b3222956e3ecd7e088955f430c0957642ba59f6d7e927bd924b30f8ca989a04f611078b5c05690d8b1195a0e8b0d11f1b6412 SHA512 ee937a1449701235984a71c9e92035251019d922eccf29e1dc95cdfa008e9bae614650949d8536a5a42ae7b8decfb419b75ec5285b1f85618750efbad24cb11f
 DIST serde_json-1.0.59.crate 114956 BLAKE2B 27552d21b80d88cc3c643b25e5f0105c0d79a7c74c5bc3c2cdcc68050103ad73b75f7ee9d1d5afb60adbae33c351091b180cb1f8aa17c80f06cce4fb4c57f2d8 SHA512 2f9bf96fa770f9be9c43fc889e1671e9bb883f49a820aa69a1709d9f679f21f01cef2b771eea4d1fe7994cf850af44577710521fffdc4cc46d0dc6f913842075
 DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594cfe80b6b6a810f8c36479550f56f085cbd7e693d3c27f307bf0b49eefd34f55bef1872a4a0318797e4b9585cce9e SHA512 ff626602b547fa8e48c37251d2f6c91633fd45b49ed8211e66a3174f52f9aafe8778238466e7deb5d5477ed23eea0091596d78894e0967d6978f6737ae115891
+DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST serde_with-1.4.0.crate 25789 BLAKE2B d91f5fed9ef2f3a8b7a8973e69ffff0715bb0bc0e2c9e92b263139ff54f2c325926db9312d402ef6b47006ccce6d951835896893b1d27738f22f066e61e64260 SHA512 702034da0c16c57b8f66301619f9323bfdfcb4943b4a6c4df89508345b6ace57b1caa6b3b2d662eff9c9df6ddb313d2fb2ef85d7f8a79bdb986eb832cc716b89
 DIST serde_with-1.5.1.crate 49687 BLAKE2B 6acae2c78b47fd5d4d17f2111f0a14ed2d76be93c1113adfb151b3dcbfa1ec48deb163bbc020ebb230c8263bd3f7e351c1b86fad84a33788b816b59fd9d92ef0 SHA512 4b961006c59c0c8cdb70d6ce7bb99f5ffd49e6ab782e8d20125b7495f5e4425c950ed60727affb8d7aedcad6b735af6505bb1b47414f82e1c731dc79fe1a3c6a
 DIST serde_with-1.6.2.crate 55947 BLAKE2B 44f426a460b8aa4b68b518caf571465c546a888a9429248ea8bec988c84416c5a4a2eac0c6fd37e9e2e3eb48cddab045eb360251c528850203c0971d9e7fc859 SHA512 eca7061d6261d1afc98ffb0cde78c81cf27eaf5b03e662bb783312abdc79d0b844988d0cbe3d2bd723fe354a4ee605cac3595371a45b94a71953f8e0438eba66
+DIST serde_with-1.8.0.crate 64318 BLAKE2B ca457f0500eb7d02ab424affe92040bc861990a6ae922e8783813785a4b8a557d89ee714579515b459b7b24699bbee7481ab02934852cbd2ff2ab4c2efa55e4a SHA512 a4e28086bbac51354850fa41fea0c0dcf5f3cedc2f70f14c55757f4cdcd33de523e55a4ccc82a98d8161637ad064145e2c22be3db339228068951bb1aca27ff6
 DIST serde_with_macros-1.1.0.crate 11235 BLAKE2B 46d45ef95ca4bf276abe5571671614927aef01c811b5eefd84801b50bf10d7ba562c42caf9ba901413962e4f7b4662e86ad3ab81e0fb4b442e3baa1a8a7f9c0c SHA512 36de2149a1a4da3162458d79518aa276517456c48cbfbcd564fb84d509b267566b2c2dcd707604b502cd9e152eeabea63234837cb1ad216fe4d9eb27c51cc288
 DIST serde_with_macros-1.2.2.crate 14879 BLAKE2B db14145d27bf1f586a2403ac80c24bf0b231146444c90a6f5cfeebbc93f3bba1cffd286326ae30109fc8a2b2aee13f5ed82ec3c4b046657d61e88815b2df1313 SHA512 aee30f8b8a48bf074f04ca7f0da180d25c523521321189830cdcd036db3f66e3305d53aedb590ca60809e6678f83f1133f7965e636fd166bcb0ad8f9752a44e5
 DIST serde_with_macros-1.3.0.crate 15844 BLAKE2B 98246e2de2401fef1523719d6452a9e4350272ae46fb4283afd9bd7e0ecdb1e14f72f130843a7bc9c78be9c25fc3db8ef364d9a0d2753daa2c2bf107664269b8 SHA512 1717f7f87f2e456b56ac93547f246171fa3b9d193c7de41ed43039ce310ae5dca873e5ebd3dca1b331be81e30b9e8fc5948ed99a430772d1bbd9fef6548ffb93
+DIST serde_with_macros-1.4.1.crate 16901 BLAKE2B 78703dc5a8432e7580a2a72103c804d921a6d526c62f6fb62561c8dcb5b0e609dd00af3380e53de4916802d67f8ee16bb56c5a374f5781aff7820b18b8cfd686 SHA512 e7aaca8d4b033b9ce7eea4b79fd34018574ad4d1f3a688a20e9a5bcc3f4b1edb0987c0fb848b511b10c8ef90e3f93702ca9d462339b0e2e8a2b6245e5aad6e41
+DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST syn-1.0.34.crate 205051 BLAKE2B 3d609502637038d6c2d96b11a99dc96a232ad9d68e94571838cca727dc41450148047509108d6ec3cbcf15f146286dc54023db8ac394b2443a37f55c269a630c SHA512 4aaae0369c08f9f505acc62e9c603d3f5c531f2da42308665cb3c656fb7828ec8c46dc2ee2ef0cbe6ed20c8d7482f66118e4c949f3bff3eb67ae1c93fbbc90b4
 DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3
 DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
+DIST syn-1.0.69.crate 231954 BLAKE2B 1dde7e78cdbf5c5b93d0196e008dd4e92e4367f8e88395d6157b92a58cd9317dbb6e47caf2d570a5a9fb6b4fdd4fdea5e414eb9b04e054ec4e4dde8bb9f36a96 SHA512 6934423e48f8d6b1e403fe5e4bb2e180f472f125f4337b7d9889788c16cf11d79d1673ed06178604279e0b8a04bd80f7efba187cc8fa44c535457eb1b4f51c20
+DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817
 DIST tinyvec-0.3.3.crate 17860 BLAKE2B d3665da9e5e2369bbd68c84827ce13cd1c0afa07b8cf689b04a62e24e5bafe41e8f32b136e048ce85aad324c22ca68fb43995a5445092d1f331379366f71cb03 SHA512 41200e022e66624b45e186a5ef6e7cc05dc3e2fd28d332deb689699b17bb85ecd0d960809e4ea2a08ac1ebeb5f2fcf364f4f9626d297f23169476c8be9dc1557
 DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c
 DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
+DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
 DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead
+DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasm-bindgen-0.2.65.crate 156753 BLAKE2B 4b68313c60c6bf1ccdde58c05cf736e1806e1115271172b2751e256eeff83b93e65d00306ff18529f02c7e5c47df89a2784334d8cf44e09ab4d4465cf85dbe3f SHA512 6fdbc50e06c0db49833b2e5a638d1dc2444b326a4ef19f640316fdbbcb83704a79a6fe0f47818bc69d271bd3791ea6945194960a5d005a3e4a823300023a35c2
 DIST wasm-bindgen-0.2.68.crate 159094 BLAKE2B eb7fa3c2f80e5ab7c0d8e99b11bfc025fd32c8347b9baee9f947570a85426dcdadd052248af7a0ab17bdfbe494f71037fa1980fc875d84c089b70a80d0321bce SHA512 a3e877a43242a35518b84852ac71f3cd6c9ca558234fc23bece38780a0abcbf9e7c6d07e20e81c1f6641835ed3b55dff8245fb75901205b0b5658f4e3b0c05ea
 DIST wasm-bindgen-0.2.70.crate 159291 BLAKE2B 8420da36597a61cb293268f7cce742e1ab3f9ea990382af1c40e37f5b088d558ffa28814c8cdd9cad518246451cb9805d708c9fbe91ae8b6ee4fd2c666588944 SHA512 2cc77c540738fe454aebac4d23ad9b97ddcf867afc2fab8d92e1a995ec3db7126b9dc9153a3e47d048477cf15363d5242caee3064ba850780ad5d121368a7c8c
+DIST wasm-bindgen-0.2.73.crate 159293 BLAKE2B 3ad8a4221d5a3824d8c7788294b3b3b571ba4d676c782f7890be6f0f8acf5fc88166b8bf28933bb7511a388defa5ebd968b8fb8a69bdc424ff8ae64fddba1d16 SHA512 69b070d71df7b5539a9b45cb61704629cb917626e8e9f892ff684007647c36aaa04b7413f1f87eee7fffbcf28550b2d9e632c3747cd1a73a2a75043ea0849722
 DIST wasm-bindgen-backend-0.2.65.crate 23551 BLAKE2B 4aa556cd36d2b7742cc8397eab0c1e3c9e0c24433e82a516aa71dbd3a32cfa760bfba93fc4311e9b69f527dffcd39be6dd7fe81f0fcbae30ebe6fc21c5e632e9 SHA512 7043f525453da6060574cab9926023b65e1e402d10c042804ab90ada78981300fcfabb97f3a661acc9c685bbc65a29c7c5c6ac446f11705bc85b8c9488985bb5
 DIST wasm-bindgen-backend-0.2.68.crate 23522 BLAKE2B ad87e1cbfe42d6b3f6c14f793dcec31fb0f9418454e0870a3951bf5f6b0eb9f39e5363129fbbdf986aa50e1fb2c13b03bbd9e21364204ace72460856fcfa7610 SHA512 aae99cefabc91417bda499b4fe8f136a81ffd44d5122f0c13ca5711eae26f2f8b16ef55c18dd4fd3f0e71edfff8610379adc458f978eaab057671b520de9d564
 DIST wasm-bindgen-backend-0.2.70.crate 25517 BLAKE2B 121690827f7500c19d4964b91fd69cc189e018f534e79a8462b69ef8a7c189ab0475e49a9689cbc4ce2ae082ac591567335a5a416675f0afed02aa14d68425be SHA512 22304a91c6d636bd721209c622ffdce4ed2646bb2c0b2433eaac61cb582ba59bee5ec0d08b4ed88695a8956b38292e646b8481cdfdb86de254e1b321a25308cf
+DIST wasm-bindgen-backend-0.2.73.crate 25434 BLAKE2B 63298c33497fac327ecf31f2dafa3681b906c8d0a873a80bce1282c53a6d63aa8b0d30b8962ecef1f9a0986ab481a41b79cba5b8180f48b084d04fb0c6ba4577 SHA512 853fd0e354aa41706e19de192c9872812072cc881520f8c81b94eadb0cceaa693855598380dcb7729c8c6125eb90cac440453545a5fff0e40714038c86ff2cb6
 DIST wasm-bindgen-macro-0.2.65.crate 11624 BLAKE2B 010ec37dd315fa9053745978a4bbe2758904f5599c3c05195e0fab0c6bc40e671eb6f025e48afe8a0376933eadf550c1ee5b61fddee0d82f3e8f6216e4615e25 SHA512 a5a1071cd09548b2ec2bd0dce4713f00d72ede2c2be8c8e4b3a852e5b2f0456a1e87996f31604523e3e1f226b14d8e4d6e263af86bdde78df830f65fa1a37244
 DIST wasm-bindgen-macro-0.2.68.crate 11630 BLAKE2B 407ec70043b1b6e7f454ac9d986d6df98ae19c9ab8ada98f4f968520b7cd75886cdeeeb739d61615bcf0d6ca3a757ba618f0ed9abc76308c461f159ac05ec61c SHA512 c70f536072ce9bcb109ea762c6235aea7eafd37eb3faad1b50184b733d09417b02f6f75b5c29fa46691b75b449316a039b79c630387f04903f6304453f98e772
 DIST wasm-bindgen-macro-0.2.70.crate 11596 BLAKE2B ce91e20491ef421dbb4a87d1d775e55ca1cd6367825a7cbebe848bfe6af972bb4f514b62de949b8945da335dc57352b8f5c5fd0c6114498b195627f6455ff223 SHA512 b0deff7972a95472d4edec101c080bdd40e0c2ddbaee07f62093847f7e39142388b6f223cef75d71c2c7c90f1022e9ad3e797439c7d61200719b883707d9d171
+DIST wasm-bindgen-macro-0.2.73.crate 11545 BLAKE2B 481800c0c118048b29733a3bbe11ed5c816c1b5496b10b4142310d79ab6b825eb12280cf3c7304e768e6c8acd77105faa8574cf21afbf27810c9b7eac31010b9 SHA512 7ac842e68e6ba577b33df50ebe5c5fd250b1f4bc4e1ec1112be4fc806980d21f73f33612b14024626904a6116a8c72b83f2b7c5405fc111cd2164b4744f843d1
 DIST wasm-bindgen-macro-support-0.2.65.crate 17801 BLAKE2B 1c54484f3d04e4da5b5d9c0f30935420f04a3db9389190f1dfb051c283a274a9f3c37685db6e3f40f836f022c92f9613f5b1570b47d53ca1f15418c4b6e02e95 SHA512 7c12ac36a8e7295e66dc3bdddb26ba2ccef73d1d47dddc98d7416f387963a3def8e86e07dd1464703e9f06132ad1353d54f6d220fcebd2d96bb85dcf10d1f84b
 DIST wasm-bindgen-macro-support-0.2.68.crate 17793 BLAKE2B 619c0484ce4f97742972f1f6fed67643f570df3bad436cd2a93c5cd7477a8208082cafdad87e01caa1ba752bb200e65c61e49136e8037a9c52b9f06ca0c4ba9c SHA512 53d3e483a7df0a816eba308e5a9a736b5e812da9778889686994ed964888b4bb9a8b12cea448b1c68607e6a8b10596f8a81f4c85dc1311667cea5f445e7bb993
 DIST wasm-bindgen-macro-support-0.2.70.crate 17904 BLAKE2B 614121a2625eaaaa8303576cc3c3b05961aaa7c4ea0a65244f055582d8c22960d019e4afcaf7332f7ed7fc742a07ad654eb9848587f36270a6c7a64b9e83f4ea SHA512 a88b4650a05d28f1bf42a236b7f506450f3f84a215e363bb1fd434804bd73211ee7117a4fc07a6f4153aeaf8ad03737617aa29bc4072dd4c9f9a0f2c7fbeedab
+DIST wasm-bindgen-macro-support-0.2.73.crate 17835 BLAKE2B 8e18ef319106273d3f41e947bd1f5ffa7a91e04f713fd67fa0bb697579ae51bbcce75b48a91949aca8e64e6f52ed35eda6b49cec366365126115a9c30572281c SHA512 22e322840ebda05ffdd2f4ffd07745d0f24b928e3425c66425392560f8dd59b007f80d7c4e4a01dafd83c09d76953ecc2cd61d362219791ed88f7f4ecc56960d
 DIST wasm-bindgen-shared-0.2.65.crate 6745 BLAKE2B 3881c8e3db5968f51490676cdfa5a06f8def5e8d6417e41ad592f506291299863342fb59984249ab2484ce6135f67df4545f1ab896bc99dc8cd60ef318223e90 SHA512 32aba8419c42b6798ebeeb57cb562251db6d37bff84b4e2f29264b5f910e8e1fc76c8989f82bd8e224dff978d1e7c25ac19e646f93474f7dd53a85ad2a05d284
 DIST wasm-bindgen-shared-0.2.68.crate 6725 BLAKE2B 891ce0bf742bb32be1549c5b8822952f5cdd15ddd73aed164f753fef211c4087269fc3a859950045bf1e895e255b6f09b6788a7a5d43387365079f106580bf90 SHA512 cf161076d07dd7e91790bb1f773a6f53cf31cc0f9ffe7a650c98d2c6c98d02ba8d1b32fc2aa15128f739c86f49baf206444516c3f8b8df82238eabb72032be0f
 DIST wasm-bindgen-shared-0.2.70.crate 6729 BLAKE2B ae9f755efcb7efdc8aae9bbaa4809526ef3b9b03d0caee6bf673e739d268d7de3c40d395e8c78d4b021c18dd457bcfe038e4bb3d15e846d4446f5414819afa17 SHA512 f9ef2275fb3ef0c61d7ed84e72e820f5b607981e57e0ec042cddc631789533da87a36f717ab6ff7a5f1dbf00f809cb32ab593514aa5fcd586ca0e4fdf53c62c3
+DIST wasm-bindgen-shared-0.2.73.crate 6691 BLAKE2B fbde26dfb5f36474ed3e01f7254dbe742a205cacc85848b85efda09c22e1f9fdb464bd3b7a2c429b73e4f5f3095803e9e477cfb81d6bcc779c04c2602c465bb6 SHA512 d3a28e4bf42071496f2e48c3ba3134a06856be12deac79fe13d1e2e7da8018d5e7f220f4dcc02fdda9eddfc2d52ceef18cd180db7d2bcced44e88a36304f947c
 DIST wasm-bindgen-webidl-0.2.65.crate 35843 BLAKE2B 444b0c2d46d6971b7bd06f9ed80fb2088818524a58aefe4b0dac7ca4be40bb3480228883feeacadae3be1b3e6c30b7d5642cdae6fd23c11212991eb26a3a9e5e SHA512 3ee204a0e7588f02b19e03c83843f773b179a07815b1c17bb814fb78e5a430ee0d3c8a58b626465709a6f62efadd9467ea9869f5d44c22e3bda2142e96a38267
 DIST wasm-bindgen-webidl-0.2.68.crate 35751 BLAKE2B 0ead30af7cc22475150d9a8c14f75606427e8d9ccaba8d566d76d32f4aa70f5f22812871abf003bb29e81891936e7a2c7f23d323e45480a806aaa6b0ba10ef28 SHA512 e28946290221b0af418f5ba75190e689e99fd67806de329a4dfa9826f389927eb7f93bc74a96f74c1b5d77f9d71373b081b06b7c047d8e0c144667e5dd19e375
 DIST wasm-bindgen-webidl-0.2.70.crate 35872 BLAKE2B e6f9146165cd5097c6b402a5484e06e8e51d21cdc69697cc9a99021c343897dd2b76408b3e8b3c3fd9d25830340190fdae51b0b2ca779b23d105a1654b7a9343 SHA512 ba6a513c69f8b284cf43a71b2fc3cde43ec89f542073c2b8273e9b7a8f96c505a0cf8f62bc8fba2bf0957a1d8f6b68ab625419c0f7f4ea6f7e93b49b63b14034
+DIST wasm-bindgen-webidl-0.2.73.crate 35649 BLAKE2B 4be4503ef4e12100b7109ef14c59b708858fd30d56939263254c881206d986f5d4d91d4df5d031479989ed36c57cd2d51b73563652c1e74bc20597b4894863a4 SHA512 868da400b9a6828330e64fbd56b724f315c94cc2fa0c3429db2dd3980b960dc4887f676dc3f845a38addf3f5d8cf8892bed0e12272990886cb45826c0441fecd
 DIST web-sys-0.3.42.crate 628615 BLAKE2B 7fa7c50c8e71c6b9ac43e056f70a03ddd9532b756fda50ce2183a7f24bbf3b2ad6fbca29f10f955e0032d21aa20b966c2a292f24defc00ad9021af86c0115006 SHA512 6e0af1c1f2ba0ea63033b67c25d45ec550086ba864eea532175e4424a7073f7c2a9d006f19702cbd3369eea80bce08bc25a014911ea1d7ffcc9e3c007e711a4b
 DIST web-sys-0.3.45.crate 630993 BLAKE2B a5a72bf3785902a65a7fd65b53d696b491e9438ba4dd78d4e97f3c3d62df4144716ca09822e074f27ae5506765c7c2d547a110ccaf5c4c214da6b5a4816425b8 SHA512 d208e2271f59691b13b94b952dbce966f54ca180d09c6725964541c00684787a3610623294f81032cc931273ac655dc6163b23fda736b603ff327abd603fbfc8
 DIST web-sys-0.3.47.crate 648902 BLAKE2B a670816a41130dc1c5a202cfb7e60f281850be7916c825096a41e306ec2a221a443eafcc1a2e8d037697ee3fe564968974947fd29b026f6a565d0e542114aec1 SHA512 d8edc7e942fa3c97102dca51a2d398c616d96b7a9aba872f055e9e2dc00878f59fb7bf3c4975f527300bc7fc418f5da8a2f6ba8242a5e9f2edc445d391a47813
+DIST web-sys-0.3.50.crate 650100 BLAKE2B 448227dfbb6b91ab316ceebe554c9d9b89c397c25cd465f2e8a77560f185eb7308caf3b6052946e691d8fc22d6d382a0e3f164f7d29d873591ce17da792a993a SHA512 32afbfd3021c6cc4f228fc1762a4e29935373f4e7c572128723b508e6ab9588f3737167b91d5837e05a08c0bd182dd339c8f16b71e8a032f7e735cd619949d14
+DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 EBUILD quiche-0.5.1.ebuild 3902 BLAKE2B ddf0e620c3cee6e8d1e952881cf400168558634cd264809e72731d92cce3981c8926d3f570f717358474a7b0111d93e981857aabba544ad85aa574abdb71b224 SHA512 877d10e0b406507f867c8817db7583ab8e72d4a199b35384f4302d6efce2372bd75f73063124ba197a3f4cf3c66c68fb678d19f0ce0df5c1b1b7e1d83730e30c
 EBUILD quiche-0.6.0.ebuild 3998 BLAKE2B 6c36bdc3e5c506fd779f1f1f0ce21c578c5e96a5c695f99f01d2273b353d5a4cd62c00be9ea3eb08efe27c3cdef50083687d4da632f92aab736c2db7ca04013b SHA512 a0582b3f4e70d06bf1284724f7ff0f38b02ef633a9e4442fd42c0787f6c0195b0e697473092bc7820f30cc79d8375b35918a0b250ca0e2466b850c32e62c270a
 EBUILD quiche-0.7.0.ebuild 4086 BLAKE2B 2fa3ba3d1457fc29552a8148a871987c91999f562e8df793d0051eb8f2aa928f2ccac75b3d6d0cc32b8c8f55dd50e5adadb45e84c265ae45af7e1bd1e78b78ae SHA512 ddb3afaf83e8906bf9cf2f9aa4ebb2dcd416987bcf652245aae492eb7d85fcebaad2c2e3cdc57c978a8e1769b1b715919c6b2212f7a409db7d4dacf90dff7f17
-EBUILD quiche-9999.ebuild 4086 BLAKE2B 2fa3ba3d1457fc29552a8148a871987c91999f562e8df793d0051eb8f2aa928f2ccac75b3d6d0cc32b8c8f55dd50e5adadb45e84c265ae45af7e1bd1e78b78ae SHA512 ddb3afaf83e8906bf9cf2f9aa4ebb2dcd416987bcf652245aae492eb7d85fcebaad2c2e3cdc57c978a8e1769b1b715919c6b2212f7a409db7d4dacf90dff7f17
+EBUILD quiche-0.8.0.ebuild 4382 BLAKE2B 19ee870e1c820181ef5387a45b0f30d3d09c00ac4b86081f9d36caf924151766403df2cf56725a1b0c8e5313f3f8b555788b03b620d612f8002a48681ce95caa SHA512 b4af57d07c4a61a53b3dd94e74aac1c57bd5466bcedcdcb848dbfdb9d00aed1750042c39199e66c48cfef2577a19d430aa669878352badb3966d500473fee7bd
+EBUILD quiche-0.8.1.ebuild 4382 BLAKE2B 19ee870e1c820181ef5387a45b0f30d3d09c00ac4b86081f9d36caf924151766403df2cf56725a1b0c8e5313f3f8b555788b03b620d612f8002a48681ce95caa SHA512 b4af57d07c4a61a53b3dd94e74aac1c57bd5466bcedcdcb848dbfdb9d00aed1750042c39199e66c48cfef2577a19d430aa669878352badb3966d500473fee7bd
+EBUILD quiche-9999.ebuild 4382 BLAKE2B 19ee870e1c820181ef5387a45b0f30d3d09c00ac4b86081f9d36caf924151766403df2cf56725a1b0c8e5313f3f8b555788b03b620d612f8002a48681ce95caa SHA512 b4af57d07c4a61a53b3dd94e74aac1c57bd5466bcedcdcb848dbfdb9d00aed1750042c39199e66c48cfef2577a19d430aa669878352badb3966d500473fee7bd
 MISC metadata.xml 330 BLAKE2B e12c1bf76513869cc73d66a8961ad15bf1776b21d83c772d7478f0c383fa7b4fa7e64558514c922f8c358c78d165899fb5a051281e78d90a330769bf52d32673 SHA512 b41d3bd1bccdce6aaf16d55cef25b2b5232068bfc9c633edf8cf23f95a06dd99de59e2353c700d3ad46085d4e5ec220960bec91fcac674b92200f342d7eb6d29
diff --git a/net-libs/quiche/quiche-0.8.0.ebuild b/net-libs/quiche/quiche-0.8.0.ebuild
new file mode 100644
index 000000000000..1f5b5a82e1a6
--- /dev/null
+++ b/net-libs/quiche/quiche-0.8.0.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+ansi_term-0.11.0
+aho-corasick-0.7.15
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.1
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bindgen-0.57.0
+bitflags-1.2.1
+boring-sys-1.1.1
+bstr-0.2.12
+bumpalo-3.6.1
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.67
+cexpr-0.4.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+clang-sys-1.2.0
+clap-2.33.3
+cmake-0.1.45
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+either-1.5.3
+darling-0.12.3
+darling_core-0.12.3
+darling_macro-0.12.3
+env_logger-0.8.3
+fnv-1.0.7
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.3.0
+hashbrown-0.9.1
+hermit-abi-0.1.18
+humantime-2.1.0
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.7
+js-sys-0.3.50
+kernel32-sys-0.2.2
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.93
+libloading-0.7.0
+libm-0.2.1
+log-0.4.14
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.3.4
+memoffset-0.5.3
+mio-0.6.23
+miow-0.2.2
+net2-0.2.37
+nom-5.1.2
+num-traits-0.2.11
+num_cpus-1.12.0
+peeking_take_while-0.1.2
+indexmap-1.6.2
+once_cell-1.7.2
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.26
+qlog-0.4.0
+quote-1.0.9
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.4.5
+regex-automata-0.1.9
+regex-syntax-0.6.23
+ring-0.16.20
+rustc_version-0.2.3
+rustc-hash-1.1.0
+rustversion-1.0.4
+ryu-1.0.5
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.125
+serde_derive-1.0.125
+serde_json-1.0.64
+serde_with-1.8.0
+serde_with_macros-1.4.1
+shlex-0.1.1
+slab-0.4.2
+smallvec-1.4.0
+spin-0.5.2
+strsim-0.8.0
+strsim-0.10.0
+syn-1.0.69
+termcolor-1.1.2
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.17
+unicode-width-0.1.8
+unicode-xid-0.1.0
+unicode-xid-0.2.1
+untrusted-0.7.1
+url-1.7.2
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.1
+wasm-bindgen-0.2.73
+wasm-bindgen-backend-0.2.73
+wasm-bindgen-macro-0.2.73
+wasm-bindgen-macro-support-0.2.73
+wasm-bindgen-shared-0.2.73
+wasm-bindgen-webidl-0.2.73
+web-sys-0.3.50
+which-3.1.1
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake-utils_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
+	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
+
+}
diff --git a/net-libs/quiche/quiche-0.8.1.ebuild b/net-libs/quiche/quiche-0.8.1.ebuild
new file mode 100644
index 000000000000..1f5b5a82e1a6
--- /dev/null
+++ b/net-libs/quiche/quiche-0.8.1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+ansi_term-0.11.0
+aho-corasick-0.7.15
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.1
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bindgen-0.57.0
+bitflags-1.2.1
+boring-sys-1.1.1
+bstr-0.2.12
+bumpalo-3.6.1
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.67
+cexpr-0.4.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+clang-sys-1.2.0
+clap-2.33.3
+cmake-0.1.45
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+either-1.5.3
+darling-0.12.3
+darling_core-0.12.3
+darling_macro-0.12.3
+env_logger-0.8.3
+fnv-1.0.7
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.3.0
+hashbrown-0.9.1
+hermit-abi-0.1.18
+humantime-2.1.0
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.7
+js-sys-0.3.50
+kernel32-sys-0.2.2
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.93
+libloading-0.7.0
+libm-0.2.1
+log-0.4.14
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.3.4
+memoffset-0.5.3
+mio-0.6.23
+miow-0.2.2
+net2-0.2.37
+nom-5.1.2
+num-traits-0.2.11
+num_cpus-1.12.0
+peeking_take_while-0.1.2
+indexmap-1.6.2
+once_cell-1.7.2
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.26
+qlog-0.4.0
+quote-1.0.9
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.4.5
+regex-automata-0.1.9
+regex-syntax-0.6.23
+ring-0.16.20
+rustc_version-0.2.3
+rustc-hash-1.1.0
+rustversion-1.0.4
+ryu-1.0.5
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.125
+serde_derive-1.0.125
+serde_json-1.0.64
+serde_with-1.8.0
+serde_with_macros-1.4.1
+shlex-0.1.1
+slab-0.4.2
+smallvec-1.4.0
+spin-0.5.2
+strsim-0.8.0
+strsim-0.10.0
+syn-1.0.69
+termcolor-1.1.2
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.17
+unicode-width-0.1.8
+unicode-xid-0.1.0
+unicode-xid-0.2.1
+untrusted-0.7.1
+url-1.7.2
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.1
+wasm-bindgen-0.2.73
+wasm-bindgen-backend-0.2.73
+wasm-bindgen-macro-0.2.73
+wasm-bindgen-macro-support-0.2.73
+wasm-bindgen-shared-0.2.73
+wasm-bindgen-webidl-0.2.73
+web-sys-0.3.50
+which-3.1.1
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.47.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake-utils_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
+	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
+
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 55a9755ce101..1f5b5a82e1a6 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -5,22 +5,26 @@ EAPI=7
 
 CRATES="
 anyhow-1.0.26
-aho-corasick-0.7.6
+ansi_term-0.11.0
+aho-corasick-0.7.15
 arrayvec-0.4.11
 atty-0.2.14
 autocfg-1.0.1
 backtrace-0.3.37
 backtrace-sys-0.1.31
+bindgen-0.57.0
 bitflags-1.2.1
-boring-sys-1.0.2
+boring-sys-1.1.1
 bstr-0.2.12
-bumpalo-3.6.0
+bumpalo-3.6.1
 byteorder-1.3.4
 cast-0.2.3
-cc-1.0.66
+cc-1.0.67
+cexpr-0.4.0
 cfg-if-0.1.10
 cfg-if-1.0.0
-clap-2.33.0
+clang-sys-1.2.0
+clap-2.33.3
 cmake-0.1.45
 criterion-0.3.1
 criterion-plot-0.4.1
@@ -31,88 +35,103 @@ crossbeam-utils-0.7.2
 csv-1.1.3
 csv-core-0.1.10
 either-1.5.3
-darling-0.10.2
-darling_core-0.10.2
-darling_macro-0.10.2
+darling-0.12.3
+darling_core-0.12.3
+darling_macro-0.12.3
+env_logger-0.8.3
 fnv-1.0.7
 fuchsia-zircon-0.3.3
 fuchsia-zircon-sys-0.3.3
+glob-0.3.0
 hashbrown-0.9.1
-hermit-abi-0.1.8
+hermit-abi-0.1.18
+humantime-2.1.0
 ident_case-1.0.1
 idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
 itoa-0.4.7
-js-sys-0.3.47
+js-sys-0.3.50
 kernel32-sys-0.2.2
+lazycell-1.3.0
 lazy_static-1.4.0
-libc-0.2.84
+libc-0.2.93
+libloading-0.7.0
 libm-0.2.1
 log-0.4.14
 matches-0.1.8
 maybe-uninit-2.0.0
-memchr-2.3.3
+memchr-2.3.4
 memoffset-0.5.3
 mio-0.6.23
 miow-0.2.2
 net2-0.2.37
+nom-5.1.2
 num-traits-0.2.11
 num_cpus-1.12.0
-indexmap-1.6.1
-once_cell-1.5.2
+peeking_take_while-0.1.2
+indexmap-1.6.2
+once_cell-1.7.2
 oorandom-11.1.0
 percent-encoding-1.0.1
 plotters-0.2.12
-proc-macro2-1.0.24
+proc-macro2-1.0.26
 qlog-0.4.0
-quote-1.0.8
+quote-1.0.9
 rayon-1.3.0
 rayon-core-1.7.0
-regex-1.3.5
+regex-1.4.5
 regex-automata-0.1.9
-regex-syntax-0.6.17
-ring-0.16.19
+regex-syntax-0.6.23
+ring-0.16.20
 rustc_version-0.2.3
+rustc-hash-1.1.0
+rustversion-1.0.4
 ryu-1.0.5
 same-file-1.0.6
 scopeguard-1.1.0
 semver-0.9.0
 semver-parser-0.7.0
-serde-1.0.123
-serde_derive-1.0.123
-serde_json-1.0.61
-serde_with-1.6.2
-serde_with_macros-1.3.0
+serde-1.0.125
+serde_derive-1.0.125
+serde_json-1.0.64
+serde_with-1.8.0
+serde_with_macros-1.4.1
+shlex-0.1.1
 slab-0.4.2
 smallvec-1.4.0
 spin-0.5.2
-strsim-0.9.3
-syn-1.0.60
+strsim-0.8.0
+strsim-0.10.0
+syn-1.0.69
+termcolor-1.1.2
 textwrap-0.11.0
 tinytemplate-1.0.3
-tinyvec-1.1.1
+tinyvec-1.2.0
 tinyvec_macros-0.1.0
-unicode-bidi-0.3.4
-unicode-normalization-0.1.16
-unicode-width-0.1.7
+unicode-bidi-0.3.5
+unicode-normalization-0.1.17
+unicode-width-0.1.8
 unicode-xid-0.1.0
 unicode-xid-0.2.1
 untrusted-0.7.1
 url-1.7.2
+vec_map-0.8.2
+version_check-0.9.3
 walkdir-2.3.1
-wasm-bindgen-0.2.70
-wasm-bindgen-backend-0.2.70
-wasm-bindgen-macro-0.2.70
-wasm-bindgen-macro-support-0.2.70
-wasm-bindgen-shared-0.2.70
-wasm-bindgen-webidl-0.2.70
-web-sys-0.3.47
+wasm-bindgen-0.2.73
+wasm-bindgen-backend-0.2.73
+wasm-bindgen-macro-0.2.73
+wasm-bindgen-macro-support-0.2.73
+wasm-bindgen-shared-0.2.73
+wasm-bindgen-webidl-0.2.73
+web-sys-0.3.50
+which-3.1.1
 winapi-0.2.8
 winapi-0.3.9
 winapi-build-0.1.1
 winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.3
+winapi-util-0.1.5
 winapi-x86_64-pc-windows-gnu-0.4.0
 ws2_32-sys-0.2.1
 "
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 6365388c4c25..8982ad04e7a1 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,3 +1,3 @@
 DIST rabbitmq-c-0.10.0.tar.gz 145361 BLAKE2B 99b53d5178fa407225d2060584239af83377027fb6a209002d11ed54be4b49bab70ae55c86ab971394ab745a632ece6f070f9c10a9bdd330de4778edbd8e1ea8 SHA512 52a1194fab2dc8698ed065d63898e32aa004a4d68080d4aaf5cb7148cc28ad967283f7a99910d7f054cbba92b487b3a67b839b6f0bd88486ef9be043c9517d4c
-EBUILD rabbitmq-c-0.10.0.ebuild 1344 BLAKE2B ed875553656f55a43d8388819e8fffb97d7ffe9a169d6e05798e6beae0fa9db971a9239f08a9fd83839ba35d14393426733c59b118b8f1d59e05dd4980ab6629 SHA512 ec5d215fc246441b44244136e85fa5c8afc81b582d35845a3df6416b343e232593f8795042fe42ca6b8916a98091863a4f14f9e446dfa79285618aa7a8fceded
+EBUILD rabbitmq-c-0.10.0.ebuild 1345 BLAKE2B 840cdbf6abe39a92e06a014cb3a3d581d02323493d32403061cd338360c7346a32abbd158118cbdad75b7ba45b4e80895ba1aa038f616527b4a6d49951f355fc SHA512 2596b46b765621f4da94d9108f4fe7acc1de0caa045455ee66c19ceca8eb4cb7c053d771bf52744ca77adfeb3fc96bedf063e1be783efa1b6e76ef62b0a6197c
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
index ff1a742535fa..a0dd2594c166 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -29,7 +29,7 @@ RDEPEND="ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 	)
 	tools? ( dev-libs/popt )"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	tools? ( app-text/xmlto )"
 DOCS=( AUTHORS README.md THANKS TODO )
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index 1f3a1a5062ae..b45b791c3a1c 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1513 BLAKE2B c3c195049728b7e6aa2dd8c5dd48c1691374e4a836192af5172561299942218b7365f6f4296f016dd13438aa370127d65df3273615a1e557b79375208be425fd SHA512 26f91b1249aae43357fbf13f5764931b252c0d53a9a694dfd25e8eba35c15c1a3617581769779fd61d87d8686c364a80c783bf1cc3229717b1bbb12658193c5b
+EBUILD rest-0.8.1.ebuild 1509 BLAKE2B 4109ee31b04df1419eb9d4fe271899941c950ebe131d1b0aadffad6e7a1869895c4c5db697e4cab4312811960fcb754d0ab1fd08c9434c67891f7e9f722acbfd SHA512 ddf7bd8d247b5ed67064d57d3b01dfcd20d132cab5984a9df923389259040f976a5f1c0ab5025c2ac4ced3d45fd5fe770e6daed459b0b0e9a00d0d61bbbd1a6e
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
index 76001caf195d..ac7d01ee58ed 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 multilib-minimal virtualx
+inherit gnome2 multilib-minimal virtualx
 
 DESCRIPTION="Helper library for RESTful services"
 HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0.7"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 
 # Coverage testing should not be enabled
 RDEPEND="
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 multilib_src_configure() {
 	# gnome support only adds dependency on obsolete libsoup-gnome
 	# https://bugzilla.gnome.org/show_bug.cgi?id=758166
-	ECONF_SOURCE=${S} \
+	ECONF_SOURCE="${S}" \
 	gnome2_src_configure \
 		--disable-static \
 		--disable-gcov \
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 16061b0b3cbd..c1e197bef118 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,4 +1,4 @@
 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.2.ebuild 945 BLAKE2B b37c837ee226bf9208107c89c2b66b6e7209ff2226cd73c41f76a711959f3aee7188c53262c37dfd409c9968ed27d79db92c6d1c2fc480912fcbe7397b3aa59f SHA512 8d4078193d552d75b6666ea25c4ca1c03a71ab28236bf35609fa08a902cbd23e6e40f5b17f6e867bb83077c70b24fe8e0de74af52d28c67b230a9072eadae8a6
+EBUILD rpcsvc-proto-0.ebuild 479 BLAKE2B d02a2aa983d5e6d8dd4820ff83620738db7b90232a13779b30c8d1d496a1e470438cef75a7b6c2022bcaa49e78cc78423160d04a2c753e79225c1103d47fd744 SHA512 8ac3092ffbeaf07868ae78ae28a490812cc2c2a8902de71c7701ff89107f97a42d6be5699285af02d8b0767315c2b5ca5951d2d44542065464d5ed951dd70538
+EBUILD rpcsvc-proto-1.4.2.ebuild 946 BLAKE2B 88eaf742a443c3bd611c9f66a54aeb428fee3901dbb879682acc5a5993eaaaf92f86de7e95372a704c1a4f24b9980ad0c7074aae789158d10c89b7e59f0c8d1c SHA512 6f7caaacddc31ad2c5010d3a444551407ffd38d6eca595a0afb05ae0f24eb13562212690f936522c7e377709ae92d45170c81377fc55d27d0e232e2df02d4a47
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
index 9c6d2e074dce..865a87574ece 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
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 a07ee40040e2..0d012345ff83 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 76f083eb7d53..968ec09701da 100644
--- a/net-libs/shairplay/Manifest
+++ b/net-libs/shairplay/Manifest
@@ -1,7 +1,7 @@
 DIST shairplay-0_pre20170118.tar.gz 291352 BLAKE2B 0eb1a60e7cd3511d24d7f6fc910afa85df4488a96ffca80d98bf00b8544b05630f8edb2f5204bc93e8901c4d8efa752f2eef94ed625e2bf7d77cd74ed3053572 SHA512 05a8ac399659235e88d3b1a7fbe8364ba526881b24ee082c3b7a5709b9b63eac376071d44028e4758ab22ca56d30f8e996b12dc9d3bd99bd38fe453e00a4a18b
 DIST shairplay-0_pre20180824.tar.gz 554332 BLAKE2B cbebe272a15a602b79f384c7497bd849145bf065a9b2c6fd335c5536dd0cbefef332945662ad4962e69273d64a23c1f2ace3edcb7c38362607414d27a61397fd SHA512 38d947740da85546cccc4186dfd6d1ab0be71463107b24beb374b17a9e557fc7e4c97e34bfd69e962ddb3e481ecc8e37070e225761d8543588cf047be25ca3a6
 EBUILD shairplay-0_pre20170118.ebuild 960 BLAKE2B d8dd128013d9402402f489d81c6f9d44b70c3b4283852643a9fa1b313538fb48f0900e254faed5ac100e480d7021dca2a776056ab30f977b9dd915314e0b32eb SHA512 3ce15525ded41e9ffd2d6ac3134a73a8bc0a8bea1d018d3e93f42c5aa35a9b983e3848806fad8089f20e9ca7fdaab1c1ba7ad7697423872b1a9f4c89be48018e
-EBUILD shairplay-0_pre20180824-r1.ebuild 938 BLAKE2B 45a699b980d2136775f98302a1c9d5bda050c2ecd5f4b27662aa5f724c65107b1d2e6ab3be1602892b9fec0001c1f476d90e7194ea4d816e592d82626eff73c6 SHA512 199b58876e1d6e2a0957ee102d118a8ad35ca65c2921c1e4140fa5e626dbbbed1e671164c8485370d97f74c08452b75014bcd9beb2e3bc5b3865a2602d48e8ac
+EBUILD shairplay-0_pre20180824-r1.ebuild 937 BLAKE2B c55059eb90eb8cbd9e1b1938ed0b7fecf52771059218c001e8aee07be1c74748202253713e0e6389e0af151b19ba221744ba87aae61f2685e9578aedf49a4236 SHA512 5dbeb48b68bbe8c1bb77638e68e6482846777be0a61dba69b5d6d1b02f5b562f19e8f9bd670d7292de0c46d1129883e9f59fd3e49d8e52759715bc06cb3bbe88
 EBUILD shairplay-0_pre20180824.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
 EBUILD shairplay-9999.ebuild 926 BLAKE2B c6a518f8deff81b1072948c6be8376cec5827da017e721b1179681fe7797db542fd009aeba277c5aee83997d183fc0c9f7f5ea8fbbb7e9dab0ab9b9247331d70 SHA512 4b76ddc7c46d1712831b1cc5cbb5a03e9727b28c7839a3b4a511ae4a3c16a15fc6d4b3d700fbb9d9356394b472c5023dab128923d446ebce34d973c2dfba32cf
 MISC metadata.xml 728 BLAKE2B b706a2a73f7d5c6119c6202452535f1b174a0ae6ae63656155941116c9edbe1b96c607624d235bb0410790f0c36d2ca3b602a0169486825e3fddba2b394dffe3 SHA512 911c29e609c4f991a7c8cb031fb71ab66440d4959a1ba16fb45f8282a770588d3572b8712b4afcf531404c993b1657e6e9d4d749b655998822e7e9d0c46cd3b5
diff --git a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
index 5d5d13d39018..1e2073dc00df 100644
--- a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
+++ b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ else
 	EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e"
 	SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~x86"
 fi
 
 DESCRIPTION="Apple airplay and raop protocol server"
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index 3a1cfea073dd..1646e8bef67f 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -2,5 +2,5 @@ AUX 1.2.4-tests-pid.patch 1229 BLAKE2B 96466d9b8da797a31140d862326f5aaa3ecab0098
 DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
 DIST socket_wrapper-1.3.2.tar.gz 86255 BLAKE2B 33f526a8871cfb1a889a84660ea8e82b6e591646924e16d2c452bb001e0eb4c1457b8151208bbec55c13c40fd124c160fc85d0df227519f62a2683e4ea1acb85 SHA512 f4d3a7026f1777a4c3b5481a0f6e6057b6372e9b64f44523ec1ebf0a34159d7154493dce6ee3c95fbea15607c6ada1382f2475d5d553133a061c80719c135b9d
 EBUILD socket_wrapper-1.2.3.ebuild 654 BLAKE2B bb26492c7be4e1bf50190fdc4bb4114ed4ed22613076f90e6500fe568ff1b1363e4b84f9b72e746728eeab3115ef9f224f5d583b789ff5437404dec5dab4dd70 SHA512 68604ee3717a131e17eb8e8f165b8b05b950e9b41c4cc2a19471d4a6fc1784cc9170f292613fdf97b76832b8a785ce00ab8cccc94991d28931d3df0e023b7c77
-EBUILD socket_wrapper-1.3.2.ebuild 632 BLAKE2B 913b90abd9f99de679caf590c64a61866dd351fe6bbb1effaff1bdb4157c51c9f7fd12ce0a57e23cf8b07213530f9394ef8a19a5661fa7bf646b40c42f04eb11 SHA512 a5476d275581e52b3daf91d8b45bb4ea65dd0b933db6296eeeed470a8955343d9e6755989a70a1718f45fba2cf4099f15c520c35875163fb72319d4dfdf85c4f
+EBUILD socket_wrapper-1.3.2.ebuild 631 BLAKE2B e0f0ecfb97950b1f63074b043dbd45559fe8a927dcfbfe901584379bfbcb7b2a30cdff3993d3eb0e541ff5f1f827697a25a88bc5c0153ac73b5514ff937fd186 SHA512 4bf81811ca3d9fad7b0dd281b24ce8cb7318da0b90f619e0f3eaf6eaf95f91e691a91a10dec788ff536b553e0ef4d9b5974df3fd0476615c2da95f129f921d63
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
index b714f672e700..a655ebe944e6 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index fdc1c7053565..3b40e3860e02 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -2,6 +2,6 @@ AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be
 DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
 DIST srt-1.4.2.tar.gz 1538231 BLAKE2B 1b3f625bb5a6436d6c35f957796217ed8c7f9d2412e96cbb2b83b8372f0738b5c9219b218b644e74f6f16457d1b8606fedc238310e800cce84fe127f86b33be1 SHA512 4c978e3898737e566f47222a0095df1b49591d79927850cc94c838b7eaccf401faf1c5d038fa45b6fd30c85f980e7c212a79c07ed6f9008430e8a5a594a31ffe
 EBUILD srt-1.4.1-r1.ebuild 1129 BLAKE2B 2d88cd71cafed4700385d5e005fd5a208e5650e055d74dbf7674ffb756f574083d8b4b3fb6b89bd69669191cd197f3d81e2707779c6a8778a7e85d28ac4e1fac SHA512 7ad947fe6b1731d15846b2125f4db4e3e5cb7476ff495bad14ef7dace90bc38dd85be9dec2bfaed8464e6fbc883d8aa8651e42e10800a29dc5f49f425bf6498d
-EBUILD srt-1.4.2.ebuild 1143 BLAKE2B 10676410009626a4f49c86248ee85f24b452ac704dd487b2e66375bfb2c3c2f1fc4e71dda9a3b5abc45507f45c1508c8fd70e83139bcb24e53e28acbaa2eeb41 SHA512 e3a6b3fddcff484aeb9f90d9a2c35ec9a8d45ac455ba9ce2be15db821f26aac77fecaea77a6f8c6040408f2b842fca09f71edf23352f956c6dc5594740cff0df
+EBUILD srt-1.4.2.ebuild 1142 BLAKE2B f9ef0aa65ba5b2a53f06e7be4c02f3da4e576e0da8d7fe10e594be6215c5eeea76f9a8125c4953ecf032bd8b924e0c675a3933167d74ca1e72abc9703768b4eb SHA512 d1b29c2d61a322c895841479e112eeae61a05bff7dcd330352bdf98f7da9341430c46d5f00e3e63bffba25ef0ba3494e8a901479f80f69f9aef7bb7a5a1cf69f
 EBUILD srt-9999.ebuild 1235 BLAKE2B 76139b25b0f16965974f4bfdd47f8eb46692293f924e90054f410ee6e878599217bf9f4eb0ebef513aef45a1ce02dee333ab3a43bd2634677496742d151dd771 SHA512 c7ecfa10f7871f5bda5d054411786ba864b7f331be142d7f37a6e3782bd23997775a6e4291fe06cff74dc9b9ccea91c7e59ce33eaa19abe8653b4e7cb076c7f4
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/srt-1.4.2.ebuild b/net-libs/srt/srt-1.4.2.ebuild
index 35ef265603dd..4046568653bc 100644
--- a/net-libs/srt/srt-1.4.2.ebuild
+++ b/net-libs/srt/srt-1.4.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 0ebaac5c9276..694364f29a26 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,5 +1,3 @@
-DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
 DIST telepathy-glib-0.24.2.tar.gz 3855853 BLAKE2B b98701e4897da5f1e1791af1d36f0f8e98fc0a043406a2e1e6c56437acfc7ed83701163a8c30d1ec2506cea4ca9a64827fca96ea0c3ea1566d38519b63a3a201 SHA512 736590c299b6522c41153e01e80d9bfdac1d4cbec646b28c9fba67a07429426ff2c8e38818f2cddd7ccdc38a061d210906f6e551f7a6059c34c4dd08b789b501
-EBUILD telepathy-glib-0.24.1-r1.ebuild 1485 BLAKE2B e4b0f770650990f395a054dc38f12577c0596bbd961b28a7c8497a0289b0bd4189628871b7023f2f4e4cee183043f38adad02adb0b9a287803e7ecec1b53eac6 SHA512 7580ea748edd3acf6694d2512f6460b49ea555be6979ff9838d0dd1c567d0207f9b963cb37275145c39c349096767f32812d066d8161881d2a3decfca59ff090
-EBUILD telepathy-glib-0.24.2.ebuild 1505 BLAKE2B add3cb97fa6552330707d03756e4ef466e0eecd9fb58cb956ad29098a3fe53d8ef9c07083140bd226c5e5886160414c95c2ffe831deaa711dccb097fba29ceba SHA512 bcb6a5d6dc526368f4bd20bd4492295613cdc5f13b90006490badac767cb418c611bcbe10b228b7cf11aa0df4673de81dd5d9b0b77288ae247e94109fac2df96
+EBUILD telepathy-glib-0.24.2.ebuild 1498 BLAKE2B 0319fd48f9c14c3e404d1e1182f622620272d7b14a0ebeb86b7d4af488619ab7fdc44286100e18cf2dda83474ada290094b1a669b6412485ef3038b62ef5cfa8 SHA512 16071c212487cb3def7d1f88d69b064504f4ad7367d206c1f09f0ad6cd1bfd1a4415042b153ab8fa454bcc46245276e3818f59fa0057607de72b5cda940d137f
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
deleted file mode 100644
index f5408e2c7b40..000000000000
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="debug +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# Broken for a long time and upstream doesn't care
-# https://bugs.freedesktop.org/show_bug.cgi?id=63212
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/dbus-glib-0.90
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# See bug 504744 for reference
-PDEPEND="
-	net-im/telepathy-mission-control
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-installed-tests \
-		$(use_enable debug backtrace) \
-		$(use_enable debug debug-cache) \
-		$(use_enable introspection) \
-		$(use_enable vala vala-bindings)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Needs dbus for tests (auto-launched)
-	virtx emake -j1 check
-}
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
index 3d51fb532d10..a87f183e1381 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="debug +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index 7ae234a65caa..4122aa3915ef 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,5 +1,3 @@
-DIST uhttpmock-0.5.1.tar.xz 310976 BLAKE2B a7aa609d853a8593461aaaed0074532bc7df1d43638c720694a558cd4eefac14b140f79025cbf7ca9a93ad41cfecfa7728eb049e52d514edda7267389f4d8097 SHA512 99135c0983be78eaaf962e5b182eaaf921e1d6ed30f98691d8766e9d4a9e07188965ce3f546a13a8c32b148bad305083cc3cfdf48d9a8b91efffaec5a46d8006
 DIST uhttpmock-0.5.3.tar.xz 318708 BLAKE2B 7bd257fbc8869ce2d55070bc1f84f0d34c999cd55ba5e09a54031ea391c3c65bb149d48f2ab1ab9de93acac98783ad0e7d5fca4d86dda055d4a5a3407f5ba4ee SHA512 9fccdb58ce04c1615d47bafac275c632f161a8148f0af82447286d0017d6b3946145b8a289f9abb55842bf4610ca3e5f2484bf322fb7a33dce42b3ebed45b2ee
-EBUILD uhttpmock-0.5.1.ebuild 915 BLAKE2B 48c1eb00fb734997868d194ac3ec75ee612c86b3ba8ed7f5bb7bbb888b1957c6a54086d24b9b9830d2fc778b30ad527127f58ad51526ce557fe9513af45a302b SHA512 a2bbc10217be73974cba2bb220dbc5c28384a21b06454cc7893b7cc444ceff57cf41542c3a83b9ba57e3952419bb739e1aed9cd52fc0fb9fd44b4aeefadac327
-EBUILD uhttpmock-0.5.3.ebuild 943 BLAKE2B e7a45e05c169c33798f527e029cb758a1c06b71b5f80ba4119e7d1fcbac589b4271cb848cfcd8bbcf920610c86bce269f843ea1a16b276797fc641b1c02a4d13 SHA512 463a0c7d39e392b8a8317933524d25dfb57de1cdc1baeea5f4904d000e64f1e31011c8b8902ab2d3bd9cdda8496e4fc0d0172db0df0776af1f3a033473218d38
+EBUILD uhttpmock-0.5.3.ebuild 939 BLAKE2B b88e545dce95af60aa2eae828e0f1b0953381f346e132fced8331b00c1edc1b46bbae51463b13b735bef018b315fc85b8a76efb74b0f203e13a44b25d05abe4e SHA512 492b85c14dc6b94e8d55d732dcf268183b39fb754fb96dfb7ae1e8dd3192d2dd4e0679583affd71fc93d57a017f899f5bfbd8c53653883cf11d7d407299f4066
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
deleted file mode 100644
index 52d1801f11fa..000000000000
--- a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="HTTP web service mocking library"
-HOMEPAGE="https://gitlab.com/uhttpmock/uhttpmock"
-SRC_URI="http://tecnocode.co.uk/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=net-libs/libsoup-2.37.91:2.4
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
index d8184154dea5..cca319670b85 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38.0:2
diff --git a/net-libs/usrsctp/Manifest b/net-libs/usrsctp/Manifest
index 3f8f535a94d6..89dcf494419a 100644
--- a/net-libs/usrsctp/Manifest
+++ b/net-libs/usrsctp/Manifest
@@ -1,3 +1,6 @@
+AUX usrsctp-0.9.5.0-pc-inc-path.patch 835 BLAKE2B 596c7f288285501eedad5125168e8a60e40981a9e78680b7423420221b1fbbab55feb7bcefe924360467dd9210f7ae3e326a862339fa149dbace3ddaf6b75d12 SHA512 dd086d104e9e00ea3884cf155a1624cdc18dd4092263ed365fd6dae3232fb7be1e3d40eeb118b6029c9bfe586a08a72ca6f121eb429da8690ca20bf34b38bb0d
 DIST usrsctp-0.9.3.0_p20201102.tar.gz 770742 BLAKE2B 94c7b0417a076d627065c625726eb214ec58be90d0965748610f63c076f1c172cb114dc8162af5604751cfe5e86ebf5444f002d07e43c94e461e21f6a3a4819a SHA512 a4bb4dd0ec81b2314e8590cfe5386179697e64d82915a0ef7e8f7a0baf67f88e3da89329ea73b38e8c417668f971f6580e120ed5be8588761b4b334a65ab4120
+DIST usrsctp-0.9.5.0.tar.gz 771701 BLAKE2B 279394aecea61795360db3b57140c55dc2801f55471fb97754e054ccd5d99c87e17dc637cdcb347be258034175b96efbc18d75a114f47e1957cacef897822df3 SHA512 7b28706449f9365ba9750fd39925e7171516a1e3145d123ec69a12486637ae2393ad4c587b056403298dc13c149f0b01a262cbe4852abca42e425d7680c77ee3
 EBUILD usrsctp-0.9.3.0_p20201102.ebuild 640 BLAKE2B 7d2ea129e798ba74f2ea6d7c42cfca30c547f98cd3e67882589c679c7267f748719370c423582dbe950da131a51fa4d32bc525d4c97d509b84b23ce28005132e SHA512 9279d6e369cce5d3dc980aa96c92f96fde8357a20ead93c3e3d8a5f3f9ce2d9553e1368b43bef497a74bf5bf32340b4982d97bcf66743b127816ac4f2447f3a3
+EBUILD usrsctp-0.9.5.0.ebuild 576 BLAKE2B 38d64e9344a13a0cd58823814303739694f40abae2262791d2b4ea60b99fb9325d359707836d51dee327f011626b8df458f433f915217a2453d2f5127e7c4f5f SHA512 1ad2afbd0a89248e1fa9570ae39f515b814e636247fd7e34d4524a4dd962d26994963ecfca8562205d0527648a88f01fc7f0488d3532902ed48893ed5cd51f7b
 MISC metadata.xml 474 BLAKE2B 1e3008d0e7511e7650e5193bf0c43e97ac056ba325d45a7938f4c9616514c82a62047870658a36c06a24b53d17a51908b8ea7d958f8514691867b4bc6467910f SHA512 a4677b4ae4fd2d28b38037605100fad92be2d7927319bb3caafa54cc0ee15ef76f9d4376b098d56bb1bb4582b14860f28a2efff9c38a72c7b7822f58e2a8ddd2
diff --git a/net-libs/usrsctp/files/usrsctp-0.9.5.0-pc-inc-path.patch b/net-libs/usrsctp/files/usrsctp-0.9.5.0-pc-inc-path.patch
new file mode 100644
index 000000000000..668f522a09ef
--- /dev/null
+++ b/net-libs/usrsctp/files/usrsctp-0.9.5.0-pc-inc-path.patch
@@ -0,0 +1,22 @@
+From 70d42ae95a1de83bd317c8cc9503f894671d1392 Mon Sep 17 00:00:00 2001
+From: Michael Tuexen <tuexen@fh-muenster.de>
+Date: Mon, 29 Mar 2021 13:36:32 +0200
+Subject: [PATCH] Fix https://github.com/sctplab/usrsctp/issues/574
+
+---
+ usrsctplib/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usrsctplib/CMakeLists.txt b/usrsctplib/CMakeLists.txt
+index aa99cf2f..84bdee2e 100644
+--- a/usrsctplib/CMakeLists.txt
++++ b/usrsctplib/CMakeLists.txt
+@@ -45,7 +45,7 @@ include(GNUInstallDirs)
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+ set(exec_prefix ${prefix})
+ set(libdir ${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
+-set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}/usrsctp)
++set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR})
+ set(CMAKE_MACOSX_RPATH 1)
diff --git a/net-libs/usrsctp/usrsctp-0.9.5.0.ebuild b/net-libs/usrsctp/usrsctp-0.9.5.0.ebuild
new file mode 100644
index 000000000000..b90c995a89d7
--- /dev/null
+++ b/net-libs/usrsctp/usrsctp-0.9.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A cross-platform userland SCTP stack"
+HOMEPAGE="https://github.com/sctplab/usrsctp"
+SRC_URI="https://github.com/sctplab/usrsctp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( LICENSE.md Manual.md README.md )
+PATCHES=( "${FILESDIR}/${P}-pc-inc-path.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-Dsctp_werror=0
+		-Dsctp_build_programs=0
+		-Dsctp_build_shared_lib=1
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d3f1e8e2eeb6..eb682b021b83 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,5 +4,7 @@ AUX 2.28.4-non-jumbo-fix2.patch 1196 BLAKE2B 735a58a9ccfc9fa61a7d8e649262404d3a1
 AUX 2.30.3-fix-noGL-build.patch 1005 BLAKE2B 644b114779d34f644168e3cd1e4fcb5827bd39afe3c0f6a615c7ac9ff36b74d9a4ed34b7d91ff9400fd5acaa4d9321c22662d8625a7510a2c6ae411d6bd4c593 SHA512 15cc427a6db3fb32f1951d1dbb39b5d869601be916179d17dec244e80cda16814598271667e2cee75d367e596c470bb8c837abc7651e65ab19305c9b9fbf0002
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
 DIST webkitgtk-2.30.5.tar.xz 22311832 BLAKE2B b00e889d59883e62bcf179df8a766e20a7cd7ee2db462c4eb4279686aac5ea1cad7903189b14031088ab23b8dfd89c1f09f90e2deb5d208281d55c262cc0cb3c SHA512 406fc767a806bb2af446c73e7079720a4d82d592a95a20f30f468c31cdc2efd25e082a5ecfbe00c27f62236e1e56a729c48191451d130188419967975378235d
+DIST webkitgtk-2.30.6.tar.xz 22311524 BLAKE2B 369a2f03b99a17b3e7ffbd0a8528a0d7f65334138552e7684fdec6b3003fab8d9a946f1b549849562b71e9a0daa3f870578d088833db2e8e291974bd38eaed05 SHA512 fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f
 EBUILD webkit-gtk-2.30.5.ebuild 9253 BLAKE2B 945c97bc92ac3009bd7e5b8fdbc176175fa238ad58d75b9f661f6ef8b8dbf47a48fe83d26918449ba915a15756f11f7f432841d046fe176fe0d42b1483bc7192 SHA512 091fb0254633926e3408ae67339da70964f336b56242205f9b94b8511fb5c790a7c536fa42ff4ddedaf4c664a1146288ea92878a61fb4729077a5c0432e3a006
+EBUILD webkit-gtk-2.30.6.ebuild 9253 BLAKE2B 945c97bc92ac3009bd7e5b8fdbc176175fa238ad58d75b9f661f6ef8b8dbf47a48fe83d26918449ba915a15756f11f7f432841d046fe176fe0d42b1483bc7192 SHA512 091fb0254633926e3408ae67339da70964f336b56242205f9b94b8511fb5c790a7c536fa42ff4ddedaf4c664a1146288ea92878a61fb4729077a5c0432e3a006
 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
new file mode 100644
index 000000000000..b62e32197a1e
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..8} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+	eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
diff --git a/net-libs/zmqpp/Manifest b/net-libs/zmqpp/Manifest
index 7aa41433f352..6eea1156c9ae 100644
--- a/net-libs/zmqpp/Manifest
+++ b/net-libs/zmqpp/Manifest
@@ -1,4 +1,4 @@
 AUX zmqpp-4.2.0-multilib-strict.patch 496 BLAKE2B a91028c19591f329832ed81798a96bb153ddc56e9344161fbab1ce24cfad1c04ab461ecc35b008e9d7a1c80db798d79d3569d514d5c1f419209ae6e01887a0c8 SHA512 2696c95f5ae7dc5a36141b756ea73c0fcd50b9ba7c3e4e9ff3187d0bb76c22bc52fdcb334e748e27a2f1fd6f71dc7ec97b60c73b6733f0d1c598c63c041d0fc1
 DIST zmqpp-4.2.0.tar.gz 102942 BLAKE2B c72e807e68aa9142e3e7f06a1c9207a4477538b6ffa1a9077d70dd4f7f2a7c17809bc9f71a478aad4cb3204955252d6468cf14f1aef014c062a08e7f68b2f1d0 SHA512 a6b767278d85f38e5d78a958980782f15e3214db169ec2da118216c002657e525783d4ad3b9043d742801acf77b9b070ea12c18ec0e311e01f13d90d409277a7
-EBUILD zmqpp-4.2.0.ebuild 763 BLAKE2B 18adf26085e21083a3c2633da4efe152bfa878107ef1498005c0c980f4683d02fe778d61d5d4553e6a9da71983e57016cf940385f3c36894e99a2e4e4977dbf7 SHA512 90e4619d39ed3fdd557c2ca49823a01d58efd0bd62ba1bf2dc6b87d50a24556a9e61869b606946d601bbe6ae0288841a19cc240803f289d45057892e57755d11
+EBUILD zmqpp-4.2.0.ebuild 762 BLAKE2B 4fc7b938252259ebd05ad65059307a75f02d01cc272a637d8893382e19df7f628381e6ac25586f3b99a4ec015e4ec39e5d26e6f7b27f66f93c5db9408c554cb9 SHA512 c81acf5aaaf10bf751fe10e43b353aa55e65663e8e8ca63dc4e6f0021fd25c8730ac4e9b54a8044f5f8b6979ee82e356ffd82b5be947a24d59776312d0ca9ab0
 MISC metadata.xml 340 BLAKE2B 449dcee565bd94118423698d1b0a0775ed49e399489904411ba41257fca80b6a6ff3ca4cb735571e4b64d7441ad1603de687ee113498b2193e323d16d4f12c16 SHA512 603c91cf185cf470c55b427d8aacbab2e7b2298e4e1d49f3af5fc50257a4eaf7b3ed301a134696743b550db32ffab956efa17c25c7d2a524a7d6d65b230841f9
diff --git a/net-libs/zmqpp/zmqpp-4.2.0.ebuild b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
index b78adb04f7a4..1394708a3dff 100644
--- a/net-libs/zmqpp/zmqpp-4.2.0.ebuild
+++ b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-if [[ $PV == 9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/zeromq/zmqpp.git"
 else
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /net-libs
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)