gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-libs
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
256 files changed, 2180 insertions, 2163 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 888a8a5fb043..410cb4eb4207 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index d62f4ef475fa..4e8c4c233dee 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 4585 BLAKE2B 3b6e2d175cba0923567bfc133f15045d11099c2f107ac120839dcd566712e9d665fb709b48c5929d0730ffd12b77de30ef9b964038c3ba65724c914fd9b6bcd8 SHA512 340d97ab8af89a2263b734ac5a3b731450c38ee46edabd5a7018be91de3eb8f0de2106c38f9ef9f9d73c3347c8c65f06c28c46558c080e857dc7016128ddadb1
+EBUILD c-client-2007f-r6.ebuild 4582 BLAKE2B f74f53e38c94037db0e69c5b14aea7aec4b9776e2363103006822b798d9d06fcd72ce3b2675a96ecd0e0aaccec335943d69beeae9fad8f32a659b5c7f03868b9 SHA512 98b894222401b46c31549ccba81cf93bbccb1b6498376d6689223a2159182406af67242d26add36f9323e1ffcfe7d87b932fa6758bd29c93d518c26aa0883b31
 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 48c42361f181..26f2a60b2686 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -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 ~sh 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 5f54d29c4f68..7ca17ba3969b 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -5,8 +5,8 @@ DIST courier-authlib-0.66.4.tar.bz2 2192331 BLAKE2B 8fd68153b2defb63bbafb44b34c0
 DIST courier-authlib-0.67.0.tar.bz2 2194546 BLAKE2B 2ccb6ed15c2f02d206606f8bba04c9f2da415da3d739e456914e44010c955c9aaeae1f1c0746c8812f5165eb8db1997284e1c378132a6144da2b8f77d77a6eff SHA512 6e3da28d555761177727c44b1422bf5baf6ffbf28f53cea89a4a8e13daa5433803deba1614295d9679c41b5be4750f464e7869a2d3ecbfd91ae84e7281c4f3ef
 DIST courier-authlib-0.68.0.tar.bz2 2194982 BLAKE2B e463390b49bb3ca147467d3054a83d5a8ce96b604bde0b624c4d7ce81235c6f747e5d847dde794c81c4ad36aeef49bdd27cf904142b4542df833484c5eb7a57e SHA512 5c4adaf0fd69f4b9e780962aa3f9eeac6b15cea3f302288ff4549ce2b0be9ea0808b4501670ef3c4e0419c3d27505c256c082f795dea4683dd5265fd7dcab93b
 DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
-EBUILD courier-authlib-0.66.4.ebuild 4504 BLAKE2B c014d07936004ead76bb1a0797f9de19216b89c7ec839713e7bf58cb2425a5b2526bb42dfece816247205ae2e3c3844c9aa4d674bc2f1974d84587350714f687 SHA512 2642298614d76dbffa1d1391f997a8ab447489748c3d3f827f17b29da262b246213be0874e0d014263e3846615d96101a7141085b8e2b8d6d4bed4e0c4d3424e
-EBUILD courier-authlib-0.67.0.ebuild 4556 BLAKE2B 8db66be2de9b5184766de9580d55dd7d8b02ad1be7a17aeea6cba66b7996e1fe7058f42a816525456d3fa22cc8b4a5791b6fc35b95d4300fea9623dc77d1d976 SHA512 6ffe4259af6f944c5d63cb56cb0f3ebb33aa77deac3c5cff03afb0ce9ec3e46967cf5dda518a0b6160ab76adc3a51fe63ddd7a627f51788cfa3a41fc8af9b7c7
-EBUILD courier-authlib-0.68.0-r1.ebuild 4557 BLAKE2B 6b93605b9a09477ec3b7b2436e2df4d821b4af3a9d4b45a6938ce31b5c0370d355dd3e904ebac32d75ef69c394f40346fed8ab5e9b534d71f6e2cbc218ac181c SHA512 66eb959da8b97598c1770ca97ef0c818afe1eae88f76a50634297ce3708774819d3aed1809556baf41f0e83fdf2e44c5e64aec65f2ec264828dbc99ec9230b20
-EBUILD courier-authlib-0.69.0-r1.ebuild 4513 BLAKE2B 17e48aae9e49155f0ff87af5c6bc15d51859ae382b1983085326a57faba1c5d0e1c0f7f9c93963bdadd4a8b7af5b9fb7c808adc18f8ff43bb4d7a1e7f035939d SHA512 ae54cbcccda246b7a08558afc74ab80138e88ad05b0bb3d657a2ca5a06e3071e09eba98cbdd117bf70e613e2d2d015929716582e87a25d0d61c6f005f3e50cbc
+EBUILD courier-authlib-0.66.4.ebuild 4501 BLAKE2B 30c2baf02cf1e778a277badd62d51fb9b49e67b7bebd4f36becffc6c4d52e76836d46995c35d68c056f1eaf3f678afbc793625e9b8eff6a258a227c0aecfcc3a SHA512 8dd7214a34b8ea4792717e2af63463c1d535737baf5972b3e07af0c6f48f57e9f1eafbad7342281365c175eeb06b3c1f24213ba0c3cdfd447767c91a4b055dc7
+EBUILD courier-authlib-0.67.0.ebuild 4552 BLAKE2B 4acc4f0c9cd88ac6f9b73c8e622c857293e675f558a3807fd28b0c7915b3f632c1ccd51b7f4e989478e4bc48d041a247ede0793e24b0a1dbf5fd3d1ca471eae9 SHA512 ecf9bdeb1c617107802ed934f2c28152e87fbd24f00d4e0cd347c923f465e581c69d8b875cb586d6823a5b08cfad51af7dd3326b1efe77137e393018a0f77669
+EBUILD courier-authlib-0.68.0-r1.ebuild 4553 BLAKE2B ad2f819f14aeb2c7f4dcfd051d55105742d3fd50cf7fd630a471b7b507debf8000c05b7099b1fdde010fa34b8b34ba366f4acc331625b1f3b9cbfe4fb79a29bf SHA512 b14a3afb99fe0bc003b8cd021178d1a9e4d8306d51bce4dfd977875a718f42649144f980ed0da4553ba17738bba8c13aebf10eb5ed1e29897393845e59a799aa
+EBUILD courier-authlib-0.69.0-r1.ebuild 4511 BLAKE2B 2dd9250efd5570d1b7daccf670648bff90301c57df511503058dec0585601a954cb8ed5a58121ac32dd4c0410854148e25ce45f871ce47333595ada90aa878fe SHA512 76786b563120a896110e987b86587a80211cb49f84af86861bfafa301134d13f16997d7411da6caad0466a63ecddcccfaff5cd6e71110766413128f808098180
 MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index 2aa2cb765ad6..915013de6864 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils flag-o-matic multilib user
 
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm 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.67.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
index f23fa23f03b5..41a7ebef3710 100644
--- a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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.68.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
index c83f2a20ba93..3757bee93004 100644
--- a/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
index caa9550e1a37..a95655f28ac6 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
@@ -4,7 +4,7 @@
 EAPI=7
 inherit flag-o-matic
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index 8e172bdfe4ea..00b86fb33e3f 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1,7 +1,7 @@
 DIST courier-unicode-1.3.tar.bz2 394011 BLAKE2B 5d5c2a9cf04976819f2bf1d01c9193fd5ef441461cebeaec4b53d9a9402fb97b605d6ac08d4e7339f56d39d4bdd85693990eefd90c4b5a20788d8b5fd9413156 SHA512 4384874f0f2298ff5034d7541ffd3155a3aa6a6b2d73fb108b5072a0dd0bb8236389b83161625bed7f923f724fa11bbed42af28234d5c6e5b6d370c407e8f677
 DIST courier-unicode-1.4.tar.bz2 434338 BLAKE2B 6274fe8a73b19e9e3694219aadb192f73d101cd3966d67b1c0e28c0271001a5b263a43385b73a473b6a263bb6ab7ef94faa453fa9a7f0c15bba4691b6ab421f5 SHA512 1d9cc3efbbafa88631e37de0647d2e873a8264a02a0ce588687b90e15dedb60c23058312abbc771ed1ddf824ba7c81b16adebfe9db69da953b9856eb66d31264
 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
-EBUILD courier-unicode-1.3.ebuild 474 BLAKE2B c5288477a1585435ad6513d2a47169ae1e14df8b69ca739b578936676340c5a0ab9eb9df634f1a3cd046ddf9042c7c29cba1060a26354634a784e5f5235af922 SHA512 fa6a9d7dcc5a2e3550836c8c01321a3bfcbd670ec86cc8416123dd89a5c4fd6e353efc7d38614cbf8def2922ee93c5033785ad4108c72aac398499e55b696a92
+EBUILD courier-unicode-1.3.ebuild 475 BLAKE2B d44f8fb295bdc8df8bc64dc4cc86aff458b7c28bc44028450f78bb64cd491b3127e7ee7386b800eece89318d46537b5e414b839b478849060caf8453a3872180 SHA512 6876e3ba2222a11f0a916367366940f31c909fb74403a1cf0f9d3866d0f297d7218b1d1168b5c85740f4c24ba2e0d66f9ed6857d2bfb9a5e98b694ba34daa35f
 EBUILD courier-unicode-1.4.ebuild 489 BLAKE2B 00977d1e1bbf92321dbef743cdb1d7a516fcd9fb29d406fac5239d73fe3cc2bcba80c0a90d482a6aced8fad4361488ce3375f0c4bfdf7d3ba14ed6315c1219ee SHA512 0a08a41e9ea98b052fbd3cb422fde2528443ae521ab9f2b28e9f8944ede4d17221223ea9cca2ce516f30064d1e9e613354ac476fadfa2668281932d064e8c06c
-EBUILD courier-unicode-2.1.ebuild 479 BLAKE2B 006da476d97979db907578a20dc99138ad96ca0107cadead04baa9fcc99bdb77493240c32bfa628544ac4e03df34ec7290e07285f7a5e59c3853534e735a3232 SHA512 9e5ce83ccede364eb8409d3e6ce668216126e1464f297a930060972afc33b5cb6dc88c71f1e1c543e4ae505008da7852b94a0b90b9cc2ffa559204d70709bcbe
+EBUILD courier-unicode-2.1.ebuild 477 BLAKE2B f5fbf470d191e1eb07c8ac5c237b2db221eca2f616e1bdbaa7576dab6eb9252f5a2ad32ab6aca8c3f853960afcb54579ef86a6310cc3c64bf15fe0bce8516273 SHA512 61e3262dc8e9414fd6d1b8623505e3fb3f32290d327fe64d27bc33766e528d89362e3f24cee9a9a93a4bd54f5a64b36ce06a0468710056ee38de157bde1cfb99
 MISC metadata.xml 293 BLAKE2B 85c442aa45e6a97917305b7e9326f8445f5911a3a3913d3540250b83361a16bc07810b8288a692082d9a2203bd696ba87d8fa1b6ba47c046f6d96577d07400af SHA512 39ee602134069ac766933c31bacbab2de9f40aa8bab6450660ce5319a95e285f4d4c463df41f22d7fd7e1c8584634a4b3ada8962941143fe8d4120cbb11515f0
diff --git a/net-libs/courier-unicode/courier-unicode-1.3.ebuild b/net-libs/courier-unicode/courier-unicode-1.3.ebuild
index 2e577dd99301..56ea09b29057 100644
--- a/net-libs/courier-unicode/courier-unicode-1.3.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/courier-unicode/courier-unicode-2.1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
index dfa62d318f41..6dc015faefea 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index e070f9555e71..9a990fc30e1c 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -2,5 +2,5 @@ AUX cvm-0.96-fix-test-padding.patch 971 BLAKE2B a0a6dbd617427347a4b93b436f326d2c
 DIST cvm-0.96.tar.gz 127999 BLAKE2B bf6a0f26538f4f10dafe9d021e6f3ef22ee57230f64cf50cba95be3cb5ddf54a0479d033936d26ee9526745ead61fc6af7bfd1fdc3da10a6915108b2d873772c SHA512 23adf39571bf414fa61084ac824a54b3cb37ef32a46c72ad50734743fb66bb923168eb866d72fba7f88397b37831e2ce7603c7d543996b28761ed1d5b053d73d
 DIST cvm-0.97.tar.gz 127759 BLAKE2B 857a30ae52e7edc5e8bc66dfbe7e2ada6ba7763260b073eabbca6ee289b68ceece92442dffc5aa1d358faec24f90993d88d3555dd9399837f25e9f689ab6d66b SHA512 b04ca9edb8c84e06628ed1a827d28bf7d787c3853bec1e064fc1eb7e3082ad81998e7c902e029c0f01c346a52a4419e3c9890e2a7a75ab38625e0078dc4e9891
 EBUILD cvm-0.96-r1.ebuild 3208 BLAKE2B 0ad53487cbaa52ca349b1e12abfced27584808a5d0c8e02ee56fc90bd091b79e413d435dd4a719237a5a2e945a6f1edae663fa14f007aee7badd65b3ed90cbb1 SHA512 b761512901a1a10b4d9c1f1952a3e63ef09a1257dacba6afec9588389c4967fc49b056a314a05c1b1fb7c644e0bd4f32b8cfd4767c62f09f4f46b5ccd7571705
-EBUILD cvm-0.97.ebuild 3238 BLAKE2B 6ae08ef6bf661b013167cecb2a76a735ddc05c4eed6b1be8bc195101ae394550c578b766c67107abe718a2b28b5ec12e65adc274d98bb4540ef6fd657b654651 SHA512 f100e1089aa30cf5da7260544db21ba27a78d5a7eb3e6d07fca2fdab95a193fa81b0c7d176b52f969b5de7c089e5e3d1b9f57b6b3922cb8633c265a2ac53d057
+EBUILD cvm-0.97.ebuild 3237 BLAKE2B e4c0d2bf498717fbd4aba72e42367822310f5f4e34d498b7f55381e259f2ceb28d60b0cc7237cda14f52e3a55e0bbaba86a1e6063f8e3d207dc3386b54ec51a6 SHA512 e736a653e6f85dbf1efa5b6af80852bd3e7263006792c4232ef5c41edb950f722576d0e4f00042206cf2665d49525cff688900ceb02637b804e605dc014b7a49
 MISC metadata.xml 237 BLAKE2B 0c8ef45b6f0e15404fc767ceb7b133a844621199b4b5a5f8906c6e9ffb186572a46fd6871021bb4fe3e3b1f76ba75f38bddcaaf8eddeef43568074a54dea0c9e SHA512 34de058bcfc91edc8aa792fa3a20d0bb0318166634113402f22da57d97a4d54f8710c922c38fdd810aeb3bdcb9591494d5b20f63441ff77d242ab83f764126f3
diff --git a/net-libs/cvm/cvm-0.97.ebuild b/net-libs/cvm/cvm-0.97.ebuild
index 849b3cab3e20..d69c9a394878 100644
--- a/net-libs/cvm/cvm-0.97.ebuild
+++ b/net-libs/cvm/cvm-0.97.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE="mysql postgres test vpopmail"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 77cce07e92b7..11e1c6555ab9 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,3 +1,4 @@
+AUX farstream-0.2.8-make43.patch 1959 BLAKE2B d7c18eaf156a6cca991014dc512898cf93f1b67b10c78f28bf6cebf772d4a8974daba1305f06d7087f43fd766218d49724dca471835fcfe5dff06a105f40bb53 SHA512 c577c5f9fb384f93ce7e36cff117d3c2dea92dc7b15064dfed19d18fc5d8658044df19e2f0cc112cd347e35c6038501e0b05a1f97c95b0f43f776aabd8fba01b
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
-EBUILD farstream-0.2.8-r2.ebuild 1860 BLAKE2B e80d8868614111ba86fa4d803d74451b942208b299acd0a282f9437f3abb097f51e749787798273512b182b11dba538071bd178a8e606a4fe1e9081a9f8fdd0a SHA512 91fafd03bc9be4a0b886649f8cfa66dcddf811b782855d3ca159f47daaad97733935bdda530b1db3d2d90954476dafc4d9f4417500148c226b96d32d5a0bbb80
+EBUILD farstream-0.2.8-r2.ebuild 1953 BLAKE2B e9c9f5de6b43a6247c4baccce3efb5479800fa644c00101006f23f736a9da3bf6d3094bd19d884ba7080eba6282cc188738316926e892bec56d105005b229433 SHA512 12809e87540775ebfcafff08e2ba0a87f068cb17bf03f013886c3db8a13d38412c7a5e944f168aa11baf045ef81b55dd2abba7da635346886c7f2a5c49804882
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index c5a2f6eb67f3..6f6083115146 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -12,7 +12,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 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
@@ -44,6 +44,10 @@ DEPEND="${COMMONDEPEND}
 		media-libs/gst-plugins-good:1.0 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.8-make43.patch # remove when bumping and switching to Meson
+)
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
diff --git a/net-libs/farstream/files/farstream-0.2.8-make43.patch b/net-libs/farstream/files/farstream-0.2.8-make43.patch
new file mode 100644
index 000000000000..c1e1c0d42791
--- /dev/null
+++ b/net-libs/farstream/files/farstream-0.2.8-make43.patch
@@ -0,0 +1,60 @@
+--- 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 2477b1296f63..17e1d47fc749 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,7 +1,9 @@
 DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
 DIST glib-networking-2.60.4.tar.xz 185628 BLAKE2B b10fecb88f09c4c33718a923f6ae5790baada485b4dd3637b0ae9bf5f831b74ac4b87fc398eed4c4a88b7069e4c5bc9a58c04ccbffc056648baa58b43d4489a3 SHA512 db1019c0fc712c0702679146bdd9490101cec63796792a33c7fc7fe26a85d343cfb11f718601a8d3bd91167505bbe60333cc01999a0496826c31681bb8dd4032
 DIST glib-networking-2.62.3.tar.xz 183996 BLAKE2B 3841a355fe485f30970ab571fbe7ae73c8351cdcdad5021809fcac4663bca31b309a0921d07b2551c428ac154da2290e377da0299e66b2b099dfb556f387d18b SHA512 6bcf7584a4d97745e980598eb9182ba2e416471455d9c3debc4cbaea07250e395f6d7001af544ce0114a26d726e71e9b420d9756508cda09499016e89f4a6da1
-EBUILD glib-networking-2.60.3.ebuild 1770 BLAKE2B c0db1da80fb63c85a5509060519a324cfded0b6197a82cfeff9a092728dc52361dd08fff810c590c0972330e66a562679ebd4c72190dc25a646d673d6cf07323 SHA512 768bbeb31d1efa08aa29d71e4c9238d7ca47eab2af0887843e0505dcdf6bdb865319d9138453774fb0308341ed12c2b87f21f10e02a2a3f88844a83ebfb982df
-EBUILD glib-networking-2.60.4.ebuild 1772 BLAKE2B d4d5464d05565614309ef4d7e8b32b3aae6c9652ba93e461cdecc8a90ed29ce3e9d0b772c90acc1df642207c32dd20253c7b0a1c4366b41e40441d79b60d1d28 SHA512 56936435a5db3308e7251a28523611b17125dc1eb3432f7c5f86676cd99019a56023ae1655af533243b251cba79ccce3a4cc40d8b00a47468aa1939836239ede
-EBUILD glib-networking-2.62.3.ebuild 1780 BLAKE2B 0af9ed42a6c3a15b7db75ba6f8dcbeacf2ebd006daeefe43f70253a430a2f61bdb3c3764cef834de6c088f5e3d25fcac226483a04a6955fc22e14f20fceddbe2 SHA512 2d56008f5b05f5af0a4195027ef38538a0cf7f8b6f4d30e769397e86e35d02723dd56cfeb2bcd183b18fdc0ffd1a73704154d4a4869b96271ffd0fd5b2ffd883
+DIST glib-networking-2.64.0.tar.xz 187708 BLAKE2B c80a575a48bd5fd77a53a823e0a1ad98f63f75a1f83990a9ba28bd35b401f867b5be0afb3ce2650855b34e6d5a043b354086620c6c1caeb93feeeddab92292e1 SHA512 c5788167c114ab69812d4784912e0e468086f1ba1a8037dffc98466605af3f7a77f7a2666176da260669640bfbdf94ee959878c6297d93fe078d22fc6ff0584c
+EBUILD glib-networking-2.60.3.ebuild 1767 BLAKE2B 2333935562c3520aecac692b63c22d5693322ef3c823678349c48895a6835e239259ffc1ff7e733838c8c48edd385411ace855e845ea454e41a1c828abdacfd2 SHA512 1b4a8e165182cb3ceea9587fcb18747cb9a33fb01571767918ec313e06c7161eb5a9553327aaa648827c6b338fc7612823d3ad31c729b8f0ffafef30b231d723
+EBUILD glib-networking-2.60.4.ebuild 1769 BLAKE2B 0b367e7a9a067c8142a9c7973b34b3130c179c3f6796f0ab4754629f53a3100466c3af381ba84d80eaf29cd226b4b19127edf50779a2eff909948d88a7e1337b SHA512 aa6d7172e9f785e08e9c02e0eb6508ea584bc1c3498b4872a3a11fe7ee429c707329d32a88455a9d2ef30ddd52ec9372fdabe9930e706d9989d35568864e03d1
+EBUILD glib-networking-2.62.3.ebuild 1776 BLAKE2B 6602ebf3b51f128e82f741912e308c60d6752391c2366e8e0c83a221b86953a5f43b51ab4896ac067efbb29f8277482fed3924e8d1fd6ed9428678b36f6165fd SHA512 32584107b3d4679f1bc4f469de74b55728332852bf3b8d8776724e17d69df70276c54a0366933831e7a4c575634095b8c8688b6c1dd32ac53d21b4e7f3ab67cb
+EBUILD glib-networking-2.64.0.ebuild 1776 BLAKE2B 86f26398b596fc5ea94ed0bdb750523fcb3daeba92d8fa6425b97195477932aba70f8d31379bfbd4e12f2c30f1bf83547849042858072f0e49bc2149cb5cb4c9 SHA512 e8221e8d4c0cddcca0dff06fee174d300836ce549f0f9b4d75e9a9e9a658c5a75479379123b5c520e606ee6b958df515b67a2e8875fa3583f71647d8a7ed6822
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index 4b873b20e954..e58e9fbfb911 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.60.4.ebuild b/net-libs/glib-networking/glib-networking-2.60.4.ebuild
index 6e5bef5bb521..1f70d0a88eb3 100644
--- a/net-libs/glib-networking/glib-networking-2.60.4.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.4.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.62.3.ebuild b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
index 8862fff92c3c..ed132f187d7f 100644
--- a/net-libs/glib-networking/glib-networking-2.62.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.60.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.64.0.ebuild b/net-libs/glib-networking/glib-networking-2.64.0.ebuild
new file mode 100644
index 000000000000..f4858b4fe70d
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.64.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib-minimal xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gnome +libproxy +ssl test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.6.5:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	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/gnet/Manifest b/net-libs/gnet/Manifest
index 4c34279bf539..76da146f53d5 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 1986 BLAKE2B 306521d23d0da12c3a823e0d8b8df4bbb3a9fb8ad6fb8457825256c3189b70a28b5c9d202bee14517fdac57fb21c59a518e92193f431c9997cf19b743cd3f3db SHA512 d8a7da9b113b1c89682ad26b2aa599adfad850a8b13295f40ee927673767a12f65119b15d674a0e69c9082b821b6cf9c5109d2761d0b23ebf5ae7cefb07cfad9
+EBUILD gnet-2.0.8-r2.ebuild 1987 BLAKE2B ef5d1439b6eea7e13be646c11619cbb4f4621922a9bb2632ba19cde05967cda1feee84e4cada1b629e1e2063369a78a88b83c9477c49637475351f6a0fd996cb SHA512 000042fb56fcad9b98bcbc64a2002b27edb393cacef0b53b5ffb23a7ced37060afdf3702f76b5f165ba1de314119dc753909468c28c2b925f42812de46adba14
 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-r2.ebuild
index 9fa9aa099b5c..f1c6822d9696 100644
--- a/net-libs/gnet/gnet-2.0.8-r2.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GNetLibrary"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index a745438cf23e..2e0095c9192f 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-online-accounts-3.32.1.tar.xz 863252 BLAKE2B 69345a5e7a9ccfef231cb012a1e3240a31db898f32b654f6275fd18e027eebe5cda07b4a0f8fea1447ca33ac120d8476aea7d2c824238b327c0c207009fcae7c SHA512 548e6c983899bc1f4093fcf0b7b08819f2803182f52c2cdfb4cffa8bfb00e513322973fdfce2aeadeb52b0cd43c7c1e3941cff187927577cefb4fba51f4fda5b
+DIST gnome-online-accounts-3.34.1.tar.xz 856288 BLAKE2B 99a6c242dd57acf009a2b4451287fff5bbc61b0aeb0396b13368b179d1b1604b413ff9dcb56bf4415c990cb4f2cb434a0fcf17b9381dcb5055a99985249af5d4 SHA512 233f1b15d4a7bdbee4ed85ba252ea0d9af2ac15a2edd3ce2b40d76434285fd093f07375313a599fa191f8df1551eb37f48c4784e389fcbaec0565bb3aba28426
 EBUILD gnome-online-accounts-3.32.1.ebuild 2072 BLAKE2B bac9a62f53a529c293150b5e8e39f5fcd4dd73a219794696b61f894c8ebfd8154a633491a10aa2ed6a2d7c879f5cd89b00b76057f80dbaa677749fc2343566a0 SHA512 c0c577d896ea31d6eca8a1bfb7ce3eed02310ddf6caefda8aede69852d08553076ae4c27e14c4ddb4d83064a8042f6774ea86c4728d4ceb4a2661f8d1db2092c
-MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
+EBUILD gnome-online-accounts-3.34.1.ebuild 2068 BLAKE2B 41cb7bd8ad404bb3d89ca0fd868aa1811d2bec5ae683cfa57e1c397f910fc00aca5f02e59cc6e929e134a462429ce19b760743c91e37ee2ebc87246d859fd55b SHA512 f2de4e3d6ab1d663d31ceea79880f44b1dbbe51f1e4318e2e7f14b88c91e9856d7a00c1295c43c4ff2b8e535d085c3a7ac27eaf1bba9e10b6cd3f3781715cf93
+MISC metadata.xml 379 BLAKE2B 36ab13a2c6483f81247083c86d6424d66e0780ac4e16c485588bbceb8ce8174de38796de29af933831ec3075dacef135d2c06d18b22d601e28a1f5fe5f7661dc SHA512 fbd620273932175e14f89a7c155819d7733309eabdb0a82113f9a88d8e33aae3c2b35bdfe5f0883c133e94d4eccf456ba496c419d15e98fd0cf79b685f7a8c69
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
new file mode 100644
index 000000000000..f2f39420fa86
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="debug gnome +introspection kerberos +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	>=net-libs/webkit-gtk-2.12.0:4
+	>=x11-libs/gtk+-3.19.12:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	kerberos? (
+		app-crypt/gcr:0=[gtk]
+		app-crypt/mit-krb5 )
+"
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.3
+	>=dev-util/gdbus-codegen-2.30.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	gnome2_src_configure \
+		--disable-static \
+		--enable-backend \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-foursquare \
+		--enable-imap-smtp \
+		--enable-lastfm \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-pocket \
+		--enable-windows-live \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable kerberos) \
+		$(use_enable kerberos fedora) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml
index 009604473b86..77001fb72285 100644
--- a/net-libs/gnome-online-accounts/metadata.xml
+++ b/net-libs/gnome-online-accounts/metadata.xml
@@ -8,7 +8,5 @@
 <use>
 	<flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg>
 		to set GNOME online accounts preferences</flag>
-	<!-- <flag name="telepathy">Provide widget to configure the telepathy
-		frawework</flag> -->
 </use>
 </pkgmetadata>
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 7603bd4c37fb..93c27cda2ff8 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,7 +1,3 @@
-DIST gnutls-3.6.11.1.tar.xz 5902328 BLAKE2B b0cb2fd651411d1647a927bcbf8ae032e68b2d4ab3ae4a1d2b77d7dd13420e2e31cc66c3e106d830051cea5e0f9d3ca5419ec5ae57ec490638cb033fa740974e SHA512 55fbbf0ebc824fbc91ccd08d1708452c5b1c12af75e332f29414540eb2f81337fa605a693ce9f34319a927e9d71177e6e7ffea5c6747792d341fb740f68c9489
-DIST gnutls-3.6.12.tar.xz 5942064 BLAKE2B e3440e914982c0ea0a7ecf9da3784090a1d5767dc026c4c8a5dfd0218d8d4478d316635328667792c853a97bf95667cc1dc53ed850b3d0e9525a29452b42156f SHA512 e1031fd1239d8b0f056a6b736e4c72c9268fb635f273527f310771c608b841cad7b6631401382ec3040d9b539180bf421882bf43427ad3549a5787d2864c2fa5
-DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81ebc5eb13d9e04a01f7f32ce6189f71f05a18c90c2e57aec688750e917ee948261726acdd7752d9d7d42a9c7ac2 SHA512 ae9b8996eb9b7269d28213f0aca3a4a17890ba8d47e3dc3b8e754ab8e2b4251e9412aaaa161a8bf56167f04cc169b4cada46f55a7bde92b955eb36cd717a99f3
-EBUILD gnutls-3.6.11.1-r1.ebuild 3998 BLAKE2B a142d3cba3f4df0daa1300be72e0ac81f1938cb2ef1ce6b7f9dbc9434fda44b3e2f98e0253e039c85f7befa77ac423df08b881f2c2a3eb861f8e269f3d29f0dd SHA512 fa259b5cabc58aceb9c12a76a69a0fa79b0ee2a3bd11970e398c68bfb4edb491d1396d7e41f841914ea6fcb7c8bb54f7478cb59adbb914d8ace98e27f3a505fb
-EBUILD gnutls-3.6.12.ebuild 3998 BLAKE2B f14fa6c6e917e13d610516f7874abe09a3ffc29cb507aad547722a1ec6b9ee82b1afeebe19e8d1c560e613aabdc2b217f1b0e98773f14a4d05a63bcf37805a17 SHA512 602bb6d3fa5e4bb353d63ecdedfb8a474bf6c4780d2655c747f439bb5e046dbdcb6ed2b6208652de8e23afd48b082ec07dac2652387e0d1d64afefb776175f20
-EBUILD gnutls-3.6.7-r1.ebuild 3997 BLAKE2B 8891527a4996777c1ac79121232bb4539fdba37ac7ee2c32a982ab2b1bd4f347ce44f45cc1119fb5ce8005e4ede66a32f60bdb6689548989f7ceb3a524496c85 SHA512 8c8e7cad73c8be7c9d6da851176d9d74c781981abe285c57714debbe8e9dcc6d9263c3d204bbbd8dca3760f4f94459ffacea76d9bd234140b97c64afabd84d20
+DIST gnutls-3.6.13.tar.xz 5958956 BLAKE2B de67f96198b6456f397bf203f13bf1f906b69c7ce632dd96b72539fea12f2bd8ee8b2c608d1ed8b06d3b189023fa81e9a2cfcdd6c9bbd174e5bd2b0673f6ca47 SHA512 23581952cb72c9a34f378c002bb62413d5a1243b74b48ad8dc49eaea4020d33c550f8dc1dd374cf7fbfa4187b0ca1c5698c8a0430398268a8b8a863f8633305c
+EBUILD gnutls-3.6.13.ebuild 3985 BLAKE2B f8800a3883fbd2f04ac22f51d6486558ea48aae6393acde4361e1f634a74dfd0b9dbc1311fb8813725dfd14f45ad8f33e3338189fefcf554540c85df244181e2 SHA512 235d6a4c22ec21768d6feeb05f83cd7fbbe31ba78c20380cf7530ee17aa82d50d1465959fd62d5bcbd8c3cda4394600820f94a34c95e70b36592c778a8da6a61
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild b/net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild
deleted file mode 100644
index 86457bd17c46..000000000000
--- a/net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1+"
-SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
-
-REQUIRED_USE="
-	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen:= )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	local myeconfargs=(
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable guile)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.6.12.ebuild b/net-libs/gnutls/gnutls-3.6.13.ebuild
index 5fb2da5dd557..1969a8391568 100644
--- a/net-libs/gnutls/gnutls-3.6.12.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.13.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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/gnutls/gnutls-3.6.7-r1.ebuild b/net-libs/gnutls/gnutls-3.6.7-r1.ebuild
deleted file mode 100644
index 77d5e2d7426d..000000000000
--- a/net-libs/gnutls/gnutls-3.6.7-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1+"
-SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
-
-REQUIRED_USE="
-	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen:= )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# 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 )
-
-	ECONF_SOURCE=${S} econf \
-		$(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 \
-		"${libconf[@]}" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
index 5541dc59b5b6..27ae7bf35940 100644
--- a/net-libs/google-cloud-cpp/Manifest
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -11,6 +11,7 @@ DIST googleapis-6a3277c0656219174ff7c345f31fb20a90b30b97.tar.gz 746503 BLAKE2B c
 DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8
 DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5
 DIST nlohmann-json-3.4.0-json.hpp 705920 BLAKE2B 9a22a6420f818038d8c4b352fb92ff0f0041b76232ef8665686399d184cfc62caffb60b4ccf1d8d33ae428839a70fece959f94795d71803623405d041efc9a13 SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d
+EBUILD google-cloud-cpp-0.10.0-r1.ebuild 1587 BLAKE2B 8aea180d6f4feadf28146b0bf690a104ff154c6b484b683141d6135a62aa73f775d22853676808bb27452bd8e2b3f40c44ae97f27d17e6dc057d2ef635a360bc SHA512 6f9f0eb135956cc81921974dc66bf0800c1f12cbf2f52b03edb232f28984b779ad42f53b0d29f30761b46a88443a8b6fa70f515cc5af98eaeb5f309ffc330d1b
 EBUILD google-cloud-cpp-0.10.0.ebuild 1619 BLAKE2B 6fbec550d4745ac11f9cd61f3781220994dc4b57322b71949fee3ed4b44b561c4730ca81df959ea665fa247a08915b961e62468fbaf50d60e91ae1bac9784cf6 SHA512 7309088ff54ba12a75388b50a208c6d8d37e9ef8228c8ee0dc2f3fc00d7ed8a079b6bcd64c2e2fe77c775f2f3736d5acf57849423d0f1c1a9fdd93f49c385aca
 EBUILD google-cloud-cpp-0.2.0-r1.ebuild 1692 BLAKE2B e140396a1b9dfe47a282733c8b50961a2f820e728556a0a26c4ab66769c95bd3af5b63484af7b7034939a62731d190717d21225df6bab8c41034fce04bb847ad SHA512 d121f5d5c913f740652440e7583079aad68b1a1d03ce79145177a0ed9ff8117e7d1354c116be50623b7b7a60fd58279385b3e40181bd23eeda82b7697d140b5b
 EBUILD google-cloud-cpp-0.5.0.ebuild 1668 BLAKE2B 07e76db614ffc35f1accc059f6cfefdc7f75009618ccfe04a69fb017babc52f9177d7c6bf8c44b64f9787b16d82c3776e56f0df7978c7eec42284bda1318fc97 SHA512 da75dae85dcfbc839b95dd00bcf42f65d31bfd4d315605cbe09db9971488a5347327e3f8b71563800ea16e3ac94309b7131c3ce4ca147b026e1ad611982e78bd
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r1.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..b1fb2095c0c3
--- /dev/null
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+JSON_VER="3.4.0"
+GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97"
+
+DESCRIPTION="Google Cloud Client Library for C++"
+HOMEPAGE="https://cloud.google.com/"
+SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
+	https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+RDEPEND="dev-libs/protobuf:=
+	dev-libs/crc32c
+	dev-libs/openssl:=
+	net-misc/curl
+	net-libs/grpc:="
+DEPEND="${RDEPEND}
+	dev-cpp/gtest"
+
+DOCS=( README.md )
+PATCHES=(
+	"${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING=OFF
+	)
+
+	cmake-utils_src_configure
+
+	mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
+	cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
+
+	mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die
+	cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \
+		"${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die
+}
+
+src_test() {
+	# test fails
+	local myctestargs=(
+		-E internal_parse_rfc3339_test
+	)
+
+	cmake-utils_src_test
+}
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index f24c016fd5e0..9e82a3ee66ff 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,3 +1,7 @@
+AUX 1.0.0-honor-python-ver.patch 691 BLAKE2B 1e7954d6bc2feffa97ec429bb96f0d5b6ef4e04eef977731db75bfde4a00d4afab35944a595131b0088569b17f577c41f0ce63987ddbeba5187ae7591f5e9cb4 SHA512 ca5e2495a13a5bedd29dcdfba4c03f74a65d46f964d861adb7d2bcdf73813fe64c456ab52d0ccbb9fc913d6d5c0a76a9d199c114b1f3850d2184e3c7959412f9
 DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b70459afd8bf92630d69cf32d380264814304a68a93d8a5a70d6573b6754658450005a2ea2b96f13ae03f9e87fcba SHA512 498b368eb53ac58172db280c80f9da71ce82b636c39f186046e4f674e44c574ff4b63c3f777acc79d32c17d70e4efcdc207768ed49b3d1842bc4b73618296215
+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
 EBUILD gtk-vnc-0.9.0.ebuild 1695 BLAKE2B 88844526c4ff9ef740f82e349bd72e24fc3dcaca517b354d8764c282edeeb28683717d3f201f0da4c2b2232739ba0126114faa23cec74b3cb27ad5f1e2a7e779 SHA512 6f288b5d4b2e1149f15ed59657752ac2475b6c39be57a687d9ea17bb5fd6e0bc4dd9a98f7c099163f386705c2ef82a3bdd1f4a5b15b9a001e70a084328231376
+EBUILD gtk-vnc-1.0.0.ebuild 1854 BLAKE2B 8d6ff327a0058dbee31ae28fe75dc735ba5929344380f1b5d329811a3416e2f230bc4bb42b30e1e1d94397585e07b4e3cb02a403f29d352fe045949155081b23 SHA512 3c6f53b1e5b85f78a40cc740f127d317bcc417adf9972015ab86cf15ef4a4bd3d45ab5e7771bc1997ff35625b1a9abd8c4c15d127d1cc08c525ee6845cce15e7
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch b/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch
new file mode 100644
index 000000000000..f26a85719b08
--- /dev/null
+++ b/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch
@@ -0,0 +1,26 @@
+From a51acc0c353959e8af06a031724a79cfe6b60963 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 5 Apr 2020 00:05:49 +0300
+Subject: [PATCH] meson: Find python explicitly to honor downstream python
+ choice
+
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 461d8d2..a09aee9 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -308,7 +308,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [
+   'vncdisplaykeymap.c',
+ ]
+ 
+-python = import('python').find_installation()
++python = import('python').find_installation('python3')
+ keymaps = [
+   'xorgevdev',
+   'xorgkbd',
+-- 
+2.20.1
+
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
new file mode 100644
index 000000000000..ffd65be1853c
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org vala meson python-any-r1 xdg
+
+DESCRIPTION="VNC viewer widget for GTK"
+HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+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.42.0:2
+	>=x11-libs/gdk-pixbuf-2.12.0:2
+	>=dev-libs/libgcrypt-1.5.0:0=
+	>=net-libs/gnutls-3.1.18:0=
+	>=sys-libs/zlib-1.2.5
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=x11-libs/cairo-1.2.0
+	>=x11-libs/libX11-1.6.5
+	pulseaudio? ( >=media-sound/pulseaudio-10.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=(
+	# Few fixes from origin/master + optionality patches filed as https://gitlab.gnome.org/GNOME/gtk-vnc/merge_requests/6
+	"${WORKDIR}"/patches
+	"${FILESDIR}"/${PV}-honor-python-ver.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+	# Don't add -O2 explicitly to CFLAGS
+	sed -i -e "/'-O2'/d" meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_feature pulseaudio)
+		$(meson_feature sasl)
+		-Denable-werror=false
+		-Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps
+		$(meson_use vala with-vala)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/gupnp-ui/Manifest b/net-libs/gupnp-ui/Manifest
deleted file mode 100644
index 580038b60a0c..000000000000
--- a/net-libs/gupnp-ui/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gupnp-ui-0.1.1-underlinking.patch 755 BLAKE2B 02bd4724610799c4339e9a7f347b580437b8a1f9fcc368832f942c989d0d5fa00f118517a50ac932e421b186075cf3f55ab9dca4f6bfbef2668448c260c0e018 SHA512 1dba9b59bbbfff77886573fa53dc03207a72a7f483e5c67274dd8a7ec8846a2dd2d01bb95044ed96f96c568d87b2105016d6d429180116b4a3a290a1f9bf0d39
-DIST gupnp-ui-0.1.1.tar.gz 362414 BLAKE2B 2453520ea36f4d69df3af26241f9f2a0584e55225394a8e76d7a13cfd0d0b42cfb3203f1afba157cc2dd651cd63744fb5f4393e3790becbd3293764c3d37d14b SHA512 eae64352e96e6cc54411b5f9276a4386b60bc4af21246d3387024b8d5b7243ef988a98739adecc068f7d26fd85887b7500c4e9d89993aa68e5fe746ddc93dcab
-EBUILD gupnp-ui-0.1.1.ebuild 692 BLAKE2B a792994da604a23aad4d511ab000b28915c5269a3c93c83aa8dd333d28ad86d594febb7d45eef7f97ac5b2a8d1787d845ac489dceb6a2bca42897ca892590272 SHA512 8e2e8723faaddf788ab6a698024edbaf6c9e193718edb40af15112adc95f75450f0e075973b91419630508ab8d2786958baee28c3434bcbebcbd2970988de0a5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/gupnp-ui/files/gupnp-ui-0.1.1-underlinking.patch b/net-libs/gupnp-ui/files/gupnp-ui-0.1.1-underlinking.patch
deleted file mode 100644
index 207eecc7f12c..000000000000
--- a/net-libs/gupnp-ui/files/gupnp-ui-0.1.1-underlinking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -11,7 +11,7 @@
- AC_PROG_LIBTOOL
- 
- PKG_CHECK_MODULES(LIBGUPNP_UI, gupnp-1.0 >= 0.3 gtk+-2.0)
--
-+PKG_CHECK_MODULES(GSSDP, gssdp-1.0)
- PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
- 
- # Debugging
---- tests/Makefile.am
-+++ tests/Makefile.am
-@@ -1,9 +1,9 @@
--AM_CFLAGS = $(LIBGUPNP_UI_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir)
-+AM_CFLAGS = $(LIBGUPNP_UI_CFLAGS) $(GTHREAD_CFLAGS) $(GSSDP_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = test-view
- 
- test_view_SOURCES = test-view.c
--test_view_LDADD   = $(top_builddir)/libgupnp-ui/libgupnp-ui-1.0.la $(GTHREAD_LIBS)
-+test_view_LDADD   = $(top_builddir)/libgupnp-ui/libgupnp-ui-1.0.la $(GTHREAD_LIBS) $(GSSDP_LIBS)
- 
- CLEANFILES = $(BUILT_SOURCES)
- DISTCLEANFILES = $(BUILT_SOURCES)
diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
deleted file mode 100644
index 01c06fadfd32..000000000000
--- a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils
-
-DESCRIPTION="Collection of simple GTK+ widgets on top of GUPnP"
-HOMEPAGE="http://gupnp.org"
-SRC_URI="http://gupnp.org/sources/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	net-libs/gssdp:0/3
-	net-libs/gupnp:0/4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
-src_configure() {
-	econf --disable-gtk-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README
-}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 03ee2ccf10ac..ecf3c3aa8463 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -2,9 +2,11 @@ DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108d
 DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691faef9cc6be3fb99426a3c1e3f24ae50689dfd8e46fa52a22d713780476130ee6fae6294b83cc3526bb5131cf16b98f2 SHA512 110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052
 DIST http-parser-2.9.2.tar.gz 51298 BLAKE2B 5d37ea197acbac468de03081010fb3b755a093085e56c9fa5a3d4dbd70dd2903335a8113ec21664ca54a74aac4cbbb1cc64b861d021df944790453c2de9baaab SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
 DIST http-parser-2.9.3.tar.gz 51973 BLAKE2B c46160e811874f3d4d2a7390e3b64520c7c01d51f74fb608ca8972ffe264cc389b744c1b6d8b5b6a7c9d7816eb95c179a9c210ba1a122ac4fa95996308d667af SHA512 d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b
+DIST http-parser-2.9.4.tar.gz 52056 BLAKE2B 988ebc3f3e1a7d53ed4147dac2e09c4d6021bb1a287990d83130c24e9fee01a3123b4c5ad9e1b86c0f123248484dae272010aa1f3ebd3bd4574d8407ede94e62 SHA512 b45df7b94d1c51079d44687d0a7f901f44faae51df4e84c7e3fe38f130c2d809d0e7c2a146c57b3723e60732aededc246bf44eadb10a95b710963d641f9fe7cd
 EBUILD http-parser-2.8.1.ebuild 1009 BLAKE2B dab1aeac7fc07cabadc19ae29050975d5f7712b260f314e06115f9367287edd0a8b524706a6817ea0a90d2a29fa8bb2d5d132dedf21b1d7476a8635e963346bf SHA512 b764290864401b181216c761847f54903671c19f2ebbe45de9d736e2c8fb02758054364970f9b1f913081004495087049c282130679536b785a877951a036688
 EBUILD http-parser-2.9.1.ebuild 1014 BLAKE2B 0e49d3893d32f53525a8e568706d57d1e65e32220cbaca91c52283e724b52f149fbe2263fb428431c9c1da61463899dba1e3454cbb47ab6803d14ac033e2dde4 SHA512 c85c7b57215496c937724f84f317ba21189aa04a9f41cbeeed5917fbb4ef9db3f77d34ea3f628166a023d3b1dbb453e2c4783b764c02e7f43b4b7532d7d5a410
 EBUILD http-parser-2.9.2.ebuild 1010 BLAKE2B 07e668e94ac5b440db9d267c10ca3bbea73d268f4be2793d18db3cfbbe6f948a00c196ddc01874549c3a23a9d6adc90b6f1a1c396a3d4fecf5c02aacf9d0ffd7 SHA512 0787e74dcc693f419a75fc1336155ebfd5abbb0aa5bf05ccdde1b60e8f4dcd80834d6e28e2637f6fb6f775fc963f1224dbd7ad79647e76d7c90071725e47a74b
-EBUILD http-parser-2.9.3.ebuild 1014 BLAKE2B 0e49d3893d32f53525a8e568706d57d1e65e32220cbaca91c52283e724b52f149fbe2263fb428431c9c1da61463899dba1e3454cbb47ab6803d14ac033e2dde4 SHA512 c85c7b57215496c937724f84f317ba21189aa04a9f41cbeeed5917fbb4ef9db3f77d34ea3f628166a023d3b1dbb453e2c4783b764c02e7f43b4b7532d7d5a410
+EBUILD http-parser-2.9.3.ebuild 1010 BLAKE2B 07e668e94ac5b440db9d267c10ca3bbea73d268f4be2793d18db3cfbbe6f948a00c196ddc01874549c3a23a9d6adc90b6f1a1c396a3d4fecf5c02aacf9d0ffd7 SHA512 0787e74dcc693f419a75fc1336155ebfd5abbb0aa5bf05ccdde1b60e8f4dcd80834d6e28e2637f6fb6f775fc963f1224dbd7ad79647e76d7c90071725e47a74b
+EBUILD http-parser-2.9.4.ebuild 1014 BLAKE2B 0e49d3893d32f53525a8e568706d57d1e65e32220cbaca91c52283e724b52f149fbe2263fb428431c9c1da61463899dba1e3454cbb47ab6803d14ac033e2dde4 SHA512 c85c7b57215496c937724f84f317ba21189aa04a9f41cbeeed5917fbb4ef9db3f77d34ea3f628166a023d3b1dbb453e2c4783b764c02e7f43b4b7532d7d5a410
 EBUILD http-parser-99999.ebuild 874 BLAKE2B 642dd498c67d2ebb02bddb1997f4cd20d372e235174e99d79280e0b258311052a067d226ce79be6052cf6ef943d8f853f2aef149c4a557e767f1719b46cdf9ff SHA512 4729203fefec280b07472592ebebb64ffbadfda3a4691383e3da1de68c65d94237c593a9b39f4626b4ac99ec0daadbac2a8ba07aacb098e465a86476de64591c
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.9.3.ebuild b/net-libs/http-parser/http-parser-2.9.3.ebuild
index 28a3330d367a..fbfc696edd30 100644
--- a/net-libs/http-parser/http-parser-2.9.3.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/2.9.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/http-parser/http-parser-2.9.4.ebuild b/net-libs/http-parser/http-parser-2.9.4.ebuild
new file mode 100644
index 000000000000..28a3330d367a
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.9.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="HTTP request/response parser for C"
+HOMEPAGE="https://github.com/nodejs/http-parser"
+SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2.9.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	tc-export CC AR
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
+	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
+}
+
+multilib_src_test() {
+	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	use static-libs && dolib.a libhttp_parser.a
+}
diff --git a/net-libs/kdsoap-ws-discovery-client/Manifest b/net-libs/kdsoap-ws-discovery-client/Manifest
new file mode 100644
index 000000000000..8b9f5de36784
--- /dev/null
+++ b/net-libs/kdsoap-ws-discovery-client/Manifest
@@ -0,0 +1,5 @@
+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
+EBUILD kdsoap-ws-discovery-client-0.2_pre20200317.ebuild 1334 BLAKE2B f0257f735f2f6656cd50865cc47195336242820165557955930bc6aa53d7a1defb8efbb8764fc0c3017199b4c79af2bd6c76f802db979296aed58cad312fd171 SHA512 01e76eaa2fe60ae5be6312402e54e57da6eafbccc7b9f06d6d433e0977d91a19dee02176a1c6a9cd3e21ed7ed719dc6e7269c6a65d2650f848944280417902c2
+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
new file mode 100644
index 000000000000..f8f6c08c5f1c
--- /dev/null
+++ b/net-libs/kdsoap-ws-discovery-client/files/kdsoap-ws-discovery-client-0.2_pre20200317-deps.patch
@@ -0,0 +1,9 @@
+--- 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/files/kdsoap-ws-discovery-client-0.2_pre20200317-no-install-docs.patch b/net-libs/kdsoap-ws-discovery-client/files/kdsoap-ws-discovery-client-0.2_pre20200317-no-install-docs.patch
new file mode 100644
index 000000000000..5e2cb6dcb6ac
--- /dev/null
+++ b/net-libs/kdsoap-ws-discovery-client/files/kdsoap-ws-discovery-client-0.2_pre20200317-no-install-docs.patch
@@ -0,0 +1,13 @@
+Do not trigger QA with the paths we want our docs in.
+
+--- a/docs/CMakeLists.txt	2020-03-02 23:10:28.358584552 +0100
++++ b/docs/CMakeLists.txt	2020-03-02 23:11:52.228369765 +0100
+@@ -29,8 +29,4 @@
+         USE_STAMP_FILE
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
+         )
+-    install(DIRECTORY
+-            ${CMAKE_CURRENT_BINARY_DIR}/html/
+-        DESTINATION ${KDE_INSTALL_DATADIR}/doc/KDSoapWSDiscoveryClient
+-        COMPONENT Devel)
+ endif()
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
new file mode 100644
index 000000000000..dabcdda16bf0
--- /dev/null
+++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200317.ebuild
@@ -0,0 +1,62 @@
+# 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 ~ppc64"
+	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/gupnp-ui/metadata.xml b/net-libs/kdsoap-ws-discovery-client/metadata.xml
index 6f49eba8f496..2fdbf33d963d 100644
--- a/net-libs/gupnp-ui/metadata.xml
+++ b/net-libs/kdsoap-ws-discovery-client/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest
new file mode 100644
index 000000000000..ae4b99eebc94
--- /dev/null
+++ b/net-libs/kdsoap/Manifest
@@ -0,0 +1,4 @@
+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.9.50_pre20200317.ebuild 1330 BLAKE2B 227de6aaca8d6f3f89d9e837d8354aaa09902e635eaf8544ea1ebfafc6dd300c6371fd09c30df3d9053ad3b2b7a3973dea3f0ed61a9ecfa594c9334d88482261 SHA512 efe3a278c94ff8fc08a9447874d0addae65d68158721fe15fcf7df4f75eafedcf5403e003ceaaaf484ad313ad36b62cc34895de891d8b24d5c9723a5f16b9bdb
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild b/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild
new file mode 100644
index 000000000000..c40e240517e1
--- /dev/null
+++ b/net-libs/kdsoap/kdsoap-1.9.50_pre20200317.ebuild
@@ -0,0 +1,52 @@
+# 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 ~ppc64"
+	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/kdsoap/metadata.xml b/net-libs/kdsoap/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/net-libs/kdsoap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index ba08518867fa..cb2ee63253dc 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -3,6 +3,6 @@ AUX ldns-1.7.0-CVE-2017-1000232.patch 469 BLAKE2B 4e17f4d13928081cef5093b51db1b1
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-1.7.0-r2.ebuild 2252 BLAKE2B 67e4cc32baa9095ea799484ce01d19d4987a1cdfdf0f05aaa207f1e30b6fc2c0dca3eef2002ce52bcb87bc4fa99c6c84a94d40de1f01417fb5f025964a969dbd SHA512 cdd6c63943c634b315a8b1359d74e168286081a6360e1a6a69ec3f2a65bfee7a33ae0644ddc731952933812fa959ac83f613303686a3fa904a906d3bfeb2043f
-EBUILD ldns-1.7.1-r1.ebuild 2762 BLAKE2B 8c4c282e0e6a80eec3ef2a77b4050fc655ff0e93a5b042077d6cb806ccdb4070be1ab616c9a9f5c1e4dd1dd2c262f61c8295ab498f27277c067485364f81853c SHA512 3ebdf78e9257b85b941cc6228f7ad0b62ace80417a1bfb339535ab7d5f3c279c84f6166aa0f3b9ba7731bf52babf6f1fe5e6be01e43c2914e85c38f9094a9815
+EBUILD ldns-1.7.0-r2.ebuild 2249 BLAKE2B 9e2df8aee72acc1adab2f9ae23edf8538881e97d2d15a092ebb83af1479f24d460e5dbc4c02dd31708dc3d12e5b860b25e93b855b63747e9555d06dd6782a565 SHA512 30dc0b7d5b0f8d8e644ca66f8ab4870dc6b3bb60baa90e243297dd6480817028a5ea783a8e20088f50d72c659c279ebf7c8a75becbae725566c22e8e17c7cd08
+EBUILD ldns-1.7.1-r1.ebuild 2758 BLAKE2B 036f72618120bbfda4b8700cde764bc2764096f9119f32f3a253fdf93f04c1c034162391818360633e2990b91018ef420c0454f01632af3557e87d5848e860f0 SHA512 043baded9f86526febe1b97a85f3f86f592f93c3d8b44f17e3a712d202f87a36c693467472f8104cc9efa8599303d292a511ff8bb22f88a2c6efc15c4f2f5998
 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85
diff --git a/net-libs/ldns/ldns-1.7.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild
index 54e088c681ca..c55730be0304 100644
--- a/net-libs/ldns/ldns-1.7.0-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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 gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index 811a38789a9e..9c697a8881f0 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index 12f5bc1543f1..f949d162ba5b 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 1234 BLAKE2B 50b620440b29f37d06320814f7b84fb351b790c54110963e6aa895aecd186646a39e7832c06a709d4530b97eaed833e7e3c5a0a23981bead4765242daec1b05e SHA512 2a12fb2bbc5b8909dc5a207dde2af019e824c2d8e414401175dae4dc0cb87cb4636fbab3a19cd1cd38a22a436fba2d02c739f6ef9d057a08ca3ba1cab066f0f1
+EBUILD libasyncns-0.8-r4.ebuild 1231 BLAKE2B 08c3d2943970504a0756df0b169dc006d2b7a908c871c7a02e6c867e985aaef460d92570f2599ba59117be3e929ec6f077f64a32afdb46bdb0b53a5d7078da06 SHA512 8485718fe4042c0431323c854af5bd0d6f70254a0b4703db7a5b404fb602413d1dcb52e81b26933a5aa89dadc10286ca5d78477506b8cb5dd3b5440a818ae678
 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 954f4a89c02c..a3d878453d3a 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -12,7 +12,7 @@ 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 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc debug"
 
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 0d4ada050d56..cc5cc4d99ac3 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,10 +1,7 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
-DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
+DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
-DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
+DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
 EBUILD libbitcoinconsensus-0.16.3.ebuild 2339 BLAKE2B 297cd6c0adafbb99a5b3da6f8a34171fc32b72de86800a4c0f1401906d25e62db6cf7d9f2446dfe2db7d18e7c776fa5fe738d95cc55f21ef1a12124e869dba4d SHA512 a412a06ed2725a8b86adb5b9c245c3b041a2e3fc38c8a4104c8f808aa7877c0343a9159efdb5f4021f13ecd6a923480332fc7150b7acd6b595353d40deb21b59
-EBUILD libbitcoinconsensus-0.17.1.ebuild 2327 BLAKE2B de3360a8d2a84142d6dbcb932d2b3ab5d21e394321ea5ed8adfa41ae46d5101620e68ce820c286612505195f122cb03a2a8dbcc0fae223d9e132c7c853114f28 SHA512 1cf921d7e86cb03c6a458de418ed310ed74caa154fa97cc208bc2be8a304dce7358039ba9f44f8b47508cbe3936429322006870daa57ad702c4f3cffbf542b3a
-EBUILD libbitcoinconsensus-0.18.0.ebuild 2391 BLAKE2B 4d86879c0cf98881bec1e47acb5467f7e66cfa4b9633f0f6552c8037df49f8de838188507d87132686bc89028437febe3df15025c4e739e2e570fa4e909d1c44 SHA512 66120544ba49a0ba19b8632b223cce548c86b12f9c74120b2cb7010cd59fdc85fab07fb0d760878d89debeeea17fcaaecae880b466cda5e2302153d6fdaa6115
+EBUILD libbitcoinconsensus-0.19.1.ebuild 2388 BLAKE2B 58146351171676bddb3744b2cc1dda21d552a0302e8007dc8f828fe1ac89430d4eed2189c8d945acb5f8f85ff080da1e08af1b8798532221d46b9380473950ac SHA512 54804c8e95c92b3b057a817d681a24211196f2f2b18eafa8defe159aa41ca71140a430edcd4c400fccb0d6656b1661ca9c7fafa6169aaa9c4664f50d2aba3b6b
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.17.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.17.1.ebuild
deleted file mode 100644
index 179444243d2c..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.17.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
-KNOTS_PV="${PV}.knots20181229"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots libressl"
-
-DEPEND="
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2018/12/25/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.18.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.19.1.ebuild
index 5a7d5d90d9ca..dd26ed1999c7 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.18.0.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.19.1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools
 
-BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
-KNOTS_PV="${PV}.knots20190502"
+BITCOINCORE_COMMITHASH="58ba7c314d552cea8cb024960a8504577aee586f"
+KNOTS_PV="${PV}.knots20200304"
 KNOTS_P="bitcoin-${KNOTS_PV}"
 
 DESCRIPTION="Bitcoin Core consensus library"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm knots libressl"
 
 DEPEND="
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
 	libressl? ( dev-libs/libressl:0= )
 "
@@ -36,11 +36,11 @@ pkg_pretend() {
 	if use knots; then
 		elog "You are building ${PN} from Bitcoin Knots."
 		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+		elog "https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
 	else
 		elog "You are building ${PN} from Bitcoin Core."
 		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/"
+		elog "https://bitcoincore.org/en/2020/03/04/release-${PV}/"
 	fi
 }
 
diff --git a/net-libs/libecap/Manifest b/net-libs/libecap/Manifest
index e9835e3bf5fa..f369daeab806 100644
--- a/net-libs/libecap/Manifest
+++ b/net-libs/libecap/Manifest
@@ -1,3 +1,3 @@
 DIST libecap-1.0.0.tar.gz 343468 BLAKE2B 5a5a12365289daaee8b324016f42b6b56f5bf5b1f7893ae052517c8c20a792a798ebb31f4038c121b1c6eefd9d375562014050572e0285e3a9b91bbfb9989fa8 SHA512 7d34b5a9b6843d6b09efc4fa390c7a2d3dda7a2ae5e82d5021295e436ca9afb7c1f70bc6f25a68e4c430fb6e33ee9f602655c9c830fccd46a8f554774813b452
-EBUILD libecap-1.0.0.ebuild 612 BLAKE2B 5f107496ccbb7fa8b33cf01be9a075e4be13f3641bc31536f36bb5deafc6733e2305c99e3fc31ca6926c76aebccc341bd73b31fe4477e2920432677ae1977817 SHA512 3cc347bf1a5f408ece4a7e79e55c2443f5ae3f4ba392a0d470439b27b82a1877fa6a6dbfa6841187c3a4ea4aefa68fc489ac1d2b8e080dfb7a4774d65333d045
+EBUILD libecap-1.0.0.ebuild 613 BLAKE2B 86da4196e089f29e3469260bd980bd8026f83ace09e8feaaf5bb96dc1892ff797c19fac7332a2cfa13a2a6fd7cc8fed3c4137ae5c2a44e559e5c069a830f73e5 SHA512 e5fbe1f869d94e07ca00b76fd4ff9fef605a1dca3132182e236bbd18e98f3cdd91c6f614f5169b7dd1123e86b85fe36c1b5bc8a990a5395ff7ea715a3818ed78
 MISC metadata.xml 415 BLAKE2B 20ae025b9259513bd01b05a6c2e52b905faecf97883367c4fed63970ef8a983ed93609ffce93e803c3cb9634d2a45ea0cb7daa7f9eb48ded8cb59e5d17565a0a SHA512 7f74e14bff83c5a8ccee44aac553502cb71e55e8d2da98967e8bba2fa44643be2508dbf0b8e47f6e3abb6e554cfc03f3ae53238f06987357dc7c3ea103aac394
diff --git a/net-libs/libecap/libecap-1.0.0.ebuild b/net-libs/libecap/libecap-1.0.0.ebuild
index 1c0214ed16e5..a1335db926bd 100644
--- a/net-libs/libecap/libecap-1.0.0.ebuild
+++ b/net-libs/libecap/libecap-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.measurement-factory.com/tmp/ecap/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="!net-libs/libecap:0
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index b55a76589611..5deabb9abb2a 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD libesmtp-1.0.6-r3.ebuild 1048 BLAKE2B 9f15770cd5871b734a81e64d1416683856318c5e0576357256e1dd13edc68efcdc6c0c34f5ac74032fe0f54e61a5e0cc358a897ea3eb6c90eaf73c11c502ea4e SHA512 282cfbdd621f2e265b4d958d8036065ddeb8c951cedd26d163dee5dc518c3d071656080214793418c2a62a4a81debec06ae0279502e941e9b5d0839bf83f4c04
+EBUILD libesmtp-1.0.6-r3.ebuild 1045 BLAKE2B 3d7115c549a9303bec593f21af7c681c8191d9f52da09c5859012393e8f8fa9ae414b7eb24902afd8500ba6ef8ff4703e7ef181b9a54ecaca856d80ca836e881 SHA512 4753d7258f1c11f1bef1ff87437a37bbf2037180a55f6bac502eb2e5e456c6f0523417e0793b7610da94fdd397e482e768aa73a3de2af059b1986808611d289a
 MISC metadata.xml 245 BLAKE2B 8d60530acac96088463f7357d79430c34c12384bcda5df24a93a92789a40fb34014c14fb73ea1e80f7e96f5afb8e70a4600a651b46322af25c404bea3c75e004 SHA512 8f811f556e1fb3b6c4955a0815435a2b54897133a5a545d05fc3c47a6f8ad2448fcce4644e2f7f3d5b6835fdbfccba521a49a8c11629a89ab53770d6bc620c25
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
index 5e07c50b09ca..ee0e082b3557 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="debug libressl ntlm ssl static-libs threads"
 
 RDEPEND="
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 7ba82e0683ef..f503b054f33c 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,6 +1,6 @@
 AUX libgadu-1.12.2-fno-common.patch 907 BLAKE2B 22e147267c88ba1bd7fc1f289332517f7ea72f684fcaab1a74a0da0ee7ab8a1dc8e6e3fc5dd9853e22c11e326c65d08ff26a6f6fe85d44843398b6d574cbf629 SHA512 f4179768b86b80d71b6ede4608bbb598f7ec2d9d5e901d925436faea997ce23358707910a9b4f7adc1f290c369d2ae664f74f96b01de35e8220e96a79c5c26b7
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
-EBUILD libgadu-1.11.4.ebuild 1289 BLAKE2B ea993fd457d26c1e65826ae730da11f69df806428cdf6b890423519a492e90f294a164ddd9f9784e729a6205b884713a2ee00aba94b1fa6e2db88c1bc953ca7f SHA512 7a3cae46793b8bf13968814dc7ad61d4cc398d82ce2a93133105f5c931af5f349324de873fd36deb7a12a6f57042058b37f8bdf9b3cb8d7bf0c778e7d93b7863
-EBUILD libgadu-1.12.2-r1.ebuild 1166 BLAKE2B a886fad8a4989686e2482a79b5b8b2d59bcf1f8501f188d33a9e0d9c8968713e2824bf2cfb62ac6538f0d0b539ecd3488c0087e926316e755e4d6e58722f03c6 SHA512 db5cbdb477857e18c4e187b87a2f1f5e8ddda28868f6aefb8ee1d5723ce2048d92e46d88e5462632ec4e3b2a1a8cdf4e6fa6e89c47c9b8d2e23125bc1e803e2e
+EBUILD libgadu-1.11.4.ebuild 1290 BLAKE2B f360de4d3d93f538576aa0cf3bc7d7888a5a74da1758a465116338aaed0d899008b86518d34ac3d321bf74036e56ec10043a39a99c7d76727284b8315742ba90 SHA512 f6710a4fb1cfd290e30f310542ea34e1e18474d7de928082240c80220e787d4a234233ad8658eeed4bac34a59c2f4a4f62aebf7f59664076fdc0a2d5c6f536ed
+EBUILD libgadu-1.12.2-r1.ebuild 1167 BLAKE2B 7a958645eac6de6940898e694a30670638b896584429b9548c4f9c6cbe7212bff31bbd4f3bce3f7774f7c12d1e22f082c26d71bf84cc0da246f137b8eb7e5670 SHA512 1bf5c42b94b28bb4ce396d5c4f3573c28bf243de37a19fbec753c13a147efc9e91a84935df3f3d6dc90a81f968b04f8c81bc2f2a5beb85ba6bc422f34d878254
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index 35f27424b866..61ed84a41b1c 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="test"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs threads"
 
diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
index 30fc132568a0..441404784a46 100644
--- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc ssl test threads"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index f05e691288b7..ca8227e968be 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,4 +1,4 @@
 AUX libgsasl-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
 DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
-EBUILD libgsasl-1.8.0-r1.ebuild 1303 BLAKE2B b4149842d49a28baf5e24a972e8b77086726191e043c8658f7d913e9e4cf1788021e7070bb639201b26e29dc3504c7fc55d8d7c6b3314f0d48e5c8bd112e7491 SHA512 fcf1f6708124fdf66732b20666c7e302625c120ea86aad55e84b0424690baa7d9a28f3576c244d698b47a4ae0e7e5a2f9e8d9c5f9e48f742fa0cf9a462f4d8a0
+EBUILD libgsasl-1.8.0-r1.ebuild 1304 BLAKE2B 9a799c5e0bc713bcf15d8a68adccc75fd18b4d9eada23410864683edf3b9c5912fe712cb038d5d963b11bf615707816e9b315823c6e685798c5c3c68b5707ec0 SHA512 8882b8c99a80171ab14275abfc964875ebe93400af89c5c0086dd78037f7feb16ad7a1c2209b6232f4820d380c0d8a6dd32af105d336115881859e81e7818b80
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index 6396a22f3094..ae6514019b49 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 DEPEND="
 	gcrypt? ( dev-libs/libgcrypt:0 )
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index a2138177c293..e7fd432d60ac 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 896 BLAKE2B 033d3f31a25e40bd61bedcfcd9fefe9155ef4d1f62d831b39ce4ef7efbe3903dc35e5f0215606aa4f6baa5b767fe93c87d2d1092f724399bad474c686d1cbc5e SHA512 9d7ac8b78cec044024dc4d6c1d6d2952fbeefa6b3a1fff704f3e55ebec52159a16d558f37ad66a43b2c76d9d38b1ee4f90a850ac1ecd9f7ffd2059027d769a7c
+EBUILD libgssglue-0.4-r1.ebuild 894 BLAKE2B d7b3ffdf2e730ba31ce2546b644a6c3f03bd5b4e1b98b910637aee7675ad52cc4542796919949d7f7a3a580a353103ce36b717fcb7e48979294d25f551e534c7 SHA512 7a19678ef903a98253537807e011900944aaf844a4cf0e115fe7a0987a9aff995c102b61bb97a1097157286fe47be6a6090fa708479183a705ab2428253071be
 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 75a3d39f7784..ff1cea99dcb6 100644
--- a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
@@ -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 sh 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/libident/Manifest b/net-libs/libident/Manifest
index fb04455c6b61..402976e8fcf5 100644
--- a/net-libs/libident/Manifest
+++ b/net-libs/libident/Manifest
@@ -1,3 +1,3 @@
 DIST libident-0.32.tar.bz2 205831 BLAKE2B c1f7798c83764774be933d0c34ec8729c66f3fd2bee6c7f8e5e472d929068c56bda9353cfa1b2fa5e7636fbecb38c02fe133233958992ccde766d1b614dd7a0f SHA512 5e5d0e3dd2514fa5af9dba02eca52cc8015d091fca05beeb23bae1c98d33a1a1313081cafc9e1e49d2beb5c524beaf1eb3679ff54330164aa170d74dbd84b244
-EBUILD libident-0.32-r1.ebuild 528 BLAKE2B 9814b3281c15150a0e5fb23846585838ea0c3b12369a28fdb78d0774b09f6846b02b6b54c7de6e5f7ab1ae774485d2626145fb091e552b6c98c22d90aa0a1bbb SHA512 8241901fb2d0d4a93fb0093738435232d0ff9b4e2be15f400f75b23c2d0bc03dde9d853c938b01151197b73a50b71889da53b13d179a316d300073818b46e21c
+EBUILD libident-0.32-r1.ebuild 529 BLAKE2B afce54e69b6f151fb682aff0d8d64500e762c536c9070a50bf58e81942d66735231355d7176bcae16d6e056cdad68a01762aa38ab00be4eba73f681f1f80eb6a SHA512 a64c665ce9b7a69116b822edaddaec6c8a8630f84e3448398812ba7a7ed7c44edfc25f0b4ea25938950f81291bd4e3c6282b1bc4db235ef7afa44ebd74629d47
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libident/libident-0.32-r1.ebuild b/net-libs/libident/libident-0.32-r1.ebuild
index 785cd620b70a..bbe5f3c51b08 100644
--- a/net-libs/libident/libident-0.32-r1.ebuild
+++ b/net-libs/libident/libident-0.32-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 8421795edb77..8cc426989609 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -3,5 +3,5 @@ AUX liblockfile-1.06-respectflags.patch 665 BLAKE2B db252cf9257548591e0171167ff0
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8f6e4067802648212e7fb28bc59f55c4293bb319b6186251890c164739daf6076aa5bc4f8ba083c9f68c0115be8738d SHA512 e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
-EBUILD liblockfile-1.16.ebuild 1324 BLAKE2B c17a0b473e0e17698e250dc00409b1982c59f0bc3f981950b420cfb8dfd343f82b5aa7ae8de2230d675669f726a852aaa4d18d644f868e2ee3a5baa815887bbe SHA512 f9824db2a7d500a3f98d98e8300f1bc4f389610d21a71a4faf159040a33d37614b847a69e4a04b0669e43b4241fc3b2610a6aee9dcd91d5e4a0ff59316a698c3
+EBUILD liblockfile-1.16.ebuild 1321 BLAKE2B c3a8776bab522507441537124b0683f3524be3667d57267eb282ffcc7b3a4b8b52c001fb89fffe67a9aec2ad752f1711e3e3e622414642834eb727bd45ca4c95 SHA512 c847a89920ace754d5380d361464ca63538b29c687d124f1c19aecee8ac633878a560e6461f1b108b7fb1c0b08fed093f78e8b517c9a51b502cd9a43f2eeb6e8
 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 148796e9abed..e2b632a0cca3 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
diff --git a/net-libs/libmicrodns/Manifest b/net-libs/libmicrodns/Manifest
index f869dc5cf249..3f12c65418a9 100644
--- a/net-libs/libmicrodns/Manifest
+++ b/net-libs/libmicrodns/Manifest
@@ -1,5 +1,7 @@
 AUX libmicrodns-0.0.9-null-addr-fix.patch 945 BLAKE2B 40b777b9d0d1a781d1ee3ff82a2370d0ca414c687d665b0df1aa9750e9bde79c027e661c9ead963edb366858c46f6118139903f77d8d4ef99df99b8c28d28268 SHA512 83ef122e8192f34608965e9d6a479ce73abf98c28028f5749e0c53cc677225fae25f501573b671425754b14fb1b871a29caff6e116ed19700cae464b4b7b4236
 DIST libmicrodns-0.0.9.tar.gz 57333 BLAKE2B a9e1d099d4588863dee3c2735a2e3f9cd46212729c342e06cccad1a8e997e85964e7f917ce97f50c0cccd21c1662ef9baf7392333ea666ff65b0577f57bab692 SHA512 6f7dbf1a324fed847131745498895ab0773dfc3c7bb96a05bf0fd3df0c0ce19d7f607789f7a5350d34e91e7ba323ee57196eb37ce351f83a9faa82c5fc8d89a8
+DIST microdns-0.1.2.tar.xz 49420 BLAKE2B 247a82c3bb038487390ba967387e9d4cec638ee5315290387c5b8863afbd45cc0700a3ee6c0308db253a161b5c1d345f77808de96df3f31bfaa2ff74e8fa3c05 SHA512 a6b15c65c74560fdba8973c63ffae9cdde4445f54196bb2d7d6348f6c15f8f162ef0a4e91b969ea3f2a60c701c3cc72799fcfba2fbf08c37f71ba8d5e3409702
 EBUILD libmicrodns-0.0.9.ebuild 623 BLAKE2B e2ccbc10fbb88ce50c749c541ed0f2121f155574b7d6f271c4da066b68456383974aeb8afe29c3647fde4e0739e201cb18ce3d5591aca776102d8ef298f03136 SHA512 d8544763e8ac77dc829bab6b04f4b6b886ef4922c4f2c4fe16d0f10a494a02be6cb8f7cf0a977fe6971eebfd2e82277fad167daf580f24612f9cee37db5a6e6c
-EBUILD libmicrodns-9999.ebuild 545 BLAKE2B 26f441ee0028c5fc9ae16a9cef601496ff7eb9cad3a378b7e788cf2ba0197a910220e5d72d48634212e723e9666a85d0b80f3430b0f67e25dc2c47df91371de8 SHA512 062f506c098f15387d0f8d5c3ed6a0745844fc8898abca136041385bcf413d4fc8add432e4ca4f1ebaf9756a7a5980564e39bf03414f8d1be9fbd95a5369fc09
+EBUILD libmicrodns-0.1.2.ebuild 730 BLAKE2B fc009b288958e4452ae2ce696582b16852f47ead90c13f8626a316b3eb67eac6f85ab784fa3ce10267befe6bdc12bbbd17b3958c55707a63da0fa86471e4726b SHA512 7438da9899534764cd8325b80b54be10107162663426ad072f6aaeda422f9a22bcd8353fcb27c6aa33ac6aa59f1cff6cf4b06b26ea5d1f02afce76e6efca839b
+EBUILD libmicrodns-9999.ebuild 730 BLAKE2B fc009b288958e4452ae2ce696582b16852f47ead90c13f8626a316b3eb67eac6f85ab784fa3ce10267befe6bdc12bbbd17b3958c55707a63da0fa86471e4726b SHA512 7438da9899534764cd8325b80b54be10107162663426ad072f6aaeda422f9a22bcd8353fcb27c6aa33ac6aa59f1cff6cf4b06b26ea5d1f02afce76e6efca839b
 MISC metadata.xml 430 BLAKE2B 94c8e7b19ca9899428db5b67c33d492423ab83f354e878271bdc6ce9b6602c78892b5069ce38032e837e68285c2979bfb43ea11650d734ae6061089a3f2d1232 SHA512 7ca90565928898c788ac8b87abff3909c5d1c0947c57e4ba30b0929a794ac943c20f2002601d2614dca35c2e3b09432653378bd66eaa6f53881c8cc6f86b892c
diff --git a/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
new file mode 100644
index 000000000000..0e1d2c1f619f
--- /dev/null
+++ b/net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Minimal mDNS resolver (and announcer) library"
+HOMEPAGE="https://videolabs.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
+else
+	SRC_URI="https://github.com/videolabs/${PN}/releases/download/${PV}/${P/lib/}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${P/lib/}"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature examples)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libmicrodns/libmicrodns-9999.ebuild b/net-libs/libmicrodns/libmicrodns-9999.ebuild
index fbd51b90d87f..0e1d2c1f619f 100644
--- a/net-libs/libmicrodns/libmicrodns-9999.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools
+inherit meson
 
 DESCRIPTION="Minimal mDNS resolver (and announcer) library"
 HOMEPAGE="https://videolabs.io"
@@ -12,18 +12,24 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
 else
-	SRC_URI="https://github.com/videolabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/videolabs/${PN}/releases/download/${PV}/${P/lib/}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${P/lib/}"
 fi
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
+IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
+BDEPEND=""
 
-src_prepare() {
-	default
-	eautoreconf
+src_configure() {
+	local emesonargs=(
+		$(meson_feature examples)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
 }
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 2f2ceb074c39..d7010e7711f0 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,7 +1,9 @@
 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
-EBUILD libmicrohttpd-0.9.65.ebuild 1291 BLAKE2B ec4e2f6665267150bf4dedb8062f075a47bcdee62ca0b9935b2373d2ce0b71b24b2b9133d141e27532f62120d5497e9b34d297831368eb570787763f32f56e7e SHA512 105d48d08575c80420584c898032a213a45c6ef4a746bf5079df174be3c785b72e57ac41cb6dc4d4fcc76f7eb3a749fd3a4041b0e689a0ccff1b7104c1b6fc9b
-EBUILD libmicrohttpd-0.9.68.ebuild 1278 BLAKE2B 8a61538b98b3a76ebfd48667ea77e39698440c1e753747ce842f42e5c383c25e71ccfe0219d0e41c665bc921195d5ae86aaa20d6877dea6ff4c34947e1a56a25 SHA512 87ca110ae1b9d26d8888ae9832e46e2d43e1d6ad7e3115e0f059d7a4933391905870167680009185342bad1a31194a6b121a3ce9e580d165ae4b16420aef3283
+DIST libmicrohttpd-0.9.70.tar.gz 1886435 BLAKE2B 09ae33c66f151d9ce03b8333b26c32e2c0896d150441f39da632fe1316c66123f343d021d7fc9a974fbbab7e642d253138d071d4ee506477de46bffd3ce4691c SHA512 391293688d5ef51cf8d918294000384cb291f46bf767295af5a97123c06c75573d480a6c4b2486712b53636fe3e5dc1f8827ccf4335ac435ec85c3529733d8f5
+EBUILD libmicrohttpd-0.9.65.ebuild 1292 BLAKE2B d0be1dcbb538eda2814e853c153df3121e5c9ccd64e5f422754a636c0078e4a701b08ccbc69103c1780b76dd8839b20bbda79125e4029e30594ad4cda8166362 SHA512 fde791d2ac45759eb1f0170607ee84dcddb26230b3721f54a95c3adca12c65a0361446d95fd7e73e33479eefef6a9b4082e3b1041034f8db166aaa6c54c7faaf
+EBUILD libmicrohttpd-0.9.68.ebuild 1279 BLAKE2B 03e4684290e50bf89b3270c7916bdbc72da590b747aac3e7cf6e72f98331c2abeffa61de886b3a87dfc49e941f33ab165e77c24e186a1631d21ff0c3b51a77a4 SHA512 82ab3db6aae947b5aca12ce0c4fb5728f77d95db4bf5b04feab81b0ce89cc58840bb1bcd1c7f7459a8a3db9182442f92b777ba232e890ad0f7620cd022dd98c3
 EBUILD libmicrohttpd-0.9.69.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
-MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
+EBUILD libmicrohttpd-0.9.70.ebuild 1285 BLAKE2B 57cc4ca3b7701b4a5d84cc671069840e980cdca2918e524a656b89c7bceda0bb36349f7c869fd83076f0541a1079f587c43e491e6750898dad0ef56f593b7de3 SHA512 b576aa126f50138ad3471c1ff90a3f3409f8aae194968064df4b9f198129f43280900d629ce9841f3f30dcf056efa2801d323dbdc76a20b3212fe9ce6a6acc38
+MISC metadata.xml 458 BLAKE2B 3b4d5cbe9453997287bdd1ce08b3a23422076d27c5a0fa7d18c936a7a81651cfe109f7531386871cba45f756c6f09dbc98c4987c17f8ec7b151421bbb82ac146 SHA512 2e775d144e0469c6c7467674da543bc72966ee6641fcf4072703d990eeb6f4903c6a4c2368d299b96afa77a1328319f88848b9c12df8b889c3265128d49e3ea9
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
index 1d7dec2b6134..e8edd69c90fc 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+epoll messages ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
index cf5e0d256da1..455a6c307e14 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
new file mode 100644
index 000000000000..63a50da01def
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 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/metadata.xml b/net-libs/libmicrohttpd/metadata.xml
index 05dae46c493a..02fc68dc4f86 100644
--- a/net-libs/libmicrohttpd/metadata.xml
+++ b/net-libs/libmicrohttpd/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="messages">enable error messages</flag>
 		<flag name="epoll">use epoll() system call</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:libmicrohttpd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index 9c7b62a2627c..e9c94048cf43 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1,5 +1,5 @@
 DIST libmnl-1.0.3.tar.bz2 337375 BLAKE2B 7054b5f2eaff639bcf0bb836ce16d7787ea88422326d2faa5959b47e4652cd9d2d8d6ea94e2f9addeb87f8c018392de0eca08343ed201895dc8c2d6974435779 SHA512 c47b76a6125271ef9dce13bc8bebd415d2bbd79b6d50491d8ba23344e7e6fe0c1413fe055913ab9444203f0d73166b79f0d4b532b13b62feecde3e5a8cd442a7
 DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
-EBUILD libmnl-1.0.3-r1.ebuild 769 BLAKE2B 93beb11872955abd0f141ac9e3f25282b7fe76c7b5e82fb031419b88c39582e8603b689930c1d6adfc6e4ab39d762ce803872be5c37701dc7230ca2e8e5a1402 SHA512 4cfa7ac5078f33a94c7ea456b02c44452deb0f0a0d3cb04df8a0156332f7c7cbce2d916c34ea6d09ca310781ff3a49a0325ef207338f3989fb02e0a71b81359a
-EBUILD libmnl-1.0.4.ebuild 782 BLAKE2B 41e188b91c08747df8153e00428a5487b909d0da51451dc59ca54932dd523c94f80477e3a0f1cd6471e86e57986bc4e2b592be273ac692468aa84b77dfa7d0c1 SHA512 3a87263039a8c11a34a70d3d4a36ceacc01a1cdf88fd6c18683f19ca051c1050831a05d64eec42596681c687b80a83cce03472afe1ea1d69e8aeedb35529aee0
+EBUILD libmnl-1.0.3-r1.ebuild 767 BLAKE2B 0e1a0ee9df14248c6408f541d83d5e3ac58bacc11936dddb2808deaae5e5e82112fb91282ff636641614445d2a46612e75bb4c4a9ffa1853578c83a5c433f25d SHA512 86ba1ac11109e4cf9dff9a50f497514fce81cd5608c6eeaa9b33c5afcb6b51b4efedd7f17386e61129608dc6f770e98a239e559b1520d96af3033959b9390ef9
+EBUILD libmnl-1.0.4.ebuild 780 BLAKE2B fabf6d66e02d340b8443d8357d33ece48cac4acb6913c80da4db743ef80014a13c03ea0332862f1397c61c97f8adee003a874ae21587938f2a3766480f436097 SHA512 3f841e30a5e6a26a0c80795e3eb324aa046dffbbc8613b4a69ce6d1fdd81b624d30ccfb11e11c11f91aaf5bf9a08dc6595cbaedc4847d9eb453c6289c3f0463a
 MISC metadata.xml 746 BLAKE2B ee4224d1afd9af317a58360a189e8d3d97b2199c01b35883fb1644fc42518a7c79f0900d10aad99287a47e77767564f83e18ea3fa45e0678bf25f9b1e8588ad9 SHA512 f7e4824b61e60bdfa64e4d9db37051ac3240c6ce66518a2f74d643b49b2cd206daedd088eb9eba974b6a51f5195c8281742398428b1103a3b83beba869347bb1
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
index 20d9161ac1a6..b08773947c8a 100644
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index 593ef4ea5b7c..ec39aecd65af 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -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 sh 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/libnet/Manifest b/net-libs/libnet/Manifest
index d3b5c07af52a..35de4dddad5c 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -8,5 +8,5 @@ DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
 EBUILD libnet-1.0.2a-r7.ebuild 1353 BLAKE2B ffd2ad5abffaa27c1dc993d6b9dc0bff129eba5920d02a2168cc03a8742e87570e9e4c7e4f713db0773450aa3bdbba5854860832c60ab09ff23818c63a6f392a SHA512 8e2f33d3ec864118a6b00bb7f2a42a6fbd5220224289b3862191d76166b1025364d25e2f90be46531355eb10a8aca7613867c0c0ef1c035f85acd5a36502d6c4
 EBUILD libnet-1.2.9999.ebuild 682 BLAKE2B f4de78e01f11b24255ab6713c484ab9954ed6cd4be54d7da340c780ee5813291157ae2fe881141faeea2d0b2df67af71ab06a11949c57d8db4a5f3f28533cd30 SHA512 4d899c428e510ad9ed76eb0b573fcac4903f3d8782398890984c0eb85186bc0e84326c35c04ec04dfc78891f8f48d7a3b47c19d4715d695edb7facc573859d73
-EBUILD libnet-1.2.ebuild 737 BLAKE2B b7ad5f49a8eb5e5fb8521412618b4d6dd694e60cd857b0619afddff998241e16b3ec84b7291c698d3333395d992f0303c75efd078394eb4f351984b9ac234db4 SHA512 f2aa9cb1796404e8170f281fcbad945493c293e45110b05e68c7b9a95023ce194a03f1d08d18d7f5f2f910d4858b03fe900a1df319cf0e7a853b18e3a5e84b88
+EBUILD libnet-1.2.ebuild 734 BLAKE2B 50f4dc76e4dd2cf495e1b0638024e6c62d58b6eb8ee103dfe3051e42507913b30f66c336d4901a553c9f99463eda9032c4c41d0e69ce24bbabecaab43e45adf8 SHA512 878ddc28ec514784e474a1bd6a5d7e79212c06dc6fc641d3d8aba5cd2064b1f4ebcdabc80f19b1cd94f3300c1fe348ffcc15af516ad58aa442521787be215974
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index a45d3c034c38..d7d7a00a98eb 100644
--- a/net-libs/libnet/libnet-1.2.ebuild
+++ b/net-libs/libnet/libnet-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DOCS=(
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index dba1a57adab0..73ccb4430f80 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -1,9 +1,7 @@
-DIST libnetfilter_conntrack-1.0.4.tar.bz2 428147 BLAKE2B 24c2909ff62483397cf729573bb6693cf361599599b3f9b3c4a912e508e4eaa15ba728876addb42c8b2fb755bcc0ca483c88ce2ed7306bb38525aa520b6523d4 SHA512 53b5e5b26ca58abd6b9d83979bbb61aac4b24a85aa425c6b4fc4472b8273e30393678d6acd1aec0e959916b919cd561582ddd4b2ee656b6cb774aa9d9819c046
-DIST libnetfilter_conntrack-1.0.5.tar.bz2 418516 BLAKE2B e887357aa5566b67602f8e9765261ebd03c39bdbd704c7c7571f47b7c87c7c6c60acecd98b607b1d5df86c4606b087cf4385d1ee0869bb8d5283ecf156edd745 SHA512 683913e20fdcb175440b621247c03019116f95002ca6fa5556df48e964377fc02b65203cb7286349f3a7d67ae6338c0ee9225562aa727a325f5534b211b9ae24
 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
-EBUILD libnetfilter_conntrack-1.0.4.ebuild 966 BLAKE2B 0aa238222d3faf7e0f2e029fca0804ca6c655e33426eba7d07d5ee32e480d569e049bf96634196037c2775ba68b995d9d8d85bb5e69cc836feb229ff8c25c77f SHA512 d9ff9fc89b4163fc5d772b34cd11ac1a7e69d1db89c470d0f5ca97d3d2eab64831dc3d20a77e708e5c631f5d3a02a2b48d69fa2f333e5b82c0a53e7e8bced12f
-EBUILD libnetfilter_conntrack-1.0.5.ebuild 981 BLAKE2B a6cf9640745c047eb38ef0cbac268ef21e379289b6230d4042b10b040d8fb0faaecc1bd37a026356e6c2d28c5ba68f73c4172584b63db2eb0f19341c4a3538b4 SHA512 23b8a125ed2dbf01c324411085e8464e60d6eb03980a185b34ff6675065e5a1a6963c001f24d242746f8b8b54e02db20925543f853962dc18694246723b45af2
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 966 BLAKE2B ee4318d8a57fce85406ae3d37f9def9ee340605b3d031aa564a311f519ebd3ce6c7566b764127e43851ea5598fea4b30def6604cbfd9142c7554a827769677a6 SHA512 231032b3ae2f405850155f1efb27c7755f1292c1ea61fcce816b56f3dd6b7703cb35778236fbc6757735bc30c6232e19d622744a5a3e0fb7c4d21f94b9b1161c
-EBUILD libnetfilter_conntrack-1.0.7.ebuild 982 BLAKE2B 41c75efe160531eaf6e88d57e39051c572cfe4cb13ce24dbdb391c2b596b77df4da075cbef48a5e0ffc43ef25eabcbc80ac018df0b0ad6b616c2391a2f7dac28 SHA512 f9b328d79ba5054d16ea45f4c4eec27756e693b02fa8fb7220e3307279156d4e211fcfd6146efc5df6517ebd68eadc1060e88af45f7a5b4a4a7439147103ef00
+DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
+EBUILD libnetfilter_conntrack-1.0.6.ebuild 964 BLAKE2B 1df389b4f2f437d0fecff44404e78dcdd896a680e3b223d24db16692e77d4bce83506f658f19901a23040df2aaa89e0c903a6086916d53cdfbc0a8878822aa90 SHA512 a0f79a9b5a9f9681685d532a0bbdc8d59ee563e9100a82f149ccee0794d680d6cb00f09c8e9f4a1e6aa308ccc3996ededa7119aa40228e14cdfa86b10d70edb1
+EBUILD libnetfilter_conntrack-1.0.7.ebuild 978 BLAKE2B 8412b207cbb247db8298720d4b92e55bc30af494932b3566fb69e0f2e02cdf55559500cc6c3c44a9a545b8916d60e9674eeb0e8a2368a21dbbd1ba6f55155ec4 SHA512 ecb63afe7bdb5e53678472912bd8edb0950b57827ee8544e326128ec7271cce6bee15f876fbca7c3c6e8effe5ab617591887cd9561ac2b722c46eeed4039a54e
+EBUILD libnetfilter_conntrack-1.0.8.ebuild 981 BLAKE2B 998db28a854065c2084713fbb5263a249f878f77c6da7396ab4cd199fff1afc8e21ee68d5e2d7a4ca2bdc1ecdbe19919e8fa3eefb3b8f944e153e893be0226eb SHA512 2cc5d3cf9a016cc269e824b543c56e707253b2389b2e634d23a19003efb5f16ea1917d5d1e44205e5c459d2f9337723b130153d052701086d29a19477a21874d
 MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.ebuild
deleted file mode 100644
index f345796e98bd..000000000000
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=net-libs/libmnl-1.0.3
-	>=net-libs/libnfnetlink-1.0.0
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( README )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	#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
-		CONFIG_CHECK="~NF_CT_NETLINK"
-	fi
-
-	check_extra_config
-}
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 3ff936d2383a..0f532366ed34 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
@@ -10,7 +10,7 @@ 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
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 35b8102ee1e1..fce41470c42f 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
@@ -10,7 +10,7 @@ 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 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
index eeefc4da14b1..fefe91d6422c 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-utils linux-info
+EAPI=6
+inherit autotools linux-info
 
 DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
 HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
@@ -10,7 +10,7 @@ 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 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index c701d0ee3fb3..85ddd1285ee2 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 391283df9b28513d35a3a96e1a6265aafcf05c1e689965a70c7d60778f1e704c0dc1195353bc1b1b00d21da797749e7c0585de9c21949b4ddb2d6740a84fe0e4 SHA512 e88cb62dcd0bfb487c5ce72d05cc7d688ab52508953d027be2be50200f7d0e6363a495eeac8d44cd8cb920e61bf2e69a515e0932289c381bd9fa9fdc21da9292
+EBUILD libnfnetlink-1.0.1.ebuild 1433 BLAKE2B 370a8c06cc77e48851e5e398a328785feaef7491c8e1e967abaeda6dad003f129d84c2557468303fe05b6ffc42718e23496b9a670c4e4153eb4c86556068a3ac SHA512 b07909ba12bc88425d50de77bb2ae79637b60113503ebec75a970e0f6fd72037e237e1dfeba6690b8f68a57fd750cc4c47df961f4ee482cd9c81dd4df8fe460b
 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 26088b852aa0..cb7b05971db1 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 58f67f30eeac..b83e9fe40d40 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 1312 BLAKE2B f86e1217680a3191084255cf0a110e3083542881146148db2dae14eee52cec5e5da9a87b45a8663df2a50f684eed553c8434b8fd72b2cebe64e12ea3eb63c094 SHA512 7dbe331914d41becf1c2a05b1e90b9e98233e4daf3078531155cd5f0c880a42dbf202b3f666b0f40d9fd8ae6b96bd588b846b497a89f5de1f75c09c1afa1d71d
+EBUILD libnfsidmap-0.27.ebuild 1308 BLAKE2B a2d430303aacb2f0a63bbf27edf422382ec038da566db4f1d7b6d2d24da2f227e609144f737d735210a70d416f96994f8ae46d0f3529d922ca8f5ee0007b2775 SHA512 739f4641b8bef09e55de8430e2e69e21cd2faae80b76403b4ae8547746e2f0805fb926380c2676f2f1cfd42bad3fb463af76cbf892578764166a6e68fe61f262
 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 6e45de21adec..0af1ee54e6ec 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
@@ -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 ~sh 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 031ebcf97686..12d6bde09e3c 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -2,7 +2,9 @@ AUX libnftnl-1.1.5-fix-nft-flowtable-test.patch 1537 BLAKE2B 40a0d66fa2f391f4cf1
 DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017dd4d05763a49a655f172ae77928d9b54554e7609851f3a18e9465c53f53c1828311162013bc067493e4e02ff3fb8 SHA512 3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe
 DIST libnftnl-1.1.4.tar.bz2 368262 BLAKE2B e5f396b582221b9f9a7d3303d65548e3597474b1cedf931728f3105b04a851eeeeff98fd2a49772f29849a9094c2e0cfef7d500050e8f205565e8dfd1ec7a49d SHA512 6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6
 DIST libnftnl-1.1.5.tar.bz2 373930 BLAKE2B cfd06084fb7de5dd6120a22faa43ac578f170e5209564579ff26bdf49e2b70b5b3944275861e32fcc7f6f2bb1d9f43bf51157665d0d5faea259e14cf930030c0 SHA512 a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7
-EBUILD libnftnl-1.1.3.ebuild 1192 BLAKE2B 898f003c57235e7eec3bef89a36e05fb1ab478484da8f2292d4c547e832a5fc7f1fef604b401472ea8b5e295f4e3e96097bec8cbf851f518410dff46f72b07f3 SHA512 c541ab9534bc9ed87aa90e0da516e16e02e3ef0419d994e0513fe35bbaa45a2d5d5d09ecc403e186079ae841002d0685291ded018654f62fddce87d6962db10c
+DIST libnftnl-1.1.6.tar.bz2 376340 BLAKE2B b5ca243af71462f7c91cae3f368bca7ba19151f5e14bdc459efc136cbf1d6f0234a097337dcee2a2e733a173c72c71496f34222dbd217e79b2a5b614315e6b30 SHA512 3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d
+EBUILD libnftnl-1.1.3.ebuild 1193 BLAKE2B de38ffd4dd0740b905ae7736201550806cac8671acca11f8999e1daef009799efdb673d234f9ace51409dd243bd50d4cbe7dac8869538a02441bfded17811916 SHA512 47a7b1b84dde93caf3fa1b2bc098ad62063584b185d96465140a8f661db5021e25e4a2109b91331faa186747991188ffd419768fd8b2139179a1656d229f2e27
 EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
-EBUILD libnftnl-1.1.5.ebuild 1255 BLAKE2B 3ac4f306de704aac6c2936fcc310606f59efc165d91cb17a4ad74c8708ad24546d418e41e3dfcafcf7ffd88ba0c91cc603a9c8f48d749d3c12c8af8d68a4b998 SHA512 3d206d7e333391c9f75e5ffde0118a7e4030e18ce6724ebaed7bac34c31e5b3c915da5b61443d48f75b55f17a2861e2c71de5e8e52a69cfdff58ae341c9ef359
+EBUILD libnftnl-1.1.5.ebuild 1256 BLAKE2B dccd0085e1c108b4a377a5e14f252dad6429bc8907ab5415fdc70959d38569355f2e02110b36e4f67c641768c5520298b15dfe37b9699899ee4e48738189a000 SHA512 d7287b303119dcee21127ca3e253976bd986975f9e6ef5944ca50a2cdfd70f830f90ad49cc5524cb1fe040ac231e66717aa60e39a1b25e130928416e24b36e62
+EBUILD libnftnl-1.1.6.ebuild 1200 BLAKE2B af974af8061f7789020a3efc449416e43af663ff1b8b098f820e5aff395bb25f9d99228bf363b5da8b5a32b8d38275564374f59088c24d0f11ac213d98e32590 SHA512 c6ee6faec8cab4159745be8665ad7363addc99f07d7a70b1c2e23337041ab2e5ff2b3262d9f13f946abda41c092482632249968c91fd6a31a4dd4005c551518c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.3.ebuild b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
index b4e3ba56d91e..aa66c6d45c69 100644
--- a/net-libs/libnftnl/libnftnl-1.1.3.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="examples static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnftnl/libnftnl-1.1.5.ebuild b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
index cee09c2b2a12..f3d8044e0da7 100644
--- a/net-libs/libnftnl/libnftnl-1.1.5.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnftnl/libnftnl-1.1.6.ebuild b/net-libs/libnftnl/libnftnl-1.1.6.ebuild
new file mode 100644
index 000000000000..06a2c10c99b0
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info toolchain-funcs usr-ldscript
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libmnl-1.0.3"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 5654dcba7d4d..b1f711ea99f3 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -2,6 +2,6 @@ AUX libnice-0.1.13-gstreamer.patch 1195 BLAKE2B 26ef177454864e7757768cdfb51f8a4d
 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 1573 BLAKE2B e74422c70118b5ad7c839bd27e997d1b59618b85a9c81482252d5459b951b58c7de95918e8449067e02e54d427f6badb9759c9833cdc0886ccdf859df2f2f5e6 SHA512 3d66554df36753b6f67431b977da98cbae2673e2755f7c36d6ee25f6c208f60b54949f288c5506367c2098b904185cc111520e80612c8e12cc15f04f26395f29
-EBUILD libnice-0.1.15.ebuild 1757 BLAKE2B bc0a729e748099d45813b16ace34d4cef84af5e68c09a222fbdab2e865e4829953cc2ce2cc5ca6290d39fb2c6673a4ef556ab79acd36243a71bee9c01148d7d8 SHA512 40cfc7e059c10b798a8356519b21df122f9fd02abcb18f737ea31ec8aadb29625a29dd6b678b1504e259e1557c81e48648a85fc4166235b381516e743bae9373
+EBUILD libnice-0.1.13.ebuild 1574 BLAKE2B 5e5d75959760dd820bb657c102ea305c98d1d0ac2957ec713af516af91a6ad32e02e8b57e064a09c0d6c5a12fb23e09eb7fb3b09a9bb5a0502812d51a6141391 SHA512 7a43625ac18178f7ef98899700512f4bdd22aaaa0bb60853a7b6a657bfaba8d257769c3fde90c6c8a5e0b3ceba13201922ef685a6e3d999633e11ab74efae7da
+EBUILD libnice-0.1.15.ebuild 1758 BLAKE2B 532d01a9e18beb9fa1e0c3ddb2748426de0f9a5884029042edc46995bf620621deba38b8606cb043a8487a4492952ee7a174ebf0de13ae7ee6f47a68632d1986 SHA512 dce86fa239e9dbd41b36933e3f56a3b8ce7bf04d7f1ade3226a3cc909ea9971a4687fc0efd759f2a4d4744558488ee7fdb7aa30cda147ccb5b380211842115df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/libnice-0.1.13.ebuild b/net-libs/libnice/libnice-0.1.13.ebuild
index b9a0034b50a3..ac0b799fafc3 100644
--- a/net-libs/libnice/libnice-0.1.13.ebuild
+++ b/net-libs/libnice/libnice-0.1.13.ebuild
@@ -10,7 +10,7 @@ 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 ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+introspection +upnp"
 
 RDEPEND="
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
index 5ae866da4646..0ee77232e83e 100644
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -10,7 +10,7 @@ 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 ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+gnutls +introspection libressl +upnp"
 
 RDEPEND="
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index e0aab9bb7f0a..e5fc618725fc 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,6 +1,4 @@
-DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055f8f590b6814b2d40f1daaf381ec9d9710e0bbb894489d251788a135550848714e8b015bf237cf41d72feabf0 SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
-EBUILD libnsl-0-r1.ebuild 565 BLAKE2B 85155d509cb198333da9ca33f6e595f5705b2d04613288da4b2692c527089a4070486811a49d3da1bb012e94598eab58d774e2b66f71df84661c19749b7f3062 SHA512 5b29ac839d03d1016e9e741ca1a792863522a821b1fcfd95a84ab742af01ef64ae549e339c9af480e2e3fdee8d9c9aca12fb839d67f3a690cc958365587f5654
-EBUILD libnsl-1.1.0-r3.ebuild 890 BLAKE2B 4f4a8e17f3019f88b4502ceba4fd331fcf37637a82558914d3aeb458479beb659020e3a6d54c05b1037072c589797884e2f078fedc7f034992e361f05bf87780 SHA512 b0c13fccc712948bc7a413d6fc7818841c4a979e0b5305d2c3b6a89be77d870f5e987b7792d61bec9d3b0e591d6812c5b9e34a16d3c05fa68900db57493acc9b
-EBUILD libnsl-1.2.0.ebuild 914 BLAKE2B e38ac90dec5e176c0d4768237865994abc448d50da656db669b8310c24c4c4da63f30cac8ee63a76b85d9b25c6dcf0c79c124f51b204bffb758b390a89c81b99 SHA512 8857f457f4a226e0fe8b67f9665b292c19ed9d1630c40eab376d2b456ddae8af034f8edbaa9a3b29024dd4b7f6ee7e838dd91619857ab18b94e6f88faab2b036
+EBUILD libnsl-0-r1.ebuild 563 BLAKE2B 325c98382e7856ed41ac658faa1c04929efdc4d76b3d1322c205ab2b444b8ba50221eaad6f978ce30c559abe1fadf340275d7b8af7d1288530884dd3fd19bcd5 SHA512 31c4acc1d8dae45d91487347ce12fdb5a810da3a5dab1314d8e7109a99f160b966623cbf0c0abe8032715000458924e63d1247d3b06adae2aa2b3ce190611744
+EBUILD libnsl-1.2.0.ebuild 912 BLAKE2B 2c54230426a08b3386164f648d13544d9d36a527d7833939d4d5e50378d13ea91244eb2c96fc412d9910405ca9fd0c8fb6e5aa369bdb1ef0ca53777162bcab7d SHA512 ba5ace865d7579200347b521c997f7c53438a6107b1a3b477a99c9d8afe07ff3c0e2af1b9f00a7d79d7c08379509904d7b37786ba52aa8bc727097902929797b
 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 ee2ea685bfbf..c88ba31c3c3e 100644
--- a/net-libs/libnsl/libnsl-0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-0-r1.ebuild
@@ -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 sh 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.1.0-r3.ebuild b/net-libs/libnsl/libnsl-1.1.0-r3.ebuild
deleted file mode 100644
index cb8d1099aade..000000000000
--- a/net-libs/libnsl/libnsl-1.1.0-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
-HOMEPAGE="https://github.com/thkukuk/libnsl"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/${P}.tar.gz"
-
-SLOT="0/2"
-LICENSE="LGPL-2.1+"
-
-# Stabilize together with glibc-2.26!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-IUSE=""
-
-DEPEND="
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!<sys-libs/glibc-2.26
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--disable-static
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 013966713b92..5b773a32bc35 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 e14d9b9bfd76..4b3d29d0edbd 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,3 +1,3 @@
 DIST libntlm-1.4.tar.gz 568414 BLAKE2B 2a622cd2d7b944128e29503845a3c9789efc9d14a93935ea24f9001d10b279969a8869f7ca68e6e36728638a32ce1ef693a5e8c28ab3bcaf702e114d4bf21dd3 SHA512 888ed2e9ee3e01a53bec951534966378a21c8a0baf555b65d97fed4408568c6b67f4199396cf3e61bb5a73b8e47dbe1333449369a92499e16478b0b60ac78274
-EBUILD libntlm-1.4.ebuild 436 BLAKE2B 260af0cac152c44baed735721701ec625ee38951f1de36b4dd944997efbd3741faec846184403d9170194320d3a3c6345780acb03d35acbf3fb5988b038a6136 SHA512 17ef5e74345458d6e96bcaaf3b118dcc1db632c71cb704deee4b09af4a6c91291d0fd0fc9a85d27b87846d1dc447a655deb3b0310f5bd07dcf9f770b6311ea62
+EBUILD libntlm-1.4.ebuild 437 BLAKE2B 4f3e4b2031c0544d72ad7340f9dfb889ade96eb4cba802ce1ee18671abb0fb046a7e39f37f49fbbd6f96980efe57a96a96dfe15dc09e960bead08b74b071c0a1 SHA512 8ef0c469349c51602859efeeea760da35cfdb6b79cfbac5943bd03f2b0789c52734227e51218fc6f2f140ec0572ecff1f6d9282c1866215bc1ee959a8955f043
 MISC metadata.xml 561 BLAKE2B 400bca5cfe90103ba77808cdf4fbd777b3c19dfabff4336df9bde7e8529da948a4b48b06f1f5151e6f62aa45e5a4cad51b4af7dd2799c9aa8dea89f390936eab SHA512 60e06d45b1482e819824259dcc992d355961754d481700ab41f1e3050ec70893f9075c19bc846591f3aaba9a135de5610686cc82feff1b8119a1466865b08a94
diff --git a/net-libs/libntlm/libntlm-1.4.ebuild b/net-libs/libntlm/libntlm-1.4.ebuild
index f222f958ac37..deeacd482920 100644
--- a/net-libs/libntlm/libntlm-1.4.ebuild
+++ b/net-libs/libntlm/libntlm-1.4.ebuild
@@ -10,5 +10,5 @@ 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"
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index 4cca95e4a2b6..22432f200cd6 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -2,5 +2,5 @@ AUX liboauth-1.0.1-doxygen-out-of-tree.patch 2231 BLAKE2B 61523955ac500d63879dae
 AUX liboauth-1.0.3-openssl-1.1.patch 4483 BLAKE2B 4d2628448a1341cc41a676d5002c7f0f17af384fafde77687bc83235d90f4b6b853bbc9a4262fd4acaa0b04cb67d586bca308bb9c66fafbe7de1734fb39a4c1b SHA512 90ae75bbaf7296826f813df852263901ad8632579b5e5dd1e8b1edc4719d3f749ffc30e6348ffc2ddd5239de544c934382f52c4d62e90b3e655fd9630b5b4880
 AUX liboauth-1.0.3-openssl-1.1_2.patch 750 BLAKE2B cf07dc1722c41f55e1ea5d241c91bd62d4eb8c862a727cf350ea10ca11a24e195439599bf1e712158d6f0dbd113d5cce62d567b48883f23e505e1df6d077a34f SHA512 778222c9b5ff2a35447cc8c14f7868f011c3a3e938cebdd617471221e07278e82b70bc436dbcf28c4b7a558486465a0e36278d18718f48f57a2bb47e74eba957
 DIST liboauth-1.0.3.tar.gz 504950 BLAKE2B 56cf10574af58995de9bf86bb7f00becb360cc899bf1ddb23804820d63ae2c7af29aa29031f68ce79a6cc441cbce27aebf5f1c9dfa029243d7732592d03620c7 SHA512 5a13818dbb3e0df76f7a3fde451eff4f90c9bebfe2076a294921af0c07c2b0789f717f0f862ac6961562d4227e016dc198ddd7efb9c7ac599c3bfbcdb2ac33fa
-EBUILD liboauth-1.0.3-r1.ebuild 1575 BLAKE2B 46f3597f4d3b8a2e8484a512b290271b5eb24ab65da00469c745a0fba4fd387d1cce3e702109aebe0c3a4bd44aa0480a245b0046d3a649680ad45827647283a1 SHA512 a9d13fda5b25d85b23f445ff149d352d5570fe76ba1e5f43dfec45b4ecd329e6df3ba61f8858372e061df9773f2fdd0bc2d502d0c82fb18a23c037513dc8b08e
+EBUILD liboauth-1.0.3-r1.ebuild 1576 BLAKE2B be572fbe7f3896c6a12f65c968ea2ad86404e408bc24f850fd2403db0984af5f927add6b3cec429f7ef71d2f484ee9a64e7c27d497a96439c8e955894577c012 SHA512 0c2e8ef9f31294c6f1ab4e3645447d3a7be796a13398b58b9b04eb40f0ea0f047adb305004ffaa05bca55b78d67a84efcaa4bcda8be620f1f7570f78e2221787
 MISC metadata.xml 879 BLAKE2B 499e638089270b30e1fc4a15008592e036c05032719e05ef06cc4c897be1bebe3d4873caacec09f6c54f65240da2582fee0776aa7e0b89508e98c4a3a668f870 SHA512 05625ec768286997f291d95e40e024c692bb8dd3be2d2eea1c3d7c90b452b9a98988a2ca43a5c6134a0e084e0a4ae40af4a00e809092edbcf3a0630781657a07
diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
index 4ebcbb8517c3..5752b46e6cdc 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="bindist curl doc libressl +nss"
 
 REQUIRED_USE="bindist? ( nss )"
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index b377622853d0..8134078f6d58 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,3 +1,3 @@
 DIST libotr-4.1.1.tar.gz 655791 BLAKE2B 51be68277b56dab96a68fb744e467dc13d966038849ccc0b98b1d0082bcf3b4a0b7fcaeb3f050b0798851723bcdf11bc7ef6681a94999105656dec2fe919659b SHA512 c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0
-EBUILD libotr-4.1.1.ebuild 688 BLAKE2B 50f4eb7b492c13eb7fcc71896f0942ae65840abcd7c411a35cc1977d87cb3af507b4a58c9ff86fcb1632bc093939b0bf31dc0ee5c6417b2a40efe9348b3ccd67 SHA512 9c9913c0db15e6c82520236e39569a5f6ea81ab1e5d3576f7be84f5382506a7e3eb4e4bd40cf0b0e532bec5ee52369672f2ed45b2162c0bd7d97dff26ffa4de7
+EBUILD libotr-4.1.1.ebuild 689 BLAKE2B 66d6c4247410f0cf7985853afdd3641262bd4a0cfce200a30a4088aa17f158b8f7be602feba8b0dba1b730f69d4bc3492296952f58567083d33624ef0adf7c7d SHA512 8e73a79e5c2929c2965b9415e341c28aed3ab597de6c2edc18c834616ff16ff7fa53dfe24de583886504b8cffac50d8f5a260cccb5a013fcf55ae9fda5c02143
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index 7d84fb5e8c5c..44814f953afc 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 3276391014e8..0f6b03d6ac0f 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -3,8 +3,8 @@ AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73c
 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.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
-EBUILD libpcap-1.9.1-r2.ebuild 1891 BLAKE2B 17126e5f18ea988e73e2bd47643bbb419f783cfe0e6d59cd1f45b1ffc0a4a83abe24ddb2d5d0a9332c1a35a8531708271dec8b43a30efa5f2ba99ae9529f2eda SHA512 e7207fd3b6727973d6c3fa766fc140e3117cb5ee936abad08ee36b9557f1d8e8a43be677e47cc1cbd8a5c9b344f17d29725232418e7bbb1795c9f61bb6aab0fe
-EBUILD libpcap-1.9.1-r3.ebuild 1898 BLAKE2B d8a758fb7dcbc7f04703df59fdf3c8577291bacec6bcdb6d3b8b25156e16cb17ae35c997cd9b0e487767936b0706bb50b23dd631c373137db8e5625432c79b85 SHA512 1905e2884101fef1ead5c4c5dc830a2455db6b8b627c3985f0fcac84011e4dfaffa1b11fed6252b62fc3aa998452a14033304ef69a9262c41266571d383b8976
-EBUILD libpcap-1.9.1.ebuild 1763 BLAKE2B 139c2018a2f15097971d814b0a85eff10fc24d9381472fbb0e1481bcefb789376dd74be86bc220e1461bb8351e86c66cf570e815c08e4997ec1da852fcfbacd1 SHA512 a24b353553930a591fb0aa78e08b161132a6fbab1e1c0b1b5038cf4c5762c8b22b157183000360826660addc40e6afc969be15ee254f78e736b4f8ee8cba1ccd
+EBUILD libpcap-1.9.1-r2.ebuild 1887 BLAKE2B 298ac2583dcc7762e11970fd9b4f1bb0d18c3e6c43b5958b969ed84975a651aa6916cf977034350417236144c3278489a38ca0a2398e7cd52be8dfff5e6bac88 SHA512 b941d6c617d2a2ce8ea58b4629c3cec12ae41fd68312d92472b8f1c123be276cb55b019dc24fd5c7b74401ec502d3a871571eb482bc6df60411d6c2d7a61fa7e
+EBUILD libpcap-1.9.1-r3.ebuild 1905 BLAKE2B 1381348e8cd8451da033dd67045f4351d00133cd9168b3dadc62c17b3a51c2baa2e6c0ddcc1f10af33ea72c84d63b8d440f774c7ba9e1de581ba27065ff0a09a SHA512 f21f7fa9113134744348dfbb9e9a75ef942fb63b146ca168f079414fa5af438d6caf92f95c45b4e0ba209ec9b21c0c6e50dba744b4592f6b3de73ea660218627
+EBUILD libpcap-1.9.1.ebuild 1760 BLAKE2B d1eee576e952119dbd28f101cbc69be84d143f4e9058fc161a9f18490b7bab4c2ad4cecd154af392559d0ce838250f67606afd807deb64a853b862ba9930cc82 SHA512 2f8ee85eb5200067a006398abe7dae56dab1ff6e7579522722bbc9c567ebedd6bb9dc29f9d83d6ea389c1b97039f32a4d8edd5f5996eac1854774602c8a58aa3
 EBUILD libpcap-9999.ebuild 1689 BLAKE2B fe3e9048f399aa9fccd6d70bc15522e103b59277a69bda73c72d106b9a5451d793d9bf4ebbefdf13071d3488ae0b715432f15958bda5f167b8da1587e7257766 SHA512 6e2c1bff6a7519578a17035b17460935bee69b3521141e2848a524b4af3d9e3dd02cc3afbf4f16096b5e9bbbb53f4d5cc6209a61713958af8d35e15d3e6d7e75
 MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2
diff --git a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
index 19c8f3201728..47631759bbe8 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink -remote static-libs usb -yydebug"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index 14e727c59d67..1ffab62c16b8 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.9.1.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild
index ab9d35c786f3..c07bb80e0971 100644
--- a/net-libs/libpcap/libpcap-1.9.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 79adcca5bc17..b9ba464f8344 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,15 +1,10 @@
 AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb126a15fa2e6c2602bc270144236bb7279f9fda9a505a487f569fe7170733e8e6b7e78b8e1fa6892c0ff0be9b3937e9f96f7318bdbf SHA512 a0fa6520c60489675176ca7d5d750d0f54e020592743a3437c184939314b71be68803a7f1cb8cb584fb7ad6ee884c85bfb7905d4bb3e0536d535e990981e9ba9
-AUX libproxy-0.4.11-avoid-nm-build-dep.patch 2062 BLAKE2B e563e162d5b393f2badeebd3e8ca477ca0e56dc7ac9c30807c1f685719b13d999f95748cb8c09d3424cc7f6bbfabf986fa14f784e753125557a2648043711068 SHA512 eb4b7e0b79ae89e611b3f3472cd17d2e05732e806c8fb85b7fb4afbb67e1653bab0706b4a29efd5079283372f975b2a1e1f987ffd2a099ce28ba7fe5362214b5
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
-AUX libproxy-0.4.12-mozjs.pc.patch 781 BLAKE2B 9476a64b55fff7ec206042c42479c76bf1ca005f6fe93c621d307c2561c806c1d8718972bf787defc94fc4c9bb65a7c6a7d1e3ff1c2eab403c6290dc78d94e23 SHA512 30ad9224a5676b8ac8f50b56cdb61f2708225994bc26910eb07f58345423102116058a19273b16b462dec846b065925615251fe5fb7b2394f232dd66a013d230
-AUX libproxy-0.4.13-cmake-37.patch 954 BLAKE2B 156f95113351f42f4e48a741f13dcda3cb0cfa7e26409c7cdb1b3347b4e0e30afb4c06de371723180cb4533df5180563606055b2ccd0f1a4a9b314cd3c84951c SHA512 e1aeacb40f06e9137d1f82444961e1216479e7d44d18c9d4c16b09d0e0b0c92c2f77e4c37fe33a020695d5dc23b1e4b2e4617d25e7d878bb816c60f3bc78ed45
 AUX libproxy-0.4.15-avoid-nm-build-dep.patch 3445 BLAKE2B b5094d1b5869321a1fe4d289f5834f70a0422d001a583aa79eb3a9b1e3e84c3060098908c096398dd6186e9b00e88bceed1464952daa1e782ae862e0fc636e55 SHA512 6f0945337b9fe5586cc38e902526a5473e354143eb26db5a05c02a911ecc9de650f22a3f7b68cbb9e90e737f8001adaa1a6d17fcded5f7cab0462b14cc196111
 AUX libproxy-0.4.15-mozjs-52-1.patch 3771 BLAKE2B c5b760979a0c8188ada05e2842d65fd108451d57255c12e971a99f42e373e77c1ac069506085c1d8d20f395551b140dac77a0d33b009b760632921c9452c5d34 SHA512 6572bd725662533aa5a2660461606bc101bb75edfe21021a73f2faa4d3f5d91fb83637ac43e448ad124abfc1c6e59c82f96ae9cd571289767ee6c193be552fbf
 AUX libproxy-0.4.15-mozjs-52-2.patch 847 BLAKE2B 0b6b408b6745c6b4bf277549a8682db67b4db426e0fe87830c0ca51f9da3c0fc6afc39ee22f13af5c4e3abcf587765b1de0bddc508530302dded86eb1e547b8f SHA512 e1f3fd54ea7fba12d019fe9388236eba1afb73a7e9978c4bbcf9309f9d3aa246747f15e1e62a1d86eba05147b62b2d97d45d1b4547f08a01e4ddef8a8b0746ad
 AUX libproxy-0.4.15-python-3.7.patch 774 BLAKE2B fedb3b9c1f003a24706a8b9b66d70f3abe01dd26bdd25eacf7685247d262e02ae0b406d0a2871f12d8d1b92df5abcdf207d940fec91c964fb33d38b454a91d82 SHA512 4330e9043ed767accea8f6f74b6999017633c51d615b229e7a43e9ed468630c630653c6917a4196e8f05d285df383de3bb269a79db127d902d1c960f29d39246
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
-DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
 DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
-EBUILD libproxy-0.4.13-r2.ebuild 3163 BLAKE2B b8592b68c9c8d37d033e4e9621f273c6cf15e2dc69e07f163b6d4033467d60bd5beb72611a13b5be73f98bde2435856874b8ec02f9390613c1c1fd91ace951bd SHA512 a65106522326e5a947af1ea74a5a0cb4a43ff4ebaf2e1571e2bf60a3208f45b94e4633a788091450b5e8f8e27f440ef57e415f5759e31bb22c9ac966153f1fd2
-EBUILD libproxy-0.4.15-r1.ebuild 2734 BLAKE2B 3c1f5e714da543a37febce031ad834583b0c7d6a6a84fa51ed180f22043411e05df17f5b51f5480a2818fddd54c8aed84625b90e2ad58283c86d588b331b72f1 SHA512 5cd5532f7e8e3881a93b129741fef5fb70085170cf91f90fa5b44e3917f42d4f7ad69fd63beb56f7781e83e9ee028f5c56baa53c9c844bbf2c35c8fbd6f7da32
+EBUILD libproxy-0.4.15-r1.ebuild 2730 BLAKE2B a4b5185d80761a70f8052ceeab5387339a8f9f5cf7140e86750baaf26c5548f622e54be3b73d62d405e6c9abb315d173da58a824da751312822372b13fc2164a SHA512 3a05503b93d5ae2c40e45e505710163ba62fc0c3d53d51226ee508da96aec0c78464562308a043b7f398ed7ddb21ed375c8d2670018c1e821ce4f510ae480bb0
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch
deleted file mode 100644
index 59e368b696eb..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 518214ee85e10c5bc99d3b115ae7ac9cc3fc14fc Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 29 Apr 2013 23:02:25 -0400
-Subject: [PATCH] Avoid build-time dependency on NetworkManager
-
-Needed to prevent a dependency loop:
-nm -> libsoup -> glib-networking -> libproxy -> nm
-
-https://bugs.gentoo.org/467696
----
- libproxy/cmake/modules/network_networkmanager.cmk |  4 ++--
- libproxy/modules/network_networkmanager.cpp       | 21 ++++++++++++++++++++-
- 2 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk
-index d9f9588..2586bbd 100644
---- a/libproxy/cmake/modules/network_networkmanager.cmk
-+++ b/libproxy/cmake/modules/network_networkmanager.cmk
-@@ -1,3 +1,3 @@
- if (NOT WIN32 AND NOT APPLE)
--  px_check_modules(NM NetworkManager dbus-1)
--endif()
-\ No newline at end of file
-+  px_check_modules(NM dbus-1)
-+endif()
-diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
-index 564c275..a03425b 100644
---- a/libproxy/modules/network_networkmanager.cpp
-+++ b/libproxy/modules/network_networkmanager.cpp
-@@ -23,7 +23,26 @@
- using namespace libproxy;
- 
- #include <dbus/dbus.h>
--#include <NetworkManager/NetworkManager.h>
-+
-+
-+/*
-+ * copy-pasted from NetworkManager-0.9.6.4's NetworkManager.h to prevent
-+ * a circular dependency; https://bugs.gentoo.org/467696
-+ */
-+#define	NM_DBUS_PATH                        "/org/freedesktop/NetworkManager"
-+#define	NM_DBUS_INTERFACE                   "org.freedesktop.NetworkManager"
-+typedef enum {
-+	NM_STATE_UNKNOWN          = 0,
-+	NM_STATE_ASLEEP           = 10,
-+	NM_STATE_DISCONNECTED     = 20,
-+	NM_STATE_DISCONNECTING    = 30,
-+	NM_STATE_CONNECTING       = 40,
-+	NM_STATE_CONNECTED_LOCAL  = 50,
-+	NM_STATE_CONNECTED_SITE   = 60,
-+	NM_STATE_CONNECTED_GLOBAL = 70
-+} NMState;
-+#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
-+
- 
- class networkmanager_network_extension : public network_extension {
- public:
--- 
-1.8.2.1
-
diff --git a/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch b/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch
deleted file mode 100644
index bf69fc31d939..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/libproxy/cmake/modules/pacrunner_mozjs.cmk	2011-06-20 04:31:41.000000000 -0600
-+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk	2013-03-24 19:20:17.910765954 -0600
-@@ -9,12 +9,18 @@
- elseif(NOT APPLE)
-   option(WITH_MOZJS "Search for MOZJS package" ON)
-   if (WITH_MOZJS)
--    pkg_search_module(MOZJS mozjs185)
-+    pkg_search_module(MOZJS mozjs187)
-     if(MOZJS_FOUND)
-       include_directories(${MOZJS_INCLUDE_DIRS})
-       link_directories(${MOZJS_LIBRARY_DIRS})
-     else()
--      set(MOZJS_FOUND 0)
-+      pkg_search_module(MOZJS mozjs185)
-+      if(MOZJS_FOUND)
-+        include_directories(${MOZJS_INCLUDE_DIRS})
-+        link_directories(${MOZJS_LIBRARY_DIRS})
-+      else()
-+        set(MOZJS_FOUND 0)
-+      endif()
-     endif()
-   else()
-     set(MOZJS_FOUND 0)
diff --git a/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch b/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch
deleted file mode 100644
index d96879a7cba6..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 72bda7188408bd3c2491ea664da294cc483220bc Mon Sep 17 00:00:00 2001
-From: Andrey Rakhmatullin <wrar@wrar.name>
-Date: Sun, 20 Nov 2016 18:40:49 +0500
-Subject: [PATCH] Set CMP0054 CMake policy to NEW.
-
-CMake 3.7 exports a "t" variable for all projects and because of that
-the elseif statement in cmake/CMakeCSharpInformation.cmake:311 works
-incorrectly if CMP0054 is not set to NEW (as "t" is expanded to the
-variable value).
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5313787..451e7a6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.6)
- if(POLICY CMP0011)
-    cmake_policy(SET CMP0011 NEW)
- endif(POLICY CMP0011)
-+if(POLICY CMP0054)
-+   cmake_policy(SET CMP0054 NEW)
-+endif(POLICY CMP0054)
- 
- # Make sure we look in our cmake folder for additional definitions
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
deleted file mode 100644
index 191ad591cc0f..000000000000
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils flag-o-matic mono-env python-r1
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="https://github.com/libproxy/libproxy"
-SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# NOTE: mozjs/spidermonkey might still cause problems like #373397 ?
-CDEPEND="
-	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	mono? ( dev-lang/mono )
-	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	spidermonkey? ( >=dev-lang/spidermonkey-1.8.5:0= )
-	webkit? ( net-libs/webkit-gtk:4 )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig:0[${MULTILIB_USEDEP}]
-"
-RDEPEND="${CDEPEND}
-	kde? ( kde-frameworks/kconfig:5 )
-"
-# avoid dependency loop, bug #467696
-PDEPEND="networkmanager? ( net-misc/networkmanager )"
-
-PATCHES=(
-	# get-pac-test freezes when run by the ebuild, succeeds when building
-	# manually; virtualx.eclass doesn't help :(
-	"${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
-
-	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
-	# https://github.com/libproxy/libproxy/issues/28
-	"${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch"
-
-	# Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc
-	"${FILESDIR}/${PN}-0.4.12-mozjs.pc.patch"
-
-	# https://github.com/libproxy/libproxy/issues/27
-	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
-
-	# bug 600254
-	"${FILESDIR}/${P}-cmake-37.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"$(multilib_is_native_abi && usex perl -DPERL_VENDORINSTALL=ON)"
-		# WITH_VALA just copies the .vapi file over and needs no deps,
-		# hence always enable it unconditionally
-		'-DWITH_VALA=ON'
-		"-DCMAKE_C_FLAGS=${CFLAGS}"
-		"-DCMAKE_CXX_FLAGS=${CXXFLAGS}"
-		"$(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}/usr/bin/mcs")"
-		"-DWITH_GNOME3=$(usex gnome)"
-		"-DWITH_KDE=$(usex kde)"
-		"-DWITH_DOTNET=$(multilib_is_native_abi	&& usex mono || echo 'OFF')"
-		"-DWITH_NM=$(usex networkmanager)"
-		"-DWITH_PERL=$(multilib_is_native_abi && usex perl || echo 'OFF')"
-		"-DWITH_PYTHON=$(multilib_is_native_abi	&& usex python || echo 'OFF')"
-		"-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo 'OFF')"
-		"-DWITH_NATUS=OFF"
-		"-DWITH_WEBKIT=OFF"
-		"-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo 'OFF')"
-		"-DBUILD_TESTING=$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
-	use python && python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_install_all() {
-	doman "${FILESDIR}/proxy.1"
-	use python && python_foreach_impl python_domodule 'bindings/python/libproxy.py'
-}
diff --git a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
index 16852065bae6..735c770babe5 100644
--- a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="gnome kde mono networkmanager spidermonkey test webkit"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index f6368443d4b2..c923f8d4b73a 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 EBUILD libpsl-0.20.2.ebuild 1465 BLAKE2B c4a6222de8dfb1bbe040d557fa5993ce0e4589932b2ecbf2b8dd2555fc34d3ac52c7be7107907c99c69e2eb72ee4641238c75667a714e945a87325b36e12250c SHA512 51bfda0c75541704bc96d684e6a588c87f858fc86f27a005e8d0a59b31a7b16a8f893acc5a4a3a75261244262dd5e3fb6109d1ce754ecbae8c65711558a3f486
-EBUILD libpsl-0.21.0.ebuild 1474 BLAKE2B 4f3b886747c4ffcd6491432ec8e9d069b41aa301d46da469bd88ec8936993ddfc4f3e44d17bae6202a10d0b931bf5666b3c506cd38ae555f776059c8b5def2a5 SHA512 7806d3f7e36d25ce63a6e6427d6664920bc0deb996701c6df4415fe2054811799a41b79a53849c6d61589c3869ed7b633ceba82596279e3951a0cc5d5da57c06
+EBUILD libpsl-0.21.0.ebuild 1475 BLAKE2B 9831172d536f0634d4925c7931fc53cec63946c1576908f61513171462ebafee034deb502645eb166594ed948fc606ce3c6b7802bce311b004aeeb64fee5850a SHA512 13cf6d1c670232b2cdd64693d53ea3ab45b22ecc110d0d8306cd7c8ecd741bfa24be4919a8c72658b3b799bbf230836392b367822371b755b93df67fc952c2ce
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index d8bdf4556620..973bf4d107b2 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -12,7 +12,7 @@ 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="
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index ef40a893367e..14cc9eef8877 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -9,9 +9,11 @@ DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 3b3a109307dc03e567338709f1c3958a2ae788
 DIST librsync-2.0.2.tar.gz 174480 BLAKE2B e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
 DIST librsync-2.1.0.tar.gz 175630 BLAKE2B effd2a8c79fae202921220db7581be1d9f7d278e6ee5155a23e586d9d4a7a27bbc4a50049ddca3b187a8e08451c6dcde7340d22be9fde0c2c12462392043fd8e SHA512 9b91f4b696c1d1cdacb5c0679c7df7a92641e0a6a599c2e5de2bc0af3052b2045bb16c40b072c40859074d792c78c57afb0817917fa9843b179befa4506ebf04
 DIST librsync-2.2.1.tar.gz 180649 BLAKE2B 6dd97a7f140655317c5258d9588ba831716a8909c0d145665b742640a02b317f8736c05b04106f7a221726680f9ccf0ec1bd9a7f760851a993b7783f93193804 SHA512 6581a4285ebcfa1c4dfecac2d6796dab736a4c66a7fb82863c778506073446d9a113d39de7eb29e845a484646f1d8fec29019338bce31a091b0acdc461ab1bcd
-EBUILD librsync-0.9.7-r3.ebuild 878 BLAKE2B 049164da5f48ef2a03a5b9a0efd59233a1db36cec851e85f231430f2ac9ffbacf73eddb8e76f41b5236da4a7192e2c30a1b8be93a919970b567ee3c14b7cb288 SHA512 b3429b0ae46bef7b80e894452316cb4c7c1b391aa6e127afe58dda49acc546bc0abfd3f015ad61be8ca3b67a72892967b7d87fbd135e5832676b20d56e8f65a3
-EBUILD librsync-2.0.1-r1.ebuild 668 BLAKE2B 0d7d0c152b60f282aefb51fd94f24441f47d59400359f502b811370d06b5af699f48b4b2b3c462f63850b9efe7a7ec3d4205bd208b6cfaeb3fb13e8df2e22884 SHA512 3fe1c5f09cbaa913ec406d8355cd9d06328a1189ae17cb30338867778010a3ae067ee0a33d678e888501433fe4a0c9a884e4a01e17c76ccee8047000d30bac97
-EBUILD librsync-2.0.2.ebuild 615 BLAKE2B 884a1929b644cf41e4caa4d11ded0a6b7318c76e95e0f8bb1ac539b2411441b02753eafedb31ad04dd58da1f13cc7a9c22e6c14322d574fc30bb47113f932b9e SHA512 80cf4f2a7edc12be596a3005a89ca34649d94cefe7a4faa7a62da6411d1281ebd936d7304e1a3b54c6839c8cbed59633282e9d30cf048054ff95cee093364603
-EBUILD librsync-2.1.0.ebuild 615 BLAKE2B efd433ccf17b5f5814f9c65cd3c87c339c7647c53b04fa28cd8955df78912d8798ef971a199f68705d0d37b1f32ac9ff674bf24ddc0cab467ad3bc8738303cd2 SHA512 0112716733dc48917bf9ad56060c8b3b4ce55d9f0e7278b1b8e22616428e37d8e08a385fa60f79bdcdfc5139d7732012f89c7046e216beec84fce0414996062f
-EBUILD librsync-2.2.1.ebuild 615 BLAKE2B b60d21d10d93892b5eb419c526fe483f3a54374c815accd9a23aa36b05a1842ceb4a97da2ea9a45afdff44b369559b37026c55a43a09ea68ea5b45ddcfb86417 SHA512 f80aa4658448cb18ca584abbed161d7bd96d7bdc7d720b6b1e48c4a3b3206ae90d13861124b60ae219582b7067219d8a60dcbee7c3d75bd6496b34981c00d348
+DIST librsync-2.3.0.tar.gz 192493 BLAKE2B c9bb0f211d0d579bec3b7236cfac0ec1dcca6b87458c823430c588b4398b06a559e55e3b9ff8a9f635f7e79bb9c57fbb4b301b55c51c3a694287051557b45a16 SHA512 49b2243b7515a6e69abce438a27515a35ecfe327aee849514af539975418d24b7be2d2c2f8c753860f43bf9596c6a7833694e7d94c30f14093aa12363e0d7ffc
+EBUILD librsync-0.9.7-r3.ebuild 876 BLAKE2B 9fdb782c3fb719f663cceb1eb1b75d58dcad0a687e5fe94f25775753a60ec55d02ad879eac6774f7d695fc0240227024b5976bbc23a2029d2843d94709012cb4 SHA512 1c9a485c1f074adac359ce05e72c8108a24e1a57503e8643c63375c9668272eb09493fbe114c3fbf6969b9ec125c6a9216d5b28a7bc31b1ea4c8beab904476b8
+EBUILD librsync-2.0.1-r1.ebuild 665 BLAKE2B 5baee133d997787e922ac979461b6447ac4b6bf41522a5e1fd96f4443fd3673528c9fa0e2bd35c84a83b71e710e772563f6067ae83d725d2bcc22150efaa5e93 SHA512 e0b7d4a56fb01cb4f6767b958f7afe3d1f92afd87b52fc34779ce17a9f579c3a4d6899cdfa183c60afb3023ee550045f29bee3589638b1802f6210c16dcadc4f
+EBUILD librsync-2.0.2.ebuild 608 BLAKE2B 4d452311f2727375b3e4934b6abbddf83c09a13f554a6c2299e23cab6ac18216a53f9c49ac08d22f5768f515a45a19d325cd3f75635ec71564909cff3155418c SHA512 108df8dea5da1f8e7a2b2a380f530f355c0d204c04858ebd5eec8360fbdddf79c7e7ed7e3ebd4cdfcd94a212992b2b728e136b2d8137f05e6ed10cc70eb15218
+EBUILD librsync-2.1.0.ebuild 611 BLAKE2B c7a769d9d594417d1218f13be7aacf42da098a22f2563f19b437d96058c742cc45aca890fc156bd1532f3f722eafae6861e0248eee4f6a96044c1f3a2647a238 SHA512 54155f0e126bea498763f15aa2dc747d1edaba0d84ce6045e386c3acde3306e6d094e16f55e2afee0e97e90330d3ac829e313db0c9ad7214194e6abd2af17347
+EBUILD librsync-2.2.1.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
+EBUILD librsync-2.3.0.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
 MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
diff --git a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
index df599b245df4..cb7a0da16ce7 100644
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ b/net-libs/librsync/librsync-0.9.7-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/popt"
diff --git a/net-libs/librsync/librsync-2.0.1-r1.ebuild b/net-libs/librsync/librsync-2.0.1-r1.ebuild
index c0e8c59f1856..5d28a19d5528 100644
--- a/net-libs/librsync/librsync-2.0.1-r1.ebuild
+++ b/net-libs/librsync/librsync-2.0.1-r1.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"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/librsync/librsync-2.0.2.ebuild b/net-libs/librsync/librsync-2.0.2.ebuild
index 84ff4a031d89..17d5c77e925e 100644
--- a/net-libs/librsync/librsync-2.0.2.ebuild
+++ b/net-libs/librsync/librsync-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	dev-libs/popt
diff --git a/net-libs/librsync/librsync-2.1.0.ebuild b/net-libs/librsync/librsync-2.1.0.ebuild
index 19f0d6f4bb2c..755db27d3f54 100644
--- a/net-libs/librsync/librsync-2.1.0.ebuild
+++ b/net-libs/librsync/librsync-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	dev-libs/popt
diff --git a/net-libs/librsync/librsync-2.2.1.ebuild b/net-libs/librsync/librsync-2.2.1.ebuild
index 93d015f1bb94..4a6965cbd509 100644
--- a/net-libs/librsync/librsync-2.2.1.ebuild
+++ b/net-libs/librsync/librsync-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	dev-libs/popt
diff --git a/net-libs/librsync/librsync-2.3.0.ebuild b/net-libs/librsync/librsync-2.3.0.ebuild
new file mode 100644
index 000000000000..4a6965cbd509
--- /dev/null
+++ b/net-libs/librsync/librsync-2.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Remote delta-compression library"
+HOMEPAGE="https://librsync.github.io/"
+SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+	dev-libs/popt
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_LIBB2=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index d8f9579b295c..918e109ba74d 100644
--- a/net-libs/libsignal-protocol-c/Manifest
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -1,4 +1,6 @@
 DIST libsignal-protocol-c-2.3.2.tar.gz 271930 BLAKE2B 43e1e384f9f3a81f582445e5f1f10875948b33607aa7feaf98f4b6cc41f5fd30ca9fb7c8426ef66f93cd46a662eb4a57002f5937d68f6fd2fcf0b30b33c60997 SHA512 7c63c42b9a590ed1a60a6f0094668d9948aa04e5965d052c22ae22b176df7c5582b8ec5c0e6c01ad582dfe2b04067380b9734ad08c64785242e90abcdabdfb8d
+DIST libsignal-protocol-c-2.3.3.tar.gz 272073 BLAKE2B 86f31ed8a18bfc1ea80c45ffaf983611d353616d418f308711665aae287ff86697f7586f20f2c52ac028f9e5ad8b6d39c80876b263654c620a541812917b4f44 SHA512 19d892e13fac32022658de5eaf1db8cec3226f5f3f37a4c1c33bfa9653126ecbc6350a1ab5624025f909803c2277b86321dbea7f64e9932883cae57b65f58112
 EBUILD libsignal-protocol-c-2.3.2.ebuild 337 BLAKE2B 921030fa5ecb79d358ce7b22a0215c2ad5770992f137e5eaf74d48db831439eaf0d2e3a259c774b8b0bb29514a27455d43b7279c4b606bca137c5934441ffdee SHA512 cea773d9026592c18a255f242e19ada938372400bf112225d23fb5a8315cb90ec5fb3c63086fc69628b6358e0aa2ffb5a92b8aa78eab735277907626006fb71f
+EBUILD libsignal-protocol-c-2.3.3.ebuild 337 BLAKE2B 921030fa5ecb79d358ce7b22a0215c2ad5770992f137e5eaf74d48db831439eaf0d2e3a259c774b8b0bb29514a27455d43b7279c4b606bca137c5934441ffdee SHA512 cea773d9026592c18a255f242e19ada938372400bf112225d23fb5a8315cb90ec5fb3c63086fc69628b6358e0aa2ffb5a92b8aa78eab735277907626006fb71f
 EBUILD libsignal-protocol-c-9999.ebuild 311 BLAKE2B 17b9baf64a60146c55a2b525493a265eb5070a20a31b4a0dffe24c86e8a720f60a47c06f09e4473dcb2585c0a6f612d2b4df4b47944e927afe84e8ce29ab668f SHA512 6443aef8035cdb162e1681e0547411a1a1e157fb994b89e3e06cc61ed8f01c62419e02a3108e38044688de604342ff48e59a779b3b163cd9984ce3bc3c594659
 MISC metadata.xml 740 BLAKE2B a55ff6046cc360d761f3df397be99bb31c8b8ce41f947cd1ed18c8d96e8474fe4aed9718bb0c7b2541cec2bad46e2caf0448585afea85ca8376b4cfd9053a01c SHA512 92abe5f5a1b810e92d06099d8f59d248ec69c44ea4ec8dfbec8e637a0f58e272d32b6f1024492c010418d796991232b561131cc50a6fbf46f39b55e4c7b6f32b
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
new file mode 100644
index 000000000000..ac7ba3a8418a
--- /dev/null
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Signal Protocol C Library"
+HOMEPAGE="https://www.whispersystems.org/"
+SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index daabb2211069..789f55adeb3b 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,6 +1,6 @@
 AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c886328c5f0e167a68f38d68a170809a63b63439ca99b0e23e6f3b548cb99a518651e93236072de300001c453a5de6f23059709 SHA512 e4e1f8f0e598656785123241cc8aabc948058229cd955ecf651dcb49332e9e35fc4c9831a6336e949e557e18e2af58bd8aa8f31b25628f32b35ced3972fa184f
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.4.8-r1.ebuild 975 BLAKE2B b81e905477922e039e8d4ceb5450dfc55937cf21c8c649c05cc34c70f962e5d24a18d573d642e612a28aaac77d2071a5a1cf3f22ab1d39fbbd1c1c7680788c79 SHA512 8890bbb0515f642044fba84552002e1fb21b9e0e1dd2db68f4e3aef343e5ef689f368031e2b2d2c9f7e531a238b6262bca2df9d9edbb334cc165b4285c2ba36a
-EBUILD libsmi-0.5.0.ebuild 894 BLAKE2B 1f09b27197a313f6077e0535a0045e31586c551513653a5ee6763f0ceb1b70db681beeeff0cbc1cdbdaf55e2b8753a3018fb76226d9697c56590e1ff8d9cfeb4 SHA512 6b07eaf5a12a15d8c1ef103b54b2aaaae1ac21946983ba1378fc65da9b27d5b04339dfa043305da39263c1977f1d29881c6bd7a2f06c14c27d09b612089e7221
+EBUILD libsmi-0.4.8-r1.ebuild 973 BLAKE2B bb6b4b30486cf1315aaee7c418998b66d69e182e49e1402b458c82c38020f4c1173448f511c3fb1c5ff53707dbc7e39ed661eb9f3371b14971144b978f618924 SHA512 486b4b01c94e44cabdcb144d32a3172e857b469397c0330f15089af181eb7b80be7db8e01d1cd137340c61022b4f4d67376656352a6129bfcd820761c1dab0b1
+EBUILD libsmi-0.5.0.ebuild 890 BLAKE2B ed6636cebb4b291b8dc69616bddc78b790a602b416bf84f1576ced1958d97c58ebcd4efe35e3179783fa03f2be45fc7010c8156171d061013daf47e2cb8d7e46 SHA512 6eea1eba1ca4fc90bb4f549f40b43ee7bf754da6c3b45634b9b5ed9eefd8d4199d935b39e1ed488fdc149bacbef9ecb051b11fe2dfe03095059674642ad2735c
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index 3d9ba6c15aa6..0892ae6d97c8 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0.ebuild
index aa462e64eeed..22f53d929ec0 100644
--- a/net-libs/libsmi/libsmi-0.5.0.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0.ebuild
@@ -10,7 +10,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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 9a8c8a53d52a..79a157db9b05 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -3,6 +3,8 @@ AUX 2.66.2-vala-0.46-compat.patch 767 BLAKE2B ff124c8ab2897b2cdbe02e3a4c90e1584f
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
 DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
-EBUILD libsoup-2.62.3.ebuild 2921 BLAKE2B 6a14f5d15e79b4da02d367256edcb39f1a67c1924776fa7fecca2cfbcfaace3c432930b06836a161c899bf481ea603e78c3ae9443fe22bfe707ed855d53bf6e9 SHA512 2b759c494e6ca3b008156dbc790f4b46c9f363e107adc8873725a7dc046a748a7659fa952e82f2ce6baadee595d4ae8907d490accfa57ec943231c4d015d8e5b
-EBUILD libsoup-2.66.4.ebuild 2775 BLAKE2B 7d25d6419d78a71984c815998f0f04c4518e41845e89a7dd8c068d16df9d1be48913f2857920c2a1717b3f27f373ca714b01cd90dab626cd5fd503181b7d4d35 SHA512 fd37118f4aaf39e4ce0bea567332239676d1369f458e8b5e2ef5c06de57dce85182fd150832bd6ef5d0b069bfe3f1835a6f31065179a55c9098b5b89a075fc12
-MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
+DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
+EBUILD libsoup-2.62.3.ebuild 2917 BLAKE2B 3565f682f83a4a9658c232ff6949fa630c6415bbeb998f2cdee9c8b303b31f8f1cebd48f07860f54cbb8100c724b8c9e4a8d92cd71ecb60811868de14035069c SHA512 183d28406eabef85b826b64d385cd39c8a64c0175f0c0c9a2bad5d40d7d450ec2e353dff827c7819ef1c506348c96b5ccd86186240850366e2e9492be683809f
+EBUILD libsoup-2.66.4.ebuild 2776 BLAKE2B 259436379c1e6248f94c8fd2f2598b5be157efdc6faa4aad1a58b3abec05c147644633d338fd4cd6d99dc2f2ed917b043ef5badc5eaedd6aa6488c79b7ea2451 SHA512 ff6af7154565c638f0236c918e5e448026bf7966d72d138f5b9a319af5e81cb0b32e2de3b1c157cfa2d1acdc0777166176ef40d13f0aeeafdac4b0677a019ef5
+EBUILD libsoup-2.70.0.ebuild 3035 BLAKE2B e7c51e9ddb4c08f0f5617a26505455d5d5b3c7a8ab9cb8b0c6ef09a685683327bf4d7e2416ef5b4d66ae7f5c394f9f260ebcd8d65d567dfd7a604d6548adeb4d SHA512 2a801d22d8f0e62a2de19d2ddc57fcb106b40f85551d6943845db30f6f2bc45af7bb4d9e7406436c22c8c1b82443d4bd646acdd0e730d22fcdf102d784fd346c
+MISC metadata.xml 467 BLAKE2B d794fe938763955e050add0d57db197ff4445a7b9d6467cdf0f47ab46ca26e1b9cf4fcebbe0e90df798ab08c8a4d7cdc5b547b347e6caa2f5c83f9be698d0396 SHA512 287cf2cc758d653374e5b58aeab4a96fa45ee0846e902cbc5c7f051e31a6b9300aa4e27814b4a2eb27d6386a2bf0a57cf7032dcac081749141bac1f98851487c
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index be1d814a4b50..46a37bc45006 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.3.ebuild
@@ -18,7 +18,7 @@ IUSE="debug gssapi +introspection samba ssl test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild
index 04739eadca57..a43fd5fe6a7d 100644
--- a/net-libs/libsoup/libsoup-2.66.4.ebuild
+++ b/net-libs/libsoup/libsoup-2.66.4.ebuild
@@ -16,7 +16,7 @@ IUSE="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.38:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
new file mode 100644
index 000000000000..2583e7984519
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.70.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson multilib-minimal vala xdg
+
+DESCRIPTION="HTTP client/server library for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.4"
+
+# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
+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"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
+	sys-libs/zlib
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	samba? ( net-fs/samba )
+"
+RDEPEND="${DEPEND}
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+PATCHES=(
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	"${FILESDIR}"/disable-apache-tests.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
+	sed -e '/hsts/d' -i tests/meson.build || die
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	# But necessary while apache tests are disabled
+	#addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature gssapi)
+		-Dkrb5_config="${CHOST}-krb5-config"
+		$(meson_feature samba ntlm)
+		$(meson_feature brotli)
+		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
+		-Dtls_check=false # disables check, we still rdep on glib-networking
+		-Dgnome=false
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+		-Dvapi=$(multilib_native_usex vala enabled disabled)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
index b01383c30263..7b6e2d422042 100644
--- a/net-libs/libsoup/metadata.xml
+++ b/net-libs/libsoup/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
+		<flag name="brotli">Enable brotli decompression support</flag>
 		<flag name="gssapi">Enable GSSAPI support</flag>
 		<flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
 			Sign-On</flag>
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index b4797569509e..79effc1051e7 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -7,6 +7,6 @@ AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cd
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
-EBUILD libsrtp-1.6.0-r1.ebuild 2399 BLAKE2B 573a69855fdc1ffeab7d6c49ce37b3318db316a6fbb14e4b86439543cd163ce70bb7f3b339b3a9f8e8f1f347bde265267b8d1babb859d27bbe1c39dc05ff80fb SHA512 c5294a11c68fe5de6d69f824283989a100ae03efdb491b21e6e77762718c5e870804434e9018ee2cd31cdf7ad65a0608fc14aa52c20de112c8fb22cd3ce56cb5
-EBUILD libsrtp-2.2.0.ebuild 1898 BLAKE2B 45632f9983d710f4faa9a4b71385f8cdf500acab47e3f4d5bbb266df4818934bed9be6d666fa7b38dc8a49c47de6f0c950ac38ba7065d60522e141a7dc56349c SHA512 554864d7db3374042f23eed8ca99a93a930dc50d3c133efe8d57958af97a6946301b7aa5bce234db3a4dc934ae37ffca1210f1f9d06d1ff4618a65d39704ef48
+EBUILD libsrtp-1.6.0-r1.ebuild 2400 BLAKE2B 184f09d2d76d04e071f39e586f561f9513b95697a64433fc00ba66712e35355452f2ae8ef92ade71769fe8c40251cdd8144ba0fdb4e4148ac09c885aeeda660d SHA512 2e1ec0bb8d1cadb2f7709a9a6a63980f51585418f8cba4fabc044c98e849fa6352a754c1a5c4d2d4e811c3fa1c3526fd6f1c3b88db26fdafb1214f12a87b7c9d
+EBUILD libsrtp-2.2.0.ebuild 1899 BLAKE2B ef1b0dab4409a0da2811094516d413ca1709bde65dfac72b305e5247e9e6c6944de7e56e2c638b6c4f5c94e499652fba31debb580cddbb87028e14dc0cae1644 SHA512 c1cf00d2cfcfaed74251b989801482a606cca5e05d0a323ac055085d49f1dadcdfd3e2cbb3c440a73ff15dfe8c7dfc5f60561867559c9d00a888f9ca2ead86c7
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
index 18d2668dceb2..35aad8e9283b 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index 1ee4065fcb39..ae17a22381c3 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index ea86f1337469..855955838d91 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,5 +1,5 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
-DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2 SHA512 6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3bbbbc69b679b6775edc21dec158d241b076c6f
-EBUILD libssh-0.9.3.ebuild 3187 BLAKE2B c0a9582f41c08e46ea83495229ddd7c72bbe206b450f183a1d2d97b09f9bca0bc7e1d30f5f07665a07fb9fa4810e0be9a771c861176b22675003bf4b26232922 SHA512 dbdb6eca437b738d0a2cb68306c568913c2f62c00921eb2de85dda9f70a22c51791f3f4ffc1d64014ffdd0577a6506641ea2358a52d2e94386aeff9c6950c120
+DIST libssh-0.9.4.tar.xz 500776 BLAKE2B 56b21faac5d24f38c4fe695b31ec879ebab74f7cbfb8b8d336dee37766b7b0802ccac9b02726515ee29d44e18e832cfa322085d5669de1df94e5a428cf9add0f SHA512 38705c19c293ea5e6d286d22eb17021dbe58d88c1e647b699933aa0db9ca1174d43d1ff76c1a1b17bf2cc1a8297ec02f1a67dd9e969676dd69cf6fbdae9bc8d4
+EBUILD libssh-0.9.4.ebuild 3188 BLAKE2B d9e50fee35062e44849fe76806b523f48c573e0c675cc9f6753546db172319a036be780f357b59bc78ba65d222842cf23ea78bdc1308f17133a040d9f6ce3f89 SHA512 49fbd471460929a9d069b78889801c29c786214a0e736769218700d8fe426f5352e7ee40036697aeee3253ba49d442d6b5cf76ffa1c9edd27d8396de79ab1472
 EBUILD libssh-9999.ebuild 3196 BLAKE2B 4234affee1dc97b83d04eb02d7314abb12f7888c3b61a9549397c60e8bde496fe30c9b87ca0ea8f4dd810ef1a11820e452edcd141167759c5c146632d8bd8035 SHA512 80088d91442782770866421e7d7f069dc8e1fff21a24529a38fe5d2c82564c89df89aea84a5b0ef447cc1d58b7f17a1af222929a0f9cb13987637524bc651046
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.3.ebuild b/net-libs/libssh/libssh-0.9.4.ebuild
index d7405a073d55..466de82b14ec 100644
--- a/net-libs/libssh/libssh-0.9.3.ebuild
+++ b/net-libs/libssh/libssh-0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index a72f30a3a59e..a5c08cf4697d 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,6 +1,6 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 AUX libssh2-1.9.0-libdir.patch 573 BLAKE2B 5464910fdb5a9461ad4ad6e94c0c682bb1106d437a47a035cb107c9dbec6d2d9e89f791b4f7309fdba307b898f229dff8bba5b5af5b8c6af2ca6ddc21d949695 SHA512 5b389312a4b0bdb6d724f54ce9659612b11f86add4b185b10ee4277b641b26c63256264e11225ea5f28775f0ac9367b391fe77470f34851aeca2e3b5e3408446
 DIST libssh2-1.9.0_p20190913.tar.gz 467616 BLAKE2B 2df7569aa118cf339340f32a106a547265a777af5834e0e22d18ac71946747e708c48d3125489b277b5c266d66cb35e7e224425bfc6a9b2e37e5d267fd7792b2 SHA512 0e095770b059b28aebd47a1219873bfe3b6e5775bbee5d526a7b6a287090e474ceac91c03b1b8a619a2a77916a110d8d20db22edc3cbfd1772190fb394a53f8a
-EBUILD libssh2-1.9.0_p20190913.ebuild 1521 BLAKE2B 1e0831c980644aa443f6d485e178a3b4807541b61b3ba6b12d8870422c9ace9bcf0ab6bab840f9c114d7ea90fc8a9f1ee37f7b85fe5723461fdfb2b1c28101e8 SHA512 c7d889be505ef33fd1f7ab595b08037869e8147ee6d9cde28e1eebab80d352e44fd2c00b2a473a4e7c87cbdce68129922205118f17db68c302a1bfe705b3a260
+EBUILD libssh2-1.9.0_p20190913.ebuild 1519 BLAKE2B af546f62e5c45362aedc8e719e401609d9b8a07d594c0786309ebf877caecd3a21f6dbc86dde773cb768839877a3a52bb43bb23838bccbebf0fb3e22184d9bb4 SHA512 1d2a280d3fbfb91c32fbd5a427f98c29851ab62a9eb29bff32cd2995d497734d9d05b60f4607ba82dfb6f24180ee8eb2a71fe3cdd9197a271dd7edfa3f1a313b
 EBUILD libssh2-9999.ebuild 1237 BLAKE2B 0a4ace453cacc7e735fc5df42d1bbadfb3a231954a94e992b8c7141037cd07b73a3f262f3ad9dcad9e98d51fe024a41220e0d34593f96e563c26f632e0f172f7 SHA512 f8f597a5adee5b882d3e6d22ce1dd739d5f1a57da4466bfedeebe1d7bfecddac296f687cf4982ece60f5e3e0b52eb4ae8fda30a2e6e4d091f479fbb0872116e2
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index b21da7347494..f75ac77f2f15 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 9c961ccb2184..57ed5efdd4f4 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,8 +1,6 @@
-AUX libtirpc-1.0.2-bcopy-to-memmove.patch 2226 BLAKE2B c0a5244f21d9a5531303b317946fe53b695aafc54095f617a3918f28a94033cd0a30b5f3bfd6fe671b64d4919d255298b55fbb4fa6179c255ff561517361d4e5 SHA512 221c85c47ec56edbdb4ce95e0f67680050b8d9f666c6795ceef7f7720acdf05a535e4afbcdc4e2e5eaeb6edc04bd43f65486df772ad2a0c87987d1c204661f00
 AUX libtirpc-1.2.5-avoid-multiple-definition.patch 1041 BLAKE2B 2fd918dad5c759b49f07335685d01bef8bd1c0127647e097a5fbd58f9ddcfbe1179bedd306917755ce39428fcb4c130f9b628f60233dc2464da96c748fcf96ae SHA512 dd72fdc6fd457d89780c4784772c372eb493df3deac928a7c06709cd3517be5586584751a2a9324fc90157838a6fe594ffe91b4f8baebd6115482d76e94985ca
-DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
+AUX libtirpc-1.2.5-endian.h.patch 754 BLAKE2B 7ccb2c99a77757f02b7633246431a104e326cafc4261f4ca214ca4c5f0a6c3426502b6b31888e99f5c1e9cad9ffae2fd189a5b6970b8f7f0bb01d449aef68df4 SHA512 c91cb5b516d97b5349aee4ee3ddcd2cef7283adb7316a731c7c86332baa79e8c5e5d60d045360023886b75e2f55d72b0a778a595a363f5757df3781c1aa27c4b
 DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.1.4.ebuild 1555 BLAKE2B cae3dfc27f62a0e0fe0f2033ae95bd17e74d7c0b5ad160d71e5e793bf10a74f1dc1c5b4f0a4fffeb814e7f3503d32e67f886f02a02a47212341db41f3ead7ca2 SHA512 e97fd09ab0f1fd7ba552667e1dd18bf7b1f9c5b9deb3107d277851a2351b46e71adbace4e1d7a27528b9bb2754dcbbe5d7e345a24ca5c8a6b480f88519cf403f
-EBUILD libtirpc-1.2.5.ebuild 1588 BLAKE2B 64456d2406af2a72c682f4c2a95a2f846b6d104350cc1176307fe605a271317010fe3606c8a7be1753e70fdb1ac29f121409d471847f6fdba461324242ef766f SHA512 fb082eec0a392c21718dc7c348b719e94b0c0e462c3d0684a67a78f9e1f557b0894937c17eb6c03961311d5d764f1015ea9d43a438803f1bd3a206874daa1dc0
+EBUILD libtirpc-1.2.5.ebuild 1672 BLAKE2B bf1a679d379e7b7b7d18cc63ed401237e86d46d565586825aaa73bf6d5d3488183d56848938e91bf7312e7b00862c8f650cb8c6db6d84641a501046f8ca8f109 SHA512 cd058d4716bb1dfb418030a6576041c17ff4b91bb5f5f66a569341c7826709a705a3d6928d38dfb31fdf0131d2a2cf3dbe927dede95f4d24adc60178bcfef4b5
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch
deleted file mode 100644
index 91619b7ac9fb..000000000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naurp libtirpc-1.0.2.orig/src/auth_time.c libtirpc-1.0.2/src/auth_time.c
---- libtirpc-1.0.2.orig/src/auth_time.c	2017-07-05 11:02:23.000000000 -0400
-+++ libtirpc-1.0.2/src/auth_time.c	2017-07-30 17:48:31.361420071 -0400
-@@ -104,7 +104,7 @@ static int uaddr_to_sockaddr(uaddr, sin)
- 	p_bytes[1] = (unsigned char)a[5] & 0x000000FF;
- 
- 	sin->sin_family = AF_INET; /* always */
--	bcopy((char *)&p_bytes, (char *)&sin->sin_port, 2);
-+	memmove((char *)&sin->sin_port, (char *)&p_bytes, 2);
- 
- 	return (0);
- }
-diff -Naurp libtirpc-1.0.2.orig/src/crypt_client.c libtirpc-1.0.2/src/crypt_client.c
---- libtirpc-1.0.2.orig/src/crypt_client.c	2017-07-05 11:02:23.000000000 -0400
-+++ libtirpc-1.0.2/src/crypt_client.c	2017-07-30 17:49:57.911419445 -0400
-@@ -75,8 +75,8 @@ _des_crypt_call(buf, len, dparms)
- 	des_crypt_1_arg.desbuf.desbuf_val = buf;
- 	des_crypt_1_arg.des_dir = dparms->des_dir;
- 	des_crypt_1_arg.des_mode = dparms->des_mode;
--	bcopy(dparms->des_ivec, des_crypt_1_arg.des_ivec, 8);
--	bcopy(dparms->des_key, des_crypt_1_arg.des_key, 8);
-+	memmove(des_crypt_1_arg.des_ivec, dparms->des_ivec, 8);
-+	memmove(des_crypt_1_arg.des_key, dparms->des_key, 8);
- 
- 	result_1 = des_crypt_1(&des_crypt_1_arg, clnt);
- 	if (result_1 == (desresp *) NULL) {
-@@ -88,8 +88,8 @@ _des_crypt_call(buf, len, dparms)
- 
- 	if (result_1->stat == DESERR_NONE ||
- 	    result_1->stat == DESERR_NOHWDEVICE) {
--		bcopy(result_1->desbuf.desbuf_val, buf, len);
--		bcopy(result_1->des_ivec, dparms->des_ivec, 8);
-+		memmove(buf, result_1->desbuf.desbuf_val, len);
-+		memmove(dparms->des_ivec, result_1->des_ivec, 8);
- 	}
- 
- 	clnt_freeres(clnt, (xdrproc_t)xdr_desresp, result_1);
-diff -Naurp libtirpc-1.0.2.orig/src/svc_auth_des.c libtirpc-1.0.2/src/svc_auth_des.c
---- libtirpc-1.0.2.orig/src/svc_auth_des.c	2017-07-05 11:02:23.000000000 -0400
-+++ libtirpc-1.0.2/src/svc_auth_des.c	2017-07-30 17:50:36.591419165 -0400
-@@ -145,7 +145,7 @@ _svcauth_des(rqst, msg)
- 			return (AUTH_BADCRED);
- 		}
- 		cred->adc_fullname.name = area->area_netname;
--		bcopy((char *)ixdr, cred->adc_fullname.name, 
-+		memmove(cred->adc_fullname.name, (char *)ixdr,
- 			(u_int)namelen);
- 		cred->adc_fullname.name[namelen] = 0;
- 		ixdr += (RNDUP(namelen) / BYTES_PER_XDR_UNIT);
diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch
new file mode 100644
index 000000000000..8245d022bde6
--- /dev/null
+++ b/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch
@@ -0,0 +1,31 @@
+From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Tue, 21 Jan 2020 11:51:16 -0500
+Subject: [PATCH] xdr_float: do not include bits/endian.h
+
+bits/endian.h is an internal header. endian.h should be included.
+
+Fixes compilation with recent musl.
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ src/xdr_float.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xdr_float.c b/src/xdr_float.c
+index 26bc865..349d48f 100644
+--- a/src/xdr_float.c
++++ b/src/xdr_float.c
+@@ -83,7 +83,7 @@ static struct sgl_limits {
+ };
+ #else
+ 
+-#include <bits/endian.h>
++#include <endian.h>
+ #define IEEEFP
+ 
+ #endif /* vax */
+-- 
+1.8.3.1
+
diff --git a/net-libs/libtirpc/libtirpc-1.1.4.ebuild b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
deleted file mode 100644
index 139c19984af1..000000000000
--- a/net-libs/libtirpc/libtirpc-1.1.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
-)
-
-src_prepare() {
-	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
-	default
-	eautoreconf
-}
-
-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.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
index c2680357f980..fe70ea837553 100644
--- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
@@ -12,11 +12,12 @@ 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 ~sh 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}] )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )"
 BDEPEND="
 	app-arch/xz-utils
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
@@ -25,6 +26,7 @@ src_prepare() {
 	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
 	local PATCHES=(
 		"${FILESDIR}"/libtirpc-1.2.5-avoid-multiple-definition.patch
+		"${FILESDIR}"/libtirpc-1.2.5-endian.h.patch
 	)
 	default
 	eautoreconf
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index b695cb9b972a..b242fd239fce 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -2,8 +2,10 @@ DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19
 DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
 DIST libtorrent-rasterbar-1.2.3.tar.gz 3591081 BLAKE2B 9766a21c948997b35c6d209940a2d2cfd76b130f1a9d1f611e07d3eeb27f634a3c5eca12c92261139200084b9678913d85f6a56f98ab6894e5def761615c39ad SHA512 11a81c9f4b968ed360740553f8d856a2fad4eb2f6962f6403394e0a4a6b198ef6f04ce92d11fc6bed9aa979c84efd03fb396027dfe6603f394104b4302e04d82
 DIST libtorrent-rasterbar-1.2.4.tar.gz 3598403 BLAKE2B 7a9a6b3244137fff785d0bd82dc0b1900b9e8c673f1cf9492bbde2c8f14d0a9d4ac3e4835eb9721bb9fa388d1a5d0635f2ffeb0f2a6f5a61f4fda7f89d6a10e3 SHA512 d24901acc0f462b6ff873f9aea880bf44698165db5343e8437b1dd7d7f20dfa6e7fe1e72a44a518fff5f2167a48552ec359696bb682c82e86012737177e082d3
+DIST libtorrent-rasterbar-1.2.5.tar.gz 3603956 BLAKE2B b537ce709fb7941551d50cca8a29543f9735bad25cf33ecf99fc21e54a4ae4e24207e13800888111aec813dfea6811c702c2a1247e415eee8532d967ab8dfdb1 SHA512 2139f09fa20ce8e04a3e3340408abd744e58e1bd698d8509c2d0f166147a3894b36aa3e7e65574750d986259002d4dbd2b7e5052125d41d300116a810bbfaff8
 EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2352 BLAKE2B b1b274c01f49cd03d919bfe038352e51db8eb4279a2454e911632e621c370a49109803e9f2eaa1e7836f885043bcd5d9ad488a564bcd93b9d2a97043d27dc9bb SHA512 f7015e3325fed2f39ccf5a4d2258b36524939237dd6606021be20e865d8d462e5b830f108cbf6e8870df0c2d2e9721a89e8b9f2d9b90c1dbdcef7a887baf9c3d
 EBUILD libtorrent-rasterbar-1.1.14.ebuild 2354 BLAKE2B c934e84456e6a15d3dbc7298bb6a04f7a2577d12f853053675d47cd38b280b5f71808e5b9153c7a3b705574bfe01f82b6f28280230f721061f04317bc6ede5af SHA512 ced4871e896e046b29de877c321da6f91f31e205f8df9ae5b18322ee827a97001f30d4d8810478ce5f7262b8e3934109eda549a0fd5de7a0eec2fb6b33712b61
-EBUILD libtorrent-rasterbar-1.2.3.ebuild 2503 BLAKE2B 7594d465b23d207cbcf3ae0c20c9f8750d6d1561d48f444f9b3b17341251257c0695db5b3bb4f9776659c3895887e0bce99f9906bba993388fe1dc05d383b159 SHA512 2f5c73c76980f74af89a12d2853ab12f8296e6090eaab8f618bd9e9e3da7550efda2e430d26f5a4393a44dbaf55fd4c43e42b5994df8c9fa2bee697bd6518898
+EBUILD libtorrent-rasterbar-1.2.3.ebuild 2535 BLAKE2B e0beb6044f4f8caf995a9ad6f102bd8f6de66e9d350f64f565bc23aa8f6bbc1a2e54f4687708ecc83839fe159454ffd4f7fac3ca273b4c1db3d0f456c05088a1 SHA512 f64f2de0c4d0f45321e5d859d6025593ac8ec28988a571307327aab0c870cc1cd03cb42eaf836414663b8bdb59a66d6cc3c292307e1a326cb8f109bccd623111
 EBUILD libtorrent-rasterbar-1.2.4.ebuild 2505 BLAKE2B 35494a15034d186dcd00704a72db167389986a2e2be4dcd4db3b1e3e09ee71700b725bd82752a385bcd9ab7c87b78f136c7e2f01adc4c26439ac08bce0469676 SHA512 7b6aa95fd0e16fb3c0b7aeb98b5d99abe7ee8b3d4c6190f8cc95477b3a9b0c3e0ee477dfaf1c562738d7537711e3ccd691233fbd9dd278f8c487767449408030
+EBUILD libtorrent-rasterbar-1.2.5.ebuild 2527 BLAKE2B 39e1bb8b364ba6686e8deebb3d00624e6dac5547ea209d447ce447512a1393d22ad596edf7a03ac87c4442e4c88501b37ee32b58f1b0748386c031b39d85d8f5 SHA512 3505acc8a8d7597b1e9d678d84ebd3bf34cc25c8c70dda6cac9e3c65fca14d9f10249c095f5b73e02c92cd97816e284f2fb2e7e89d1390e64daf6374fc10ca28
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.3.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.3.ebuild
index 9d9ad977f833..bb697d414dd5 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.3.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.3.ebuild
@@ -73,6 +73,7 @@ src_configure() {
 		$(use_enable ssl encryption)
 		$(use_enable static-libs static)
 		$(use_enable test tests)
+		--with-boost="${EPREFIX}/usr"
 		--with-libiconv
 	)
 	econf "${myeconfargs[@]}"
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.5.ebuild
new file mode 100644
index 000000000000..7a7fa09895ce
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.5.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1
+
+MY_PV=$(ver_rs 1-2 '_')
+MY_P=${PN/-rasterbar}-${MY_PV}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
+
+src_prepare() {
+	mkdir "${S}"/build-aux/ || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-boost="${EPREFIX}/usr"
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 509a07ee4ee2..5913bbd928ce 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -4,7 +4,9 @@ AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8
 AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a
 DIST libtrace-4.0.10_p1.tar.gz 1855110 BLAKE2B c2b59b52e65ed2227bf87517c1c439498f15823f5df745ef4e16800a3676afa3328c42809c3cb891d5e534990620ae1766b7863b3e1c010227182d9caa727ce3 SHA512 a76c8566c9b06b38ea7c7cfcea896beb23808686af9485dc80b8858c20c7a425f0869f18899fa7ad3e685c25c6c0d2bc7a934724d500211966d01b37964018a0
 DIST libtrace-4.0.11_p1.tar.gz 1855693 BLAKE2B 9135b03258005587ef2e2b51c6e8c87bb2fb4963489b1ce5933c46100d708fa32978fc5b449ffde11fc6c27706afd36a82428cc55f0555a864ffad636f9c991d SHA512 b3cab7d24efe4503358f2265957170b0857f52c4ea2bac0d5424fe3b9565ead51795596ce28410e15741d89e3ba1db3c22046557a3e5b21af8c1b6f8ed9cd585
+DIST libtrace-4.0.12_p1.tar.gz 1865404 BLAKE2B 3b628cc8264fd76bd513a56de9aaa1e0458b10271532853964b8cd1979d73925d48e7255589087e36f98d45809e71bc8dba972e48af9cc26285987327a4bd5f9 SHA512 b2253ba37b6c5d6f6d0efe1ac5c02b67b382e294e291abdb92c697e1a26cbe75b5f54a44bc7e07b1a0c8cb5efc36a3cc3fb48a9d79a090d6732692dbd268b8f8
 EBUILD libtrace-4.0.10_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
 EBUILD libtrace-4.0.11_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
+EBUILD libtrace-4.0.12_p1.ebuild 1436 BLAKE2B 48b5edfc059a42aec53086ec8f82a120713821ee866d06e21ab933e623d95b6909fbb6d759fafe01f23136ef04d9f4909e30305dcff315e06b302e7eb67f9095 SHA512 8ca52d6c350def6509ddc100bceb788b6b3c4552b80ea243422c3d55cdd231be8d7fb785324e284dd9050b48213b9530c1ff6756dee76b90c738eb10e404d8ac
 EBUILD libtrace-99999.ebuild 1422 BLAKE2B bf1e1d0ff2bd0c9cd8932ba643152f47b1f3a402f528ea0cd822a02b8e7bde6d500296b569fc4a9b16590c21b277b0a2f30323471f6ab0e7f6ea40ee9f5026b3 SHA512 7a61a58ea0a678f56a1e79da53673b257a1f2bea232ddc3b359756996b888f1b1a48763ed9e312ab6c62176c1976e0ce72918a34428e40e1ec398e9d17be54cc
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/libtrace-4.0.12_p1.ebuild b/net-libs/libtrace/libtrace-4.0.12_p1.ebuild
new file mode 100644
index 000000000000..68a537141188
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.12_p1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ncurses numa static-libs"
+
+RDEPEND="
+	>=net-libs/libpcap-0.8
+	dev-libs/libyaml
+	dev-libs/openssl:0=
+	net-libs/wandio
+	ncurses? ( sys-libs/ncurses:0= )
+	numa? ( sys-process/numactl )
+"
+DEPEND="
+	${RDEPEND}
+	app-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc
+"
+PATCHES=(
+		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
+		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
+		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
+)
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# Comment out FILE_PATTERNS definition (bug #706230)
+	if has_version ~app-doc/doxygen-1.8.16; then
+		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
+	fi
+	# Update doxygen configuration
+	doxygen -u docs/libtrace.doxygen.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with ncurses) \
+		$(use_with numa) \
+		--with-man
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r docs/doxygen/html
+
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index c026b9da37c1..0338a96b5325 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,12 +1,12 @@
 AUX libupnp-1.12.0-cxx-compat.patch 1023 BLAKE2B b45c64616d1b812d203df768e095dbc69c5388988bd4d3d67187effa88fbbc17d34deda58a4d29c4f7d162614d783c0caf22fcd7afa6752549144597850710a8 SHA512 099bf2443e81ae096a7647891a021ed6d5543aadbcb665bc1466f5eb92b4e5ed515a83507902c20635f839d5f76265d99ccfdafca634d4ed6d6b71626e13a514
 AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6c4f66d2e41863569ac0ff49ddee95a4858f2f60d4c792439aeb3969bec83f0dede2631298cb6c6d46a76b317282f967d77 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c
 AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe
-DIST libupnp-1.12.0.tar.gz 786378 BLAKE2B b1b264c8b254cab79c423fd3efa0911b86aa5ce7ccac35ff61dd5d7fefa9a71d7ce2a513f208b83d66a571483ce8fc179978009908e66b8fc3ff2a1df3d8f26e SHA512 998ef22d2af8e4cbc7fa1f87613ae0aa840e636bb72a5656a97327b0820a46b2b3ed2f3200260c018b5339de2fc4be760d42a3c687e49c7fedb58c1ad2287699
+DIST libupnp-1.12.1.tar.gz 786818 BLAKE2B e44847dda5a7aeabb22a5b76cdc48d1dc69e70f7ecac85824199bf8d6e9b802cb717f2959f70690cc00babf1b554a0cb031995f80c28246b9eec670ebe7aaa90 SHA512 e4741f9245378529a15b8be7acec5af52d802ce84b82f110dab44c30da65fc2514d51d3bee6311643eb28146ea90bb3c97f44f800edb4f3ccccc1681f3e70f80
 DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
 DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
-DIST libupnp-1.8.6.tar.gz 784912 BLAKE2B 8b2ac2dbe6b2bae64677d4e47142f42ad6b3c5af61e03faa628a2859afe62a2cb7a16cbfcfa9a0a307db8210f3786e916d3ac12eba3deee68c3c944c98801bb2 SHA512 8224460fcd808ed44e46c1c5dfc9236521b34fd140469d6549f42468b3acce83f46cb20cde41de574f55a865067a5f30ebbda68b500784c19cef354265f5acb7
-EBUILD libupnp-1.12.0-r1.ebuild 1104 BLAKE2B 78850df80497a50647b20e641163ac676634102411e7fa70c44b402a07269fb203df6a65a55db25d2748014717a6c92e7060042f8f25749dd19eac8330ab7298 SHA512 5a1dafbb73502c5f635e1af71885aa3f7accaaef0ea289e2064db1534edd345e7847c0be9f4a613254ff57aab26ba3e616a32da7072462d098e76f3a24b80a3b
+DIST libupnp-1.8.7.tar.gz 786079 BLAKE2B 5f7764c1392f881f420f27e21084f5c98a6fce711f82a3e83dd21e22bf01f25348cbea377b2fae2d69133e4926ae3f8bffcd870e31c4f29b0fe20214842765d5 SHA512 c02b82e33e4c4d85257f0d282e3c4fc1b14a9f42eebdf12318ce6fb75e620bb0c103f9531e87be744fe70898aae9f67db4b5a187a23bcace33427a5fe7d3293d
+EBUILD libupnp-1.12.1.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
 EBUILD libupnp-1.6.21.ebuild 1044 BLAKE2B c83d4cf4eb687836b5f77b61aa7544f1fc1efb7b0ee751874801b0ec5ce0d521c7fca9f994d921e50d6d521017e0cce5dd90c39efc7facbed09b913bab2992f0 SHA512 c00b0d9075ef638590f7bd88a7fca1ddaeea7b551be515fd8795ef31075ae420fd07452c51712b0a4af7b1141d019a646ced3e67fb9badbebed6e35b0d215b4d
 EBUILD libupnp-1.6.25.ebuild 1045 BLAKE2B fec4de0cd91eb2621093f2e781c69a156a80c31cb84d625f2ff11cb9ae0ec7ae3f50d21e9a43d617c2ea9d89839feea1cc7b14559fbe87039f1d646793d3a144 SHA512 ed91708822c127df4d44ae12c48e7865cfee01baed2065ef86be50e3dce31c4a1ae83de0477f743a63c112139943a018b16a66f8c48d49765e78b2dc85a5ee18
-EBUILD libupnp-1.8.6-r1.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
+EBUILD libupnp-1.8.7.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
 MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
diff --git a/net-libs/libupnp/libupnp-1.8.6-r1.ebuild b/net-libs/libupnp/libupnp-1.12.1.ebuild
index e370f8a87874..e370f8a87874 100644
--- a/net-libs/libupnp/libupnp-1.8.6-r1.ebuild
+++ b/net-libs/libupnp/libupnp-1.12.1.ebuild
diff --git a/net-libs/libupnp/libupnp-1.12.0-r1.ebuild b/net-libs/libupnp/libupnp-1.8.7.ebuild
index 0d8bc53c381b..e370f8a87874 100644
--- a/net-libs/libupnp/libupnp-1.12.0-r1.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.7.ebuild
@@ -18,7 +18,6 @@ DOCS="ChangeLog"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
-	"${FILESDIR}"/${P}-cxx-compat.patch
 )
 
 src_prepare() {
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 983d1352f57f..f670c88ee54f 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,5 +1,6 @@
 AUX libvncserver-0.9.12-CVE-2018-20750.patch 1865 BLAKE2B 351e515b4b2ccb22c8b6620763df04f57e5f32a98031e941aef4beff26f5fafb846bdf224d3b9cde49fd7a098ff5b7bf3040aaca3013e09aa19c2897d7bd9847 SHA512 439e309cc2d16a1aa5d37349e2af52c2637f68fce699882192dacf4e256a98351f7c95f7217bf6f6a54feb3a6b8e381ed7889218d86a00df45cd9dd4941bbb7f
 AUX libvncserver-0.9.12-CVE-2019-15681.patch 881 BLAKE2B 27422045c50ae2c51a49f0b6616b5dd4e4cc33538ef86945e4ed8c4ca13893fffe0e36ac977efb20166c281bda3609ff9e9e4040bf45880b38343c88b00b475a SHA512 1043f40f7d7d4747df4d93ffbfdd102b447eb974e2d023fae64e833beb2e8e5370fc4243728db6403b5cf6c7bd65b2585b0ac8cfafabe24b2a9a4a498d9c2a46
+AUX libvncserver-0.9.12-CVE-2019-15690.patch 1254 BLAKE2B 5d8a6ca6bb48ea95447e79a75bce34d8777019ceea1f3fcbd9f01049c0ecdf34664df43390edb9549d6da4e44e6ead87d2310720b6f54e6a2271e4134dd7a3a0 SHA512 04f0eadf3c3ec8477bd3c9aeafc5dbd73fb5e29f26d7324a999d9c503e6368e5eaf70953b1bb4f90b3c2938c6103ac08f29fe17c05aaebd0018df2d7d8364a73
 AUX libvncserver-0.9.12-cmake-libdir.patch 1272 BLAKE2B ee987d2cf311000de0e8d8ee3449b1f2705a3ec328eecd1b848ebe3fdc5f01e97b074acdab921a5f8e0608494efc0e96d3cfe574f3c5cce01d71f46c5f44fe4b SHA512 1867199b89fd7b1a9308fa10c3bf96ea088371833e34f339a115b23160dcfb668a026c7d4aa87f493288ad9e9e215642a04f902b7afb4225216e336f7d9816f3
 AUX libvncserver-0.9.12-fix-shutdown-crash.patch 2225 BLAKE2B 3531d96806e9e26fbdfdb69b2d98d30cf91d4b1c44748e590ad4d887f2751c48b13a2a9903945ab350e9668bc7d83453fd56c6fa8a7deaefda53fcda8073e2a8 SHA512 201c2a6eb031d9ad45b4d1a20bfa157b6acf1b70a5f0bfeb11178022fbb9a7dc4bf147b0e115a5e57dbfec4e0f2e8e4d62677024303e32f3dbab435806bc574c
 AUX libvncserver-0.9.12-fix-tight-raw-decoding.patch 1486 BLAKE2B 6baf50393a728e0af7dbdc2442c881992a22d2b206ba4381f52ac7607c1a92c3c15084fad81a3bcaa68d1c989306bdce0e64808adbf392c4b102531d9f1bbfc9 SHA512 258ffd60e33fcf8b60fe1d6843f14a0421fc4c309b2bec65bdb2c381718c92d850da9ebc8feae23aef610b72ac2c52afe9fe8048c6ecae6a4340e6a947e1ea5a
@@ -7,5 +8,5 @@ AUX libvncserver-0.9.12-libgcrypt.patch 1526 BLAKE2B 83e042ff875844cced2cb141647
 AUX libvncserver-0.9.12-pkgconfig-libdir.patch 1241 BLAKE2B 7ac16afc86204a320253c4b0b819e4c66c44c6112ac5a9bfbae13bd567391f137d1c4f786f43e5023663fcccb7d45aed628459301dd0859361a7b01f41a98d29 SHA512 37d15eb01f6c89d012c47fff885c2405ead2b7e18798b3fa68fb72bffff9caf084652e1d29fbb11263800c69e875d9442fdef660ea69b146361690820035f056
 AUX libvncserver-0.9.12-sparc-unaligned.patch 1463 BLAKE2B 66ab54a68026de0c9ce5eb04333b24ae104bc24b2fcacf5c1aad2a7d019f94feef46b4588166d8063bd3e5c616b40092309306600328eb8e7597efba5e35952e SHA512 c2d26ca2a570de3fdbabef723cfe3cb6208aabe9d7222feb6f0128fba55370e0dff0b520ac84abdc6d1dc6c0762092d36dea21eccff68432cb1c6e5b1e3b79df
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
-EBUILD libvncserver-0.9.12-r4.ebuild 2305 BLAKE2B 1ac15ae5a035ad446f043e365b998b3d2f52e62f8780365bc23bc103afb89bd11c76136daab1493255dbc9e75f1b9b3b8b53d91a101677c0b1246494b12ae644 SHA512 153b3258ffd09c31e53c2f1edfc9d0e397cd09e15a7eaa4fb04a7b412de504c6fac1d48a28fc911e83c3e95fdadfd9a9bc9479d1a43d356cccc7fec67f222a02
+EBUILD libvncserver-0.9.12-r5.ebuild 2343 BLAKE2B 9c344e34f6774f49fd93013c88dc2b64c6d0c62beebc7e31c9ebae1a587b9da3dfe29a3cd6b05b671fcb33f9f0925e65b73b82dab7e34eb866c5a2dd9795d610 SHA512 419c2a377644d3997c315a6e4e3e68f7ec52773eea06be9b8f7b8fc2b91cc6129f263b7b151f91b76892eced64af26997ad84c73ef8f59871217814418202406
 MISC metadata.xml 994 BLAKE2B 3c12097d08f89fadac86ad92efccccbb533c1ac018cf426aae4a45bbea33ae227dfaec320a7710eabff7da96d22229997dee72b2c84b1aedc575e21e0a5decff SHA512 0ca13849ab948490b862838bf3c2b87cb97ce1739369d23426e518197a786cf24fc79967c01072b710d37c298c792c45e61a55e558d692087800e834f93003e2
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15690.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15690.patch
new file mode 100644
index 000000000000..5ef290129c72
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.12-CVE-2019-15690.patch
@@ -0,0 +1,39 @@
+From 54220248886b5001fbbb9fa73c4e1a2cb9413fed Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Sun, 17 Nov 2019 17:18:35 +0100
+Subject: [PATCH] libvncclient/cursor: limit width/height input values
+
+Avoids a possible heap overflow reported by Pavel Cheremushkin
+<Pavel.Cheremushkin@kaspersky.com>.
+
+re #275
+---
+ libvncclient/cursor.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libvncclient/cursor.c b/libvncclient/cursor.c
+index 67f4572..40ffb3b 100644
+--- a/libvncclient/cursor.c
++++ b/libvncclient/cursor.c
+@@ -28,6 +28,8 @@
+ #define OPER_SAVE     0
+ #define OPER_RESTORE  1
+ 
++#define MAX_CURSOR_SIZE 1024
++
+ #define RGB24_TO_PIXEL(bpp,r,g,b)                                       \
+    ((((uint##bpp##_t)(r) & 0xFF) * client->format.redMax + 127) / 255             \
+     << client->format.redShift |                                              \
+@@ -54,6 +56,9 @@ rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int h
+   if (width * height == 0)
+     return TRUE;
+ 
++  if (width >= MAX_CURSOR_SIZE || height >= MAX_CURSOR_SIZE)
++    return FALSE;
++
+   /* Allocate memory for pixel data and temporary mask data. */
+   if(client->rcSource)
+     free(client->rcSource);
+-- 
+2.24.1
+
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r4.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild
index 114a6529ee84..9ea5a4c3370d 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r4.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-CVE-2019-15681.patch
 	"${FILESDIR}"/${P}-fix-tight-raw-decoding.patch
 	"${FILESDIR}"/${P}-fix-shutdown-crash.patch
+	"${FILESDIR}"/${P}-CVE-2019-15690.patch
 )
 
 src_configure() {
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 393290d77f46..ea3f77c93542 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,5 +1,7 @@
 AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a441c389ff57b5d1814174c90f2e3aea8f269a08c84035fd6853283a47a5eb48dae36ac2c7adc1dfbb85b985a62b2158c87c43c24acf2170 SHA512 79977a3e9142ea4c295a2b3a35f9e902d36fa032ff3ae1f13e6980eb9fa260239205f1b9b5998379a4b56f53e25af72e07c9973d1c67da2cadb254296f964fc4
 AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b54633f4f1c855b0d72ec11763af5b6a550708491a837542978b0a3b2607027c2c5f85375c71ed92f4f3726e10732010bf04565feea5ce765d89cb36ef SHA512 375a5ae24f3399406628fb604ac84670e1a2fb4ae08a4525da721a589e7e06f1265c1d906a037e0e20bca5d88785125f3d831eb853b79e286495ec0e32a22e9d
 DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
+DIST libwebsockets-4.0.0.tar.gz 12330114 BLAKE2B 4c845b02793853e349df311f1772fc6988876dc21a262d952b41a1742f59c9d9d0f9a8f28ce8fa9cdc36e3342022dc46836b359b2a11dfd6ac3f39f8c3c1fc9e SHA512 9d15d708ea399ea50502c97d4689b987e28222c81c6ca499969821532490b4eb19b67bab6b431081888c34f36d41d4f74e3611bd2103eecc31d5c6a559bcdf84
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
-MISC metadata.xml 1723 BLAKE2B 561ac0a5b23081a9b351b2d516d63784c40688a399e0ff49522b4a572b32e7d4462a0062680aa6a1e39c6cc364c1b8fddafb1eb7edcdd99e19eafe557710e23e SHA512 7d259d9f7744deede3f3bde1e79f8e17351443cb8dff672f7c550206bf41064a01a43b2bb955a97144bf9319ee190c9f9ffc49a9513c22db6288b49b51c9ace4
+EBUILD libwebsockets-4.0.0.ebuild 2158 BLAKE2B b938465ea3cd827241f4cdfef782248bc7dcbe1083df9301ea8ae0229555aaa69db89cebd0de8010730e0239edca5b7ddce13f911d2583cb556769146bcb405d SHA512 cb9e3ff4ae75c6bef52cbd58c07570cf0cf75189c251fd0384fd1270a355962398c283444c8b33609741f09d4d728d94d4c7c170127276fdf6ca564b99b49cf9
+MISC metadata.xml 1606 BLAKE2B 5e364abce43549abfa07179a757c2455ee2edc3d99d37c08d6f0d6f1df87d571e8f912672f2225175969ddc228abd25b7ab3218021857759b3f2d42792db5dad SHA512 9c38e83966d1a70197c0777fc15b7788c3c65420f38131bf8ef977601855710e9288dcc19cf2f63ffa2d34234d0b9b2d10e0259489581ca947139036c53b1644
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.0.ebuild
new file mode 100644
index 000000000000..baeee47a7b27
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-4.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A flexible pure-C library for implementing network protocols"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/16" # libwebsockets.so.16
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
+	+lejp libev libevent libressl libuv peer-limits server-status smtp socks5
+	sqlite3 ssl static-libs threads zip"
+
+REQUIRED_USE="
+	generic-sessions? ( smtp sqlite3 )
+	http-proxy? ( client )
+	smtp? ( libuv )
+	?? ( libev libevent )
+"
+
+RDEPEND="
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	http-proxy? ( net-libs/libhubbub )
+	libev? ( dev-libs/libev )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	sqlite3? ( dev-db/sqlite:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl?  ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DLWS_HAVE_LIBCAP=$(usex caps)
+		-DLWS_IPV6=$(usex ipv6)
+		-DLWS_ROLE_DBUS=$(usex dbus)
+		-DLWS_WITHOUT_CLIENT=$(usex !client)
+		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
+		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
+		-DLWS_WITH_CGI=$(usex cgi)
+		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
+		-DLWS_WITH_HTTP2=$(usex http2)
+		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
+		-DLWS_WITH_HUBBUB=$(usex http-proxy)
+		-DLWS_WITH_LEJP=$(usex lejp)
+		-DLWS_WITH_LIBEV=$(usex libev)
+		-DLWS_WITH_LIBEVENT=$(usex libevent)
+		-DLWS_WITH_LIBUV=$(usex libuv)
+		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
+		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
+		-DLWS_WITH_SMTP=$(usex smtp)
+		-DLWS_WITH_SOCKS5=$(usex socks5)
+		-DLWS_WITH_SQLITE3=$(usex sqlite3)
+		-DLWS_WITH_SSL=$(usex ssl)
+		-DLWS_WITH_STATIC=$(usex static-libs)
+		-DLWS_WITH_THREADPOOL=$(usex threads)
+		-DLWS_WITH_ZIP_FOPS=$(usex zip)
+		-DLWS_WITHOUT_TESTAPPS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 5d94cebb10db..66a43eaafee6 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>
-		libwebsockets is a C library for lightweight websocket clients and servers.
-	</longdescription>
 	<use>
 		<flag name="access-log">Support generating Apache-compatible access logs</flag>
 		<flag name="cgi">Include CGI (spawn process with network-connected stdin/out/err) APIs</flag>
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 2cdd98548483..5e78c3bd55b1 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -2,7 +2,7 @@ AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a58
 AUX loudmouth-1.5.3-skip-gtk-doc.patch 394 BLAKE2B ebcfed350077bcb67b0f7da9d0c9a31fa7483d4d927323490920f7d56b7cf78bcb6dfe04b4f59a36fac07c24267653ce8bcb2e17f2e19f4d2ad7037dca0844b5 SHA512 02ec191f33dd5601f9d875d3a5d0e1bc5baf904c18ca47c90280f860ee1449e51dbc7f2be841de85c8baf23d615574592ca8f9a913ae6b5dacd2583497bf8889
 DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb6bbaf544cdf775f6d6c64fdbeb6eb8f7042eb13fcdeb36c89bb8d9522c2eba02c24987757c0f0ac8748d92a2b166 SHA512 ab6b16b4e644b69cdb7d8df1753d1bb5b43c2f1e76944e639339169b332e1b5c6a4246053c5b8a579ee9b53c845cef610b0040dfdffeb857180b6bab71adfcce
 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
-EBUILD loudmouth-1.5.3-r1.ebuild 1169 BLAKE2B 152fc2b757c5cdb559f7aad0d9e891168de5e00f78ef4c27e1682652e1c4e2f35502426b223694f0ab8d1a19d18c069ef8b5cd22ac4f28059775c5e7403c4641 SHA512 311580ee437c94dd549d6654cd72299173c06c78e73de4d28eef88b5a12b3f8b13c2419067a6fc7d9ef1df4f7667728c804d4021c86f928a56cc643c5448cf27
+EBUILD loudmouth-1.5.3-r1.ebuild 1170 BLAKE2B 796ee7350f10ddf6f962dffc0b0514da80650e8b515208230f960353a3e8346c599f498f012e4dadac5e849ebad52a5d1addb736ffc51ec825a48ee5e8f956d2 SHA512 ebce5d4cb91189e8451f371720579ae803d21c387f5d94e0a3ca8d7406e5a7a13072ea8331eb2b42e73122a20c50e1563bc86732cb22fa5091d419162576ccc4
 EBUILD loudmouth-1.5.3-r2.ebuild 1198 BLAKE2B c9937e44c3d032a6a68e4fce361a308609a6d287f498d45b69a870ae44ea7e84703ca761af65e610e065dc7ec41571b1b649fecb87a4bb45f1f6e13a9cc7bcbe SHA512 7598c1fe67f16f5bf37c30f00da4a2ba2eb42efb4826295a3980f72a0036783c3ac4ff4ce0963e06a28e0be28c9d25e36228edf2328515da96b890df7ea8e6cb
-EBUILD loudmouth-1.5.3-r3.ebuild 1073 BLAKE2B 7b3f8e4117b8fd6f61f0b4eb20109331613569a20a5464fc814f4268d17694858978ac4fe8101c1d01af4430764f5d4682a941a04c1f34397a23e5bfb33a5449 SHA512 0c9d18f4d330ef501e29f2a75878dc91f38bef7877bdfc2cb0b4ebff0c0699402440663d88da53cb083b65be6f0d29e6e546669f8e27429e7da92a836f921149
+EBUILD loudmouth-1.5.3-r3.ebuild 1074 BLAKE2B d4423f6290a6758854eff9aed1f3301afa45bec3096d8790cc77b7e7a6eb9bf4800077d84adfea08841126c18b94b65ecb505a811508274496e38f41fb4f7bb1 SHA512 bcb978c82eeb5e03fbc03ce485041674cadf59f724524086a7ed4de63c15f3ada7c29a5cbb11207a6c1104b8b1f0cc01b4e6432eba17a6d17c9d8e13bd83c76a
 MISC metadata.xml 563 BLAKE2B 11e3e68d92736cc1dc95df692d61420d487434c24d7ffa665ef7453fb0dde039b6006ce3edcae8ac0401dc15f99468133b3a4eb73c48b6ef20570558b33a90cf SHA512 b2847486aaf03b8bcd02ea006247c735da3dddac5e60f746f21d32985ef78585c347eae6cfcc8723175166455cd758014e19ccea79bdd77ede74bd36faf31c09
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
index 125a2a820c71..2ec2b71854fa 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
index cc082def1823..c1581eabfdf5 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 2d5fdef8cd40..097f44babf57 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,20 +1,9 @@
 AUX mbedtls-2.19.1-zlib.patch 1163 BLAKE2B a5b44c2af4d9e7dd37a004063b69ae9878bf240abcd75376c14e73b01a99586e06da1ece285cbbb06905dfbeff28c173bb9d170a9a22ad1045fa20b225185df0 SHA512 cc8128b55383caddc9a3d51a22222b5da51b41bdaa0b44ad4d9a447b85b9ac96eb7aa7c9e88823e62ec51ee5567531138741f03603c563cfe99172226e61ed73
 AUX mbedtls-dont-overwrite-headers.patch 2183 BLAKE2B 1353eb9c929e4d79bc1f4eecd671c9b6602917198724b42e1b43153a4751cd5a36737fd706f97e933beb857a246dc16574f4d989cc674661dd774f7df9d1c3a3 SHA512 19dec50ce70821b0c94e7bd9c50c1f8ebd7d7abc087cb91a637e5349ac938b4b07236f7fc4580e4a348ecb9de68d4b0b45cdced6e5103ce94178be710b2563a3
 AUX mbedtls-un-pebcak-705038-wrong-file.patch 2766 BLAKE2B df7ef73f53f4a2b69cc8b435d21decffb580d28e75b9ec52620c305dfc395cc088cf7e4bbcaad381a3c9f8587b1678700d8df1cd65ceeef8079e4ed250ec9ec7 SHA512 376a5c7009122b60345b9edc3ce8a2f765d1c7ef11f6a398a9b9fe1c6e4a9d36d62483f036a6c77e21fc86f2900d9d3a7c477582463a80121097a56cb08a0515
-DIST mbedcrypto-1.1.0d0.tar.gz 2907562 BLAKE2B 645b8eac1c55e6217d7b309e1b9ddf856f6d565f928e04211bb5714189024bff8f445a8e6c709d6b2e700d9390521cc31d194f4a98f7f211af3ca9b7109d7549 SHA512 923f8b18eaabae56015607442e996d77ddfd68443e3d33176ba9fe1c5a53fe611af584b5d8dc2111fbda41e5396921d6be9a3a3837cd4d85671237e0932f5cc2
 DIST mbedcrypto-2.0.0.tar.gz 3001813 BLAKE2B 35a01b7cb11a94cb5ef333f5939945b40ecd0da482959980931e389ac5aec3c1c1b2f40970bbde4587454aee5957dce220593bfc31943ec3deddfa70d2386a25 SHA512 3a8fa6b7160065ef175139ba9cb4c8599be11f9d0df5fd60f9f96c425400a0a40eaa31d571ce61d4a00e3b10c1e2b81756c1ad31df6fc32777f40ade7806948a
-DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d8eca110633960c8197becf1fb64b77e36f2bd63e241ff0a3eb86aae1b6b538de2043e1bb6626b9b18fa9951db91 SHA512 a1dcb46d3e27c93b511a0dc846b5ed6dc35992cdcf04fce6ad83f5a92440d11d60a07e0fec64f9d6c5e2f27365bdd7a557a35af4ff250b342adbde6193240a95
-DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
-DIST mbedtls-2.16.3.tar.gz 2459563 BLAKE2B 5de21b27274dae61e282114da196078be7931e823750f712145c372160204e02f36f995d2cca8589f7b8ffcb646b0b258b0d49db6a0ffa01117b8c0af9f3fa0e SHA512 3d798f7de9c33325585d5d7c8608cc16acdcf42c246d283b2fb8a29f5e419f2899342965ff297432ef2ab20c91eaee28d6ca53349f5a68b0a4fd29d6905fc64c
-DIST mbedtls-2.16.4.tar.gz 2597922 BLAKE2B 787837903e1d9a5951e3b379b17e82bb6857597c55efa913e8a6d9f9be1f26d8c8eb08e72e56855748695771aea2a6e6826b7da7d2ac4d53596584ea967c1457 SHA512 e0546f2233d4ffbf0c0f3227c1ee6185124484a740dbd2d18f02a036567e043c0a8c7b49501ce6fa1b03161d86b487f1cc16f7afafac357d3e5ebfc367cd9a33
 DIST mbedtls-2.17.0.tar.gz 2738368 BLAKE2B efcf2a6c84a85afdca0205bd9e8bcf039074c5e6f40e0814f835cf26c2d13dce87bd140aa0b803eea6a683e31b79680a3ea8ba72417e7ec26f206e0b027b014a SHA512 6ab52d116cb9f755871f2fd196ec1b352dbbe59f2ecedeb5551237e4e672da77205ef0c2f80ec746ba1fd94cab1995ab1729c8adb0f29d10f3c74a67f5327493
-DIST mbedtls-2.18.1.tar.gz 2810688 BLAKE2B 25e8cfdb16e18049e4c89e271babe5b711634099ef89c54169e606da7aabedde1ac862ecd34dbe05e8052ea0183a7aa3b575d431305af4f8ecdd22da0f79f103 SHA512 39d1844806a0312ad97236d247e624fca15f10d7aff2336e764f214594a505f5109d6407fe6d399171086376124bc74da0c0f0b7aa9db85fa41f70143f04b95b
 DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b
-EBUILD mbedtls-2.10.0.ebuild 2416 BLAKE2B 534b176815921b6702ba50c8432320a56563ebcb07cbf1a129841d115f83b71c98e0c942e57e9c84a53410823728cd7c3fe10d090e17d21260918cb297c58f2c SHA512 3950efb017bb0423b3860888fb028db24bc1422b78b8c16b9c2bc5c3af3fb1a66c75c43c902578f779838893baf79cab513e9cd4de7d885e31a3a2abf06665e3
-EBUILD mbedtls-2.12.0.ebuild 2444 BLAKE2B 9de15ee64d5b6eb1b115c0a401a5141361a5f6c7f4375d40901a7a6358bed7776b8605e5bc9585d5cf4957f4e140a7b2c99f1f2fecf6c68a1a1a4125a2c2ad86 SHA512 05d35d1bbc857d0928a03b6083d68e1d798f5bcd317ed5ed1ac76547b0d09716accbd192288fd480de4fbab49c0a715fb8eff7e320ca910f641b043e673e2416
-EBUILD mbedtls-2.16.3.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
-EBUILD mbedtls-2.16.4.ebuild 2453 BLAKE2B 15cf4dc369f789a3cb945b194c448e5ae85a9b529f38d7453f8b4d117c6a92ca1af7c04740b28c7f291885943250f527720447a439fcdb06b0eff2f763383e3b SHA512 ff4b622b5b2d071ac3f67a44565a6255e4c4d85a254f19e2ec5f2333063f187372b04440af9924fa3e66e55df7540eaf6990c22237932a1f600177faf49de14f
-EBUILD mbedtls-2.17.0.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
-EBUILD mbedtls-2.18.1-r2.ebuild 2800 BLAKE2B 8db411d90f17c45c25724daf1632c849f759b4aa7dffb5527eaa9d39f22a7d477a6a263bec9e18082d7df80f100864596015f4f8b34a59983be913cf12797d9f SHA512 fb6e726875ac330dc6fb54d587c39c43ca5da6bbe7e07dcab549b8cf1cfac83068f2acdc9cc1837180226842f27a69e5c1fb7880c355b7e9577fcddd42bb80d8
-EBUILD mbedtls-2.19.1-r2.ebuild 2845 BLAKE2B 9efc07936fbf097d8b1424b0f40be2f335ab367a83940a5d29e0b84ead90ead7acc2bfd4b82415a1c6bc74ac69d5172e86ada9cca312b956b306ab136f3e9654 SHA512 14529f237086d9e3a837beb2287fa13213fbf67db3b641de2f1e483361ce482dd3f31ba9ba2502b40308f4562ec079e2987b21a3b512cd856a0cfe362dd13dd0
+EBUILD mbedtls-2.17.0.ebuild 2449 BLAKE2B f9d80604358d3bf39fadc6f112c8aa82e9b879a917f059b27d912f705316cfd9bc45c936ab8926ab19509fa397848e824883eebe993d4ecd550e48a539170ba3 SHA512 128290aaa41701422296ef214b0a21f295d5207b5ce562de7e9c3603eeb6e0595993bd9545c9cfefeb2f64ed351fa30497bcfbfd55916a40253fda8b597b65d9
+EBUILD mbedtls-2.19.1-r2.ebuild 2835 BLAKE2B 239727e104e5c40ee3e958a7ca9c908800b32b4b6e0e46914c7a3e15105f92bad560ebc39bccc349ce2fd7be6fab6c91767d8d9a6b7e0ebd2a15b6616a93a753 SHA512 d63cd1e267786b5c6c7c4187078ecccb1403ee553f231c509035d9139104076f6d6f038f029e6cf798e8ca9881f4df000a572525a0f55349425a95eb0396c3b8
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
deleted file mode 100644
index 1269fff75f46..000000000000
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
deleted file mode 100644
index aa88a987df3b..000000000000
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/11" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.3.ebuild b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
deleted file mode 100644
index 13c601c526bb..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.4.ebuild b/net-libs/mbedtls/mbedtls-2.16.4.ebuild
deleted file mode 100644
index fa71e95eebe0..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.17.0.ebuild b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
index 13c601c526bb..ffb19c04d7a4 100644
--- a/net-libs/mbedtls/mbedtls-2.17.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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.18.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild
deleted file mode 100644
index dfb900ea4c69..000000000000
--- a/net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-CRYPTO_SUBMODULE="mbedcrypto-1.1.0d0"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
-	https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-dont-overwrite-headers.patch
-	"${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch
-)
-
-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
-
-	# pretend to be git submodule
-	rmdir "${S}"/crypto
-	mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
index 55ffc2164a72..6e33b2b74111 100644
--- a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index 1e31531697a6..cc6c5ce6fc97 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -2,5 +2,5 @@ AUX meanwhile-1.0.2-gentoo-fhs-samples.patch 588 BLAKE2B 1905d0d49a814157ae8f6c8
 AUX meanwhile-1.0.2-glib2.31.patch 6461 BLAKE2B 1d46f23d60776dd3f3743ca8c892828b966bc3bcf679d7e3f33739fb1d54fe999bf9ff605590c7458b3d4e12a374109903ba53bad1763e343c30224c506b89bf SHA512 b22a45ff231f33294808e65dd0e0461810be26078d94493c56e3e0303fa9d5606f7916f14edee7f94a2b78574300ba76df433b9e3c1ba0b5df3da0d07aa9ca70
 AUX meanwhile-1.0.2-presence.patch 1163 BLAKE2B ba471439dd6acaa5e4b3db78432b76379570c8bde5c760ce0ce388ef33b41527e43c001445c7bfad3e998590c8e80e13b6b12723d340bfac338e9394ed4b8e9a SHA512 f4caf5f727464b044ed533abcb3929227bc55cba4132b55587411ae5c78c320c916924c5b9228a34634af68f4a00d8103616c64b4b77f04e15f66d8ff62dbbd7
 DIST meanwhile-1.0.2.tar.gz 479325 BLAKE2B 70b032ab9b1fc6f556a16afceec5eac72b8efc686977734c84068fb34e49fed01c2c20743ba058cd99de155dd0172ea2132c8bdbfbbfcaa572f889c15da96e01 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6
-EBUILD meanwhile-1.0.2-r1.ebuild 963 BLAKE2B 18bd3fc4818ca0adf81d89f5502a065b3cb1bd3b2e80493db3abc7ed156598184a52c5900d796fee28fa7ff5860e7921b5a7d176926b904ffab499a850f577e7 SHA512 58238ab186eade328404d592b7efcef1b3b727bf32baca2eb719ccb557c1d06858fb59fdcf84bffba3fa3fe1b67f1b9d3eff067df564af9765732277d84021d3
+EBUILD meanwhile-1.0.2-r1.ebuild 964 BLAKE2B b645424fa220c1c176813b96cbcecf219f1505112b707f101e00b1a58d444eb55b6438854bb4884216dce13d4b2e74c94545f64ee36a29994efb7f4b729aa288 SHA512 46461a9fd8e760d9911e29a8baf920942823d05976b6926c8159c0aa83c59bd76d5fd246e1911952769b86083b772964f5d34c28f375eb7f79e9cd0932e65a6c
 MISC metadata.xml 246 BLAKE2B a740e9a1a3e17c2fa628a8e04b07077f2495eda755cbd903ea5934b0409f05f7297ddc90aa9693b9d7f1b7b3bbf3f2070f5e266cfbe230cf07d71749ba54df95 SHA512 9131560c103b0fbf21dae354b0a00ac68bee1b326a3e38b3c18fa7396b4369c4c29a0e550344cb219fd48c94b2d1c21b185a329c992096c0693ea2bf24aa31b2
diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
index 7d3f38645197..e2290db3cec8 100644
--- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
+++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc debug"
 
 RDEPEND="dev-libs/glib:2"
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 301f97da555d..b3af941a3299 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,7 +1,3 @@
-DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
-DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
 DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
-EBUILD miniupnpc-2.1.20190625.ebuild 1323 BLAKE2B f8bc0853f7a47ae30c45cfa3377bfc38792a4fb171fd5aa1f8be2ef83eda84f8f244cf50a5f525ffac8daedfd036339f6daf1a5c44bd6941f0523dd09f6baaea SHA512 cf130e53ad502521880104721b5b092cab3a5841ad838a3eb1efab62bc1a1daf0c3e3e3099cea31f918ee57921b6cd21774f4867824fdf54d18d550f141964da
-EBUILD miniupnpc-2.1.20190824.ebuild 1324 BLAKE2B 57d051770224dbf2c954120ef139970f5bc9029ddeb89cbf2916742ea842ee4d25ac766c32d3612dbc5ac23fb6b855c05b2bdea693fb5c0c30407f1e1febc623 SHA512 51a5402b90a479404796d020406189393c38024120998b705e9cc40096a7951ab632ba2a0d47b534f20d53418c8e2afa7164fc3cf3df2b22f9eb0df523ef6ab9
-EBUILD miniupnpc-2.1.20191224.ebuild 1324 BLAKE2B b0a33f4869a3ff34ed93ff7899ce8597dbb87859e34aac204e33c00f267e9a7d45900f893dde85b19f579be1f667ac42ff45dbcb99e398e8e44ac53de05cd2a8 SHA512 c7492d8d2c915b57c65f7ba268c2f04aae7b0643f56200c9bc875d283ee61f3a9b388b167922846b070e22c0bf5073ed568668fe198d1170e5d663822e3e02fa
+EBUILD miniupnpc-2.1.20191224.ebuild 1323 BLAKE2B 28df43609d2274aae43c47ec35fcd5f813ced3935eca25b3f700ae91f0293a1df9fd4f39559fd41296bbc676ed0e263e448c1953fef7dad902379a347d5a1df1 SHA512 465c177828696c55f15983fdb49b330c4f1e6c19c47961f112ca24813a01a2c339f2af0091bd36daa974cd875ec449b4dedf695a10ce4fab318bdacd1cfea6e9
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
deleted file mode 100644
index ed9a29ff0b04..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-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"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
deleted file mode 100644
index f79efb2879c2..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-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"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
index 929f97181800..7c74096859fc 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
@@ -11,7 +11,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 0fa1a9dadd60..317b96dc2ad0 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -5,9 +5,12 @@ DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c84
 DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
 DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
 DIST nDPI-3.0.tar.gz 26902734 BLAKE2B 79380ce5138b8ba99169ce3a2afeaa2a2bcded9bc7834d32af6911e9cee60395613a390d2d5d0530b9ff9263ad707e78f49d35098428c66a9c95a98aee2d8df8 SHA512 74c4a41201e809b476f4c23b99c2391b7bcbc76507a11261d216caf2350db8fd4ae3dac69d1d2179b12217901da1e04676aeca05d3a8e63d1a162469b33ab4c0
+DIST nDPI-3.2.tar.gz 29586049 BLAKE2B 4ea7f1cf39b5363b724c2db84c006de2f0e05ea275586241c3e1b9a53681f1da83dc752e69d379d6b8c8bcf8b15b146e8a2de127931d3b2061112aef297f7d79 SHA512 bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
 EBUILD nDPI-2.0.ebuild 636 BLAKE2B 0fe243e30b94361eba3ede095dd9fb811a71067ce3a46e00ea437daece431e42a3f72665e918c497254bd99f092aca381bb6f870180a30a8008e5c22eed1099f SHA512 8b4c2650841a748683fb4ee4bee41c999a9c0cd60c92cf0160577f5f1d8fbede979e5e02f0e3c60f78c010661826993c804a9e07a23fd6042baee89ed259683e
 EBUILD nDPI-2.2.ebuild 1013 BLAKE2B 4e5423411ded7c631b27615da56f8b1cd55ad0f66847f78aaf26348de286e0ab9436f9369ad1f5a1a0b24edca6dab921cdfb88bbde3d9078add58ff251109bf7 SHA512 ba79f9c582c89d86bc26998958de455f0ebdc30a96bb5bea46e6f24c099288a0e6485b53bee801bf4d5c7430700cfbfd54791c722dd70851af87a81bbb786ab3
 EBUILD nDPI-2.8.ebuild 1073 BLAKE2B 62465dfb22f70d24ba4947d7005ffebe89b930336c7ba1dd651649840b39245cd470e72c16c5ca46393bc28120d52315a0685249e7a2aa7f04ded86798b69e62 SHA512 dcf8abb346221acf640f858165a5049522c20ce7919466e733f34839c943b487e9beba309e73f7ee1b7a89ffa3b95115e4c7eb51f48cb42e4c7b5430017ccbe9
 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.ebuild 1340 BLAKE2B 4d4829ebbb8a0bc90e05a78969c5a96e924bea9602b4d885df3033c4838f4b768da28b299fca715b54dc735f29fceb547f72669252a2532e287e5e924f8fc873 SHA512 cfa71e603ad0cf9275ada9c9c477280e694195e511204fa0a04437e295ad178a45c4fee3d71fdc24585c00e848caa6ded5b759c1edbbac0c02bc99ac5eba4ed1
+EBUILD nDPI-9999.ebuild 1293 BLAKE2B d69406384a02ff5fa67aabcf6d97183b362b4fcf7bfb06fa4ba95e53469007305e197459e9250b4be800a89506a3542df3abf07ab60aef3d9aab93bcca5daa0d SHA512 6def195805ee8aff6339bb0a38a098048a95391b6aeed6319946d550e79aac36251d23d4401854b043e7f46003490d15736b67b1c3af044ffcc11b939bc38ff3
 MISC metadata.xml 292 BLAKE2B 387a2816be3615c7a1430ca3888546eecd1b5c679805b87cf7975cf7d4b59a224c8edea34ca354b8bf4d793457531f6388816cdf86641fcc3f6df89432848b46 SHA512 488fc61860f278d9f7be4a6cd246eb45bac7efafe57e777f1c46984a07f132a76dcca6170b4876edea4d720f4696549b85989ae012749a00d234a0137b98ec6f
diff --git a/net-libs/nDPI/nDPI-3.2.ebuild b/net-libs/nDPI/nDPI-3.2.ebuild
new file mode 100644
index 000000000000..012aff2f4458
--- /dev/null
+++ b/net-libs/nDPI/nDPI-3.2.ebuild
@@ -0,0 +1,57 @@
+# 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() {
+	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
new file mode 100644
index 000000000000..6e8aa6700933
--- /dev/null
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 multilib
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+EGIT_REPO_URI="https://github.com/ntop/${PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="static-libs"
+
+DEPEND="
+	dev-libs/json-c:=
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+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/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 9611bb62d11e..f179d79784a1 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,6 +1,6 @@
 AUX nativebiginteger-0.9.36-asmfix.patch 588 BLAKE2B 5bfc18fad9965210068df8cc86ddfd3f99af9f5db9e39ec5eda9b51f357c0f41d6649bc92f3d1c15bbfcbb88210986ceb2a60cfe03f1c48ef4b5f3b4ae0b57a2 SHA512 70ee208ba6342633ae9cd81b38fc71024583933a4da5317d3407aacf5112672be0abbb872e1a7f617a4eee43c96fe9a64f09b9d315ad97519a6feb34755500f1
-DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
 DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
-EBUILD nativebiginteger-0.9.36-r1.ebuild 1477 BLAKE2B dbe24a64621ffb46f7561df9db14333dc5cabede535fdf7d577d33faefa73e034fc98bf80cd53080aa814736256f0272d27256bc03b8edf6295f0dfc30fcc189 SHA512 9a9adec2cb88eadad13980ff7b4ae648d61ae33ab74b74aaf79cb5bad8881bae31d189847e48d6029ae99acb7413a5d8cef7bfdf62fd5824bb02d6b11dc2f909
+DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9
 EBUILD nativebiginteger-0.9.42.ebuild 1597 BLAKE2B 92b144c717a511aa85491e72204e2522e901d37cbee29e2323fc8dd4afb3d798cdce5edda60f36d5ba9d78a0adfad7ed88c8dec603a5514620d26f54b032532d SHA512 548eea57016ca6100587a8521cc8383b999f5299a99fd577e54542e46f46254cea00ed009a568d906374a6e81a8072242855a1ee86abbaa9c937352e0c9a550a
+EBUILD nativebiginteger-0.9.45.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
 MISC metadata.xml 367 BLAKE2B e6ae176d14b1c47214343a27d2fe27d22f354879bbe3e27d01fd9fb06944ad57ca6791765dec8246e6a1583e9f66cfc72867b0f85a66f4d0752a64344d9fb5bc SHA512 a568f5918a48ac57cebe1bc19c22f8e7ee2f2e1e9710b088ae7411ae1435bc170a7e81307da909bea3781e2e3217f8791623e3b0f4a50658232af9b000bf4f2e
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.45.ebuild
index fafd98f37e95..e0d376b7aa6d 100644
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.45.ebuild
@@ -1,24 +1,24 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit java-pkg-2 toolchain-funcs
 
-DESCRIPTION='jbigi library used by net-vpn/i2p'
-HOMEPAGE='https://geti2p.net'
+DESCRIPTION="jbigi library used by net-vpn/i2p"
+HOMEPAGE="https://geti2p.net"
 SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
 
-LICENSE='public-domain'
-SLOT='0'
-KEYWORDS='~amd64 ~x86'
-IUSE='test'
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND='
+DEPEND="
 	dev-libs/gmp:0=
 	virtual/jdk:1.8
-'
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/i2p-${PV}/core"
@@ -39,27 +39,27 @@ src_compile() {
 			"${file}" -o "lib${name}.so"
 	}
 
-	cd "${S}/c/jbigi/jbigi" &&
-		compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
-		die 'unable to build jbigi'
+	cd "${S}/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+		die "unable to build jbigi"
 
 	if use amd64 || use x86; then
-		cd "${S}/c/jcpuid" &&
-			compile_lib jcpuid src/jcpuid.c -Iinclude ||
-			die 'unable to build jcpuid'
+		cd "${S}/c/jcpuid" || die "unable to cd to jcpuid"
+		compile_lib jcpuid src/jcpuid.c -Iinclude ||
+			die "unable to build jcpuid"
 	fi
 
 	if use test; then
-		cd "${S}/java/src" &&
-			ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
-			die 'unable to build tests'
+		cd "${S}/java/src" || die "unable to cd to java/src"
+		ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
+			die "unable to build tests"
 	fi
 }
 
 src_test() {
-	cd "${S}/java/src" &&
-		"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
-		die 'unable to pass tests'
+	cd "${S}/java/src" || die "unable to cd to java/src"
+	"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
+		die "unable to pass tests"
 }
 
 src_install() {
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 723cf3ec074d..07a320078b7a 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,5 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-EBUILD neon-0.30.2.ebuild 3400 BLAKE2B 9a0ea4b958d6d7d4b6d0c097944d69305f14f15fa28a8c89e74580f02da0720a39f28b32b050ae4d6fc73c2de3b3cc9f84daa1aafd7fa7db0519f1cc60544b1c SHA512 703186cdaca00d71b498016bd3ebb152a8a3d5a581237289968ca41db06ac358912e8d45370b9e3d2a9d77550fd58911ed5573897e97adc09c36b1f2dc82d695
+DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce3b5eca41ff1d76a47fd863139b8bf3e102c5e4e8d22d5cffcebc64cee9b8f746f8d6669f0cbccf124fed9cc SHA512 62c55e16609d657ac56bb4a2fd32a10ffa72d5694aa1369be533491a6683034ed42843d5f19ed06cf8c1b7b8ba11b74f9839cdfeef4afc3b2d7b11372ed85cd2
+EBUILD neon-0.30.2.ebuild 3397 BLAKE2B 42a0b46c7daad4186abdd2e58546e563d62b7d585f9a2d67fcc8fa78341ef5305034cbf5a7dd0d2b189fe01d5fde416d8951875a02781ba6f7faef7e17ebb34b SHA512 1aa07f7cca4b68ac00f535546843905bd6b0b1ab919f97bbc8de89e66b01246ee9965616b979c7855f17843c05b93cb5881387caf7d73471b1c92a0d6bbb5a5c
+EBUILD neon-0.31.0.ebuild 3406 BLAKE2B 89a40fca0d41610c0a4cc7a982aa00a4e694eefd74a865cde7267a437f0c982046fa6bb97e16701bcff457fee65989ba2531e0654ca6be6fc2504d872fef99b4 SHA512 ee8c451b6c87dd6e7d6c912a081595130e9f01bed672013b964967264504c119d3c18c5184b87b80a0cddd78b79f5881bdb7fc67a7d9c425ad351c91d029dc0a
 MISC metadata.xml 1341 BLAKE2B c2bec964f34a0d9be01935bd3d78d3e4afcc0101f9d31eefa44106c13d3e8c1f91b227b5f15449d71785a889dfe801768c8b2aee361b919aede85e0d41602a17 SHA512 9b40394e7a103b87d61c0ac004dbb7294bc977ccb69d2669f186ceb1980fca2e2def5ac097ae2364c4e2c762e5170d06a5b281bbd870ebe00559cb5cb17d87f8
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index f1b704559897..6ff38ebbff6f 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
new file mode 100644
index 000000000000..0be8adfc1aef
--- /dev/null
+++ b/net-libs/neon/neon-0.31.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2001-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="http://webdav.org/neon/"
+SRC_URI="http://webdav.org/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
+RESTRICT="test"
+
+RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
+	nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+		)
+		!gnutls? (
+			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/neon-config
+)
+
+src_prepare() {
+	# Use CHOST-prefixed version of xml2-config for cross-compilation.
+	sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
+
+	# Fix compatibility with OpenSSL >=1.1.
+	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
+
+	if has_version "<dev-libs/libressl-3.0.0"; then
+		# Support LibreSSL.
+		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
+		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"
+		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"
+	fi
+
+	eapply_user
+
+	AT_M4DIR="macros" eautoreconf
+
+	elibtoolize
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if has_version sys-libs/glibc; then
+		einfo "Enabling SSL library thread-safety using POSIX threads..."
+		myconf+=(--enable-threadsafe-ssl=posix)
+	fi
+
+	if use expat; then
+		myconf+=(--with-expat)
+	else
+		myconf+=(--with-libxml2)
+	fi
+
+	if use ssl; then
+		if use gnutls; then
+			myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+		else
+			myconf+=(--with-ssl=openssl)
+		fi
+	fi
+
+	econf \
+		--enable-shared \
+		$(use_with kerberos gssapi) \
+		$(use_with libproxy) \
+		$(use_enable nls) \
+		$(use_with pkcs11 pakchois) \
+		$(use_enable static-libs static) \
+		$(use_with zlib) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
+
+	if multilib_is_native_abi && use doc; then
+		(
+			docinto html
+			dodoc -r doc/html/*
+		)
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -type f -delete || die
+
+	dodoc AUTHORS BUGS NEWS README.md THANKS TODO
+}
diff --git a/net-libs/nfqueue-bindings/Manifest b/net-libs/nfqueue-bindings/Manifest
deleted file mode 100644
index 0c63694e99a9..000000000000
--- a/net-libs/nfqueue-bindings/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST nfqueue-bindings-0.5.tar.gz 22385 BLAKE2B dd14df558dcc3f811f7f649f0e4ef305025f863d850deceae0dba308974865150265899d3cee43d2a279d6c6d6237dd4df6b01b72c39b6a96819d25fa4413dbe SHA512 c88ef6997b8e4b3ae2c2eb6c1002b74f39979c73b4dc3a4da428aa4eeb6eedeeaff1cbc27c0740e8b29fb8b6a6f98af326be0b4fbc6ed3e432a9884febb3f7a6
-DIST nfqueue-bindings-0.6.tar.gz 22425 BLAKE2B e338268a41e29cbab9a5dc2e891caa78a75d7849439fd9afc8eb105c965e8d201d854f95460d337dc60249ee2c90d88582075a14bc321bf5b952e5a8b648ed0e SHA512 6ee31b01377c0e4b6aa2d2f2e14b34d4d432f04d0e813f90a9d7e52ea9c8483044f7a36b48220887d658c80ca07bfefc88f8aa92309cff30619ec8fb9f52ab43
-EBUILD nfqueue-bindings-0.5.ebuild 2021 BLAKE2B fe6ecd4d9a92f1e3a69b812240701156db89f41d3796bd9a5fc8d2a69d276d7d00d3c10dbe2d64d7b09fc7921952ae0431f032045fe1d09d59cd63d841842878 SHA512 c683a51c9151adbba9a8d482b6a9915dee3773032a747de5b8e8cd242e9f1e3f039427e10d2d04d878f24207da0bd86c3756ca7966dfa0a037022031f5790809
-EBUILD nfqueue-bindings-0.6-r1.ebuild 1997 BLAKE2B f302f0ffffaf1f03aa7d487037a6b5c03647b73b9b85492e0b803046c90017dda12289a7a9877f957e478acfd86ab344132db4b91165b709a66796b59ba64923 SHA512 e9ec990f1274bf78715a22e603d0f31e1fb91cd98f7e7aacb331cd94db833211c08475cf6a87dd03074c3fd353804924ece20e9dcc64bd7df12aea671e06c7a6
-MISC metadata.xml 389 BLAKE2B 7d33c22b26e297b9cf696712e893a908f0dc1e6db264d9dfe39eaed7e5fea809c1e0d5bf5661a50783192c75cd414f92e3450da533aa9087f8e94fa016bd891a SHA512 93f27dce7f495f0e0bb277938e5133cc8a2ca33fe8d6b822da48dede56b94dfb35c471a77679cee6e8cd08dbca41f7459440b21ca1c6a1f02368ad5bd8c91d96
diff --git a/net-libs/nfqueue-bindings/metadata.xml b/net-libs/nfqueue-bindings/metadata.xml
deleted file mode 100644
index 96c116c350b6..000000000000
--- a/net-libs/nfqueue-bindings/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">chifflier/nfqueue-bindings</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
deleted file mode 100644
index 97d6ee2d4ac5..000000000000
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils perl-module linux-info python-single-r1
-
-DESCRIPTION="High-level language bindings for libnetfilter_queue"
-HOMEPAGE="https://github.com/chifflier/nfqueue-bindings"
-SRC_URI="https://github.com/chifflier/nfqueue-bindings/archive/nfqueue-bindings-0.5.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="perl python examples"
-REQUIRED_USE="|| ( perl python ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/dpkt[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/perl )
-	net-libs/libnetfilter_queue
-	dev-lang/swig"
-
-S=${WORKDIR}/${PN}-${P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	# At least one of Python or Perl must be selected
-	use python || useq perl || die "At least one supported language must be selected."
-	# Check kernel configuration for NFQUEUE
-	if linux_config_exists; then
-		ebegin "Checking NETFILTER_NETLINK_QUEUE support"
-		linux_chkconfig_present NETFILTER_NETLINK_QUEUE
-		eend $? || \
-			eerror 'Netfilter NFQUEUE over NFNETLINK interface support not found!'
-		ebegin "Checking NETFILTER_XT_TARGET_NFQUEUE support"
-		linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE
-		eend $? || \
-			eerror '"NFQUEUE" target Support not found!'
-	fi
-}
-
-src_prepare() {
-	if use perl; then
-		# Fix Perl destination directory
-		perl_set_version
-		sed -i "s|\${LIB_INSTALL_DIR}/perl\${PERL_VERSION}/|${VENDOR_ARCH}|" perl/CMakeLists.txt || die
-	else
-		sed -i 's|ADD_SUBDIRECTORY(perl)||' CMakeLists.txt || die
-	fi
-
-	if use python; then
-		sed -i "s|\${LIB_INSTALL_DIR}/python\${PYTHON_VERSION}/dist-packages/|$(python_get_sitedir)|" python/CMakeLists.txt || die
-	else
-		sed -i 's|ADD_SUBDIRECTORY(python)||' CMakeLists.txt || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install PREFIX=/usr
-	docinto examples
-	use examples && dodoc examples/*
-}
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6-r1.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6-r1.ebuild
deleted file mode 100644
index 56b6ed038b47..000000000000
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils perl-module linux-info python-single-r1
-
-DESCRIPTION="High-level language bindings for libnetfilter_queue"
-HOMEPAGE="https://github.com/chifflier/nfqueue-bindings"
-SRC_URI="https://github.com/chifflier/nfqueue-bindings/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="perl python examples"
-REQUIRED_USE="|| ( perl python ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/dpkt[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/perl )
-	net-libs/libnetfilter_queue
-	dev-lang/swig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	# At least one of Python or Perl must be selected
-	use python || useq perl || die "At least one supported language must be selected."
-	# Check kernel configuration for NFQUEUE
-	if linux_config_exists; then
-		ebegin "Checking NETFILTER_NETLINK_QUEUE support"
-		linux_chkconfig_present NETFILTER_NETLINK_QUEUE
-		eend $? || \
-			eerror 'Netfilter NFQUEUE over NFNETLINK interface support not found!'
-		ebegin "Checking NETFILTER_XT_TARGET_NFQUEUE support"
-		linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE
-		eend $? || \
-			eerror '"NFQUEUE" target Support not found!'
-	fi
-}
-
-src_prepare() {
-	if use perl; then
-		# Fix Perl destination directory
-		perl_set_version
-		sed -i "s|\${LIB_INSTALL_DIR}/perl\${PERL_VERSION}/|${VENDOR_ARCH}|" perl/CMakeLists.txt || die
-	else
-		sed -i 's|ADD_SUBDIRECTORY(perl)||' CMakeLists.txt || die
-	fi
-
-	if use python; then
-		sed -i "s|\${LIB_INSTALL_DIR}/python\${PYTHON_VERSION}/dist-packages/|$(python_get_sitedir)|" python/CMakeLists.txt || die
-	else
-		sed -i 's|ADD_SUBDIRECTORY(python)||' CMakeLists.txt || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install PREFIX=/usr
-	docinto examples
-	use examples && dodoc examples/*
-}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index dfabee1d906c..4f1cf1d7010f 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,4 @@
-DIST nghttp2-1.39.2.tar.xz 1635428 BLAKE2B 4569774c33f17d51ac889c385697fcead82106db421399ceb22ad2aafabe64a576445d9272adcf37e2fec47cdd6ac1dc6423efd49012ca7be0aa2087609a0397 SHA512 d8c971543e3e87736dfafebca55e9ecd0644e304c9731edaccba34170205824476595861a439077289b438ad489dd6008dedf2c6b2c111920300329be1b1bf34
 DIST nghttp2-1.40.0.tar.xz 1637004 BLAKE2B 7735ba06cd0655450a6379ea33cc79e557f73b5b4b2ba746564a53e6c305aa656b62da7c3b00dbb70472dffc471271f73af0bcbfadab99406d217d1989ad052a SHA512 3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce
-EBUILD nghttp2-1.39.2.ebuild 1972 BLAKE2B 52fa645e3ca862399b64f91c4a1d3b2729999f0b8a99cb9ea6161c372b004ca1a506556e75cf2c0b92829c0ce7b9a367452589dbe92ade877cfa5c54b717a742 SHA512 41169966fb3d2b4e03efffd0475e457846f1998eef6f246748eb91bad61a89b441d4f4f26ba0658df96f308f7eddc2c1f803af68eaa97c281fe0eec3d5fa0935
-EBUILD nghttp2-1.40.0.ebuild 1982 BLAKE2B a026ef4243c2ca3d79e2d3e43a6e45e3b45ea8ea21d599ddf5d832f03a31cd6a8446493089fabfc3be4576d8dcb53074f76deddceb25b4edc22bc5ebc358c014 SHA512 f13ffcceb60aaf9a1ec0b529a85659d4ed21d5b04eda9be9277ef6f3c4020dca6919c64a162a1750fa5a658086dcbd2b07052dadfa60c8b61f8b83cfb9f9b389
-EBUILD nghttp2-9999.ebuild 1982 BLAKE2B a026ef4243c2ca3d79e2d3e43a6e45e3b45ea8ea21d599ddf5d832f03a31cd6a8446493089fabfc3be4576d8dcb53074f76deddceb25b4edc22bc5ebc358c014 SHA512 f13ffcceb60aaf9a1ec0b529a85659d4ed21d5b04eda9be9277ef6f3c4020dca6919c64a162a1750fa5a658086dcbd2b07052dadfa60c8b61f8b83cfb9f9b389
+EBUILD nghttp2-1.40.0.ebuild 1969 BLAKE2B 559beb9693a6fb4df96d19a57fae0884776a53673c8721b8502a72f0854133167ce42f136fdf3ad0a6366f3996f17b8b168d9f44f43d4584f6400a4c9d975e27 SHA512 6caec7f67d01715604b67a1ca1bf668490ae28e0c4b8d5d8a4606e8a92b212288e63279b04ee7fe49e44752e63a8f2965a62319f4511df505c9804b0595b501f
+EBUILD nghttp2-9999.ebuild 1978 BLAKE2B 3681270a1343a533630adecc2b1edb7b32cef71368da48df558e5587d3ac85364a5e556409a920b9a0c695667b0e3bac9da1410ad1319e69d832d8a21a3fd13c SHA512 99ca054a9bf82567ce3620831b7eb42e6283545c62f8c333a5c876962fbf6f1a5b7b4acc1d9decf9307d2a6bcc25ddaaeee83b5c3f25e51a256ee3a4a2df3eed
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.39.2.ebuild b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
deleted file mode 100644
index 3f4657a99a2f..000000000000
--- a/net-libs/nghttp2/nghttp2-1.39.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.40.0.ebuild b/net-libs/nghttp2/nghttp2-1.40.0.ebuild
index 4600d9387e98..c0d775bb37c8 100644
--- a/net-libs/nghttp2/nghttp2-1.40.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # 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 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 4600d9387e98..a740e69ea79b 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # 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 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 8a7e2bed79df..52a0178eafd5 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,21 +2,21 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3
 AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204
 AUX nodejs-13.8.0-paxmarking.patch 4213 BLAKE2B 4235139400e33fbc0e9f9f965953ed1603283d86cea879b5bb67c60686b45ee26237970a13466d2f5392ee463660b318e53061701f916c4f2f2cc15756f21444 SHA512 c738c9ab15b0ce9b2356827a63d2d35eb1ddf9441b4fc7e9e3e07ed30bf7a6eec680cb3901ab8de6ca9a9377e6a04a520b6a88a08ff5cb2673ed50ae737e066d
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v10.18.0.tar.xz 21913328 BLAKE2B 84b0b5157671dcc3e96bb2cfd11e085251fd2942c03b27491f712f5603797bab7503d8f7c0eb45ca8e348b20a0555c1767d4d1964fff474c8590a47eb01523a5 SHA512 8fc9062e150af6f054f1ebebbdf67151b16f14bcca9cbb35338a4c7fcd7fa1c3f05c4a7ace12d4153180cec0007a195cbc94942c4d04c3895384dc18951d2c1c
 DIST node-v10.19.0.tar.xz 21906168 BLAKE2B 395504ef3befa47d8b967114e019e6a76c799871e7eb21e2c6c0453655ffa07f17f42209daddeb5417342cfbad71ba1a35ae15a2d210b692bc60be270c2fc415 SHA512 512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee
-DIST node-v12.14.0.tar.xz 23244684 BLAKE2B 0e25cbba5e256b139efd45908236f008834afdf01f57a8e84c7e55ba950e56b786cd52eba9a02986eb0e1d38cbf6df38e1cd719d7dcd8085e8c71767adf8155e SHA512 12e887709a54be911c5a81ab7b7be995247b47ebbd2954ca942f9ed8a784ae1a8e4bdb2613e5bb671196f9101d8861cd29e10650a3f0c414db4d096df94b309b
-DIST node-v12.16.0.tar.xz 23487084 BLAKE2B 067668ca5af6c35082c3075b4baca256ce656ccf0ac68782a4885bbd2e0ef13108bd72b8b9831ef32f075e4be99fc52b1ce35920cd0db6f10a562a84912cdbd0 SHA512 e0aa45498ffd670052853bae1edfda1a34b291c48232f8a0a58ac329215fb3d0250211ec6dc06fa50fc654e7080028eaf3cc00a3722971a5969054c4cf277f4e
+DIST node-v10.20.0.tar.xz 21945800 BLAKE2B af767add881976a648129a999c81bea7e74c2a59ce951cc3cd448e7576782fe8219d67427187a5e5c2bdf684aaddf918bf712ac11f8153cbd511b9d9b7ed3182 SHA512 0472b0d595f8c1dc941612161215e60879dedfe22659878a1c68146c12d92945245135ca951eb84f6c3d16e9a01d084b027903451f7754a7f2028b024c388ebd
 DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
-DIST node-v13.8.0.tar.xz 32745596 BLAKE2B 14bf82e8cecde1a4125c7c00c4c9e613c1dbc5bb0241b20f4d30cb8d172612d5a8c362ac786ae516baf9553d5a9c3053414b269fb040cebb664f09096a57985c SHA512 b50d79f029bc04caf193f137b7b3d03f1e1ec9252712015cab2efdeef92bc3176cf7eb36e835cda6221950792e516f9c1894cd2c480e082106e07a11aa1d0761
-DIST node-v13.9.0.tar.xz 32778780 BLAKE2B fb5a0ff82cc1fd255bcc96b50232d6a9e2e3cdab9f5080c6d112b0a5b2dbb952a70d648ccda1b242a7c9e5742683bd320924047bccd1402978d8bbcfa8d1bb68 SHA512 f52184b694bf0dc7755c1c0f05eac400d7e9971e66165a43c7784dfeb935e63de176d3ee937fb09ccb1fc9ac78aec30b6b17e8a477f1b3f10291b1b6d595207c
+DIST node-v12.16.2.tar.xz 23654020 BLAKE2B aa4bb764a8731e32ce07d03d96d573632bbf9af79b127c2acec48fcf335c01ea0ea99532670a46befac42e2e1ce5a4dbd2e4cf0d068bac05749d87af59bb80fa SHA512 81688468bc6e20d83f7f58f0c15f9291a801eb2acc8ba7279e65d81f3eb4ea95e3b6cee0d09738c0d0fa35226ae3d52f2bad5da63a20a3edc9129197d42d000d
+DIST node-v13.10.1.tar.xz 32812128 BLAKE2B 2dc0e1de269a898f57e9fb91d5b3161d43baa89c8617faffa9998b3244354619a5b78e39500bf02b90fbc2587b8477fbd86850141ec7665690040d6920c50fef SHA512 30b7b58c87021be3e0b909bae476c6191eb72722ed00e51716d7eb0793aeb29c05b088c195ffd69a40dd42423ceba20350f6379c11d276eb3398abfc4cdf340c
+DIST node-v13.11.0.tar.xz 32812056 BLAKE2B 0c3975721916f4594515b37b093fb0640785212b455c3687d63a89bb8c6930ce59c74f8ccedab3579d88bedabb881264725d93e43a384b851897bbb94a5a52ac SHA512 cfe8b46d9cf5c7c10f7099bcf1d3a3ec8ac5d70038c6b33009d0815d68e8c1d2a28cd80a16ef1473eba3927360903bcf6a74e8d5f71f09b5ff7919d908545211
+DIST node-v13.12.0.tar.xz 32841080 BLAKE2B 64687e8d5b768f4571b53542bcf5d023953069eba5fdfb746a8dd29e4542141a9b57fc0524429cde9a3c2e579dd47128e06d46d1f3ae1a35326f8b69a750118f SHA512 3166da61a3d84fa9d4cbfc473df7441a6f7e648ad92b095cc357c2440214ddde117fb220270db8e0736eea3b715742f0d73666bba25724770e7e8f6071495d57
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
-EBUILD nodejs-10.18.0.ebuild 6282 BLAKE2B 672b04c2a80abf23317a1e94c29c66f462167d805fc86afb0a29aaae49afe50f7a7c6e6141ca2449fc935a42fb671925e7a0aa9910a37b2ce61b7938b266bfac SHA512 feacefcf26854f4ece1abcb5070dbaf7c6a33be097e6dc45ee599b575c884b96415c1158f207e7dff948738a96b09ee096f1a100dacadcbc16db3f28165241f2
-EBUILD nodejs-10.19.0.ebuild 6361 BLAKE2B 33e4a0e7936b81216945e5bce90f8d85858489800f140ce5203b79e217515be71e0c89b4cb7d64119fc416eb0aba5f516a70a197ed8e14acb76b5c470d3b4a11 SHA512 9420657f220cd01ad9efa2926a1d081d3ce35580fd15d3f7e37bf0a5d1e77039b97e51db107a3eb63d4b494bd1e62067e91fec962f525133211f4731fc07860c
-EBUILD nodejs-12.14.0.ebuild 6116 BLAKE2B def68b17c74f2dca48588c0e45bd7c52f33ed8fbc04dd65189a044333e6188f64a286e563b7e2d6c9736f3f8e37252a96883c07d8e860bd0e41e82c97f464b3c SHA512 4fb47c678f94f82a4fde66b944cd56a17bcb6fe32d112a852b28739ec43d529aab0b2e8fb9e21a011709f7e42d62f140d900cfee8c39e7b7a3d08b9004a1434d
-EBUILD nodejs-12.16.0.ebuild 6128 BLAKE2B 327de2b84bccd5ab4096554e7bf395db5d876a06a0d96b790e66b889fe775d942bcd87ec6253c3a3dfabe844249038d02785f0df6cd6f44cef2ef35c1681a43b SHA512 204d876ef7ef3f8a5b8573d3b2731651a72edc3e8e525ddb9603e9c3089d86e8fcf0c2edc701473aef488f412c2dc735f21d5549df96aa06c71f578e8ef01f2e
-EBUILD nodejs-12.16.1.ebuild 6203 BLAKE2B 6812d02a4be07368513881c86ada628038ed9f8a500c31d2402e68f98a10565ce9357fa223b6cc2be7d52fca3e79faed8e9ed78a62ac0e70f9b0860d9d50b528 SHA512 e11a467840822bc9cb6045f8af166088998a45b7834bda6f444fac64aaf44168fc2012138768ddc4f502098df2023143140834381d381fb64fac6c423573cdc1
-EBUILD nodejs-13.8.0.ebuild 6149 BLAKE2B 9add0c1858c32bf245bd3d687b98af5d11aab6fa09cb8627a4352bc91244c498e19ee137f0e6c5b1a8f16423cd447bdffb59bf19ec047ed29973c837d06a8295 SHA512 cb79f90013b8bcc42e78aeb85038f3f438452ef886b5a3fd1722ecf9d241fa9c94453e1f9e6c8a82ac324615fd9a4d935e8e36d2d6b24fed2d4edb62488937d5
-EBUILD nodejs-13.9.0.ebuild 6224 BLAKE2B 40bc5dfe6a7eda8e41f2c962498649ac26fc458ac81a33b876b14e28d3b250494fb0cc990b4a4327e22f339f2501158dd7095a1c62e8922cd280c55670f375fe SHA512 eb4f5617092802663a269b2b4adb0dbca6c67cdfc771149aab29d2aad6f290735bab403afa8944e925444df60ad135265fb37076bafd96cc0cf4a05db4aa7f62
+EBUILD nodejs-10.19.0.ebuild 6357 BLAKE2B b44a9661af496c8ba80b1ee680b2c511b3b6c2f7702d23710ff2876312e1f20016e579a36531083699a9881001e65150565c3b1fe6f5875b667aa9b79e87a665 SHA512 b290ea8a99c36e16fc0dcae001a3466a094c7ab6953c04f04a86ee0cef14b8ba861e86ad44e0a2b882636b16e95de6975afe40bb5d5e090791322bad6c276b8c
+EBUILD nodejs-10.20.0.ebuild 6361 BLAKE2B 347a4d538848e42a071ecab801743002b1a2c979dfbf67be153024541b53ab7ad9814d25bdeb31ee13a659a24470c6a73fefcecd7b1175836506bb25681ff4cf SHA512 6858af544698d7b343bc41b0c6a57956cdff1602d0018b00662d0ceb4b619e821fd14dcef67573b96c680e1584714745e007088dbeda9f5f410937892260186e
+EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c
+EBUILD nodejs-12.16.2.ebuild 6203 BLAKE2B 013443da57ae66e7a58247e7ab3599d72fbfcb1a62f9bf6d06b4412a5bae1372eefd7e8cbc68aed2d97b72734c60ce3a38effb34b6961872c946bfa4c5bba4b6 SHA512 9b56e373305402bd499d09b04f748f555f6e1966bbc5c112ddb0e1a372615c89b58850bc802b86f9e0b06942d6707095f156a05b15ad9c01b55c4c23c1301d53
+EBUILD nodejs-13.10.1.ebuild 6224 BLAKE2B 40bc5dfe6a7eda8e41f2c962498649ac26fc458ac81a33b876b14e28d3b250494fb0cc990b4a4327e22f339f2501158dd7095a1c62e8922cd280c55670f375fe SHA512 eb4f5617092802663a269b2b4adb0dbca6c67cdfc771149aab29d2aad6f290735bab403afa8944e925444df60ad135265fb37076bafd96cc0cf4a05db4aa7f62
+EBUILD nodejs-13.11.0.ebuild 6224 BLAKE2B 40bc5dfe6a7eda8e41f2c962498649ac26fc458ac81a33b876b14e28d3b250494fb0cc990b4a4327e22f339f2501158dd7095a1c62e8922cd280c55670f375fe SHA512 eb4f5617092802663a269b2b4adb0dbca6c67cdfc771149aab29d2aad6f290735bab403afa8944e925444df60ad135265fb37076bafd96cc0cf4a05db4aa7f62
+EBUILD nodejs-13.12.0.ebuild 6224 BLAKE2B 255424238dfffc7fbc372c553c2d4999bcb2ecb03ade1d0afd519b9b7bcb81b1029512167271bbd79dc901b4f2c8a19f44c7ed01412071b29063daafd3fd981f SHA512 4e06fe7a67ec3b98cd8f1f4f2be14c38401234f0aab81ff7447b7193f7aa663fc94bec24351c05d517b889d84c2880bd2b0746e1a7374676e70e1b46e9a707be
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
-EBUILD nodejs-99999999.ebuild 6140 BLAKE2B 94dbffe5d736060ca34f8dba48792340e4c80880aa993e01b8b4e5efa5a126596f3a982947f0eba1fd98a3fef5bf73837d67904a64d9449ffea517ebeb1a361a SHA512 7e7318a663fa3e3e37bd75cdc3e75356ec986e352254bf964f70cc8bdea3d7ea381b4c2456044b1eed335aeb3966f527bfdf24aef2fd2d633e6118544c8c08a3
+EBUILD nodejs-99999999.ebuild 6140 BLAKE2B 3aee0007d3eb0fe6705452a9ef8c99437a11466afbe8669cf720d88788057b52d5e023c363bc185de34d3e882204e524429f39e94d644a3eaf76195bbc406b98 SHA512 ab3643572c01ac72fe0fd493b2a1fab6f10dabe9f169ffa4842c491cec0cac4f11fa2aea0ea575b23073628a74e5e902cb100517286df002d67b536358a35f0e
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/nodejs-10.19.0.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild
index 1aedca2b28c8..409bd25dff50 100644
--- a/net-libs/nodejs/nodejs-10.19.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.19.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-10.18.0.ebuild b/net-libs/nodejs/nodejs-10.20.0.ebuild
index 08ff17e9980f..1f645e5535ca 100644
--- a/net-libs/nodejs/nodejs-10.18.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.20.0.ebuild
@@ -12,21 +12,22 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
+	system-ssl? ( ssl )
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.28.0:=
+	>=dev-libs/libuv-1.34.2:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
+	>=net-libs/http-parser-2.9.3:=
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 DEPEND="
 	${RDEPEND}
@@ -99,7 +100,11 @@ src_configure() {
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl )
+	else
+		myconf+=( --without-ssl )
+	fi
 
 	local myarch=""
 	case ${ABI} in
diff --git a/net-libs/nodejs/nodejs-12.16.1.ebuild b/net-libs/nodejs/nodejs-12.16.1.ebuild
index d0e7e0c5b4cf..29723942409f 100644
--- a/net-libs/nodejs/nodejs-12.16.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.16.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-12.16.0.ebuild b/net-libs/nodejs/nodejs-12.16.2.ebuild
index 3850f958b73f..0be68355a99b 100644
--- a/net-libs/nodejs/nodejs-12.16.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.16.2.ebuild
@@ -15,20 +15,21 @@ SRC_URI="
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
+	system-ssl? ( ssl )
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.34.0:=
+	>=dev-libs/libuv-1.34.2:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.9.3:=
 	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -106,7 +107,11 @@ src_configure() {
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot || myconf+=( --without-node-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+	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
diff --git a/net-libs/nodejs/nodejs-13.9.0.ebuild b/net-libs/nodejs/nodejs-13.10.1.ebuild
index 00513e8978c4..00513e8978c4 100644
--- a/net-libs/nodejs/nodejs-13.9.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.10.1.ebuild
diff --git a/net-libs/nodejs/nodejs-13.8.0.ebuild b/net-libs/nodejs/nodejs-13.11.0.ebuild
index 157d3993d84d..00513e8978c4 100644
--- a/net-libs/nodejs/nodejs-13.8.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.11.0.ebuild
@@ -15,19 +15,20 @@ SRC_URI="
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
+	system-ssl? ( ssl )
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.34.1:=
+	>=dev-libs/libuv-1.34.2:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -104,7 +105,11 @@ src_configure() {
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
 	use snapshot || myconf+=( --without-node-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+	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
diff --git a/net-libs/nodejs/nodejs-12.14.0.ebuild b/net-libs/nodejs/nodejs-13.12.0.ebuild
index 3cd8d0e32cb9..3bd32e160d50 100644
--- a/net-libs/nodejs/nodejs-12.14.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.12.0.ebuild
@@ -14,33 +14,33 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
 	npm? ( ssl )
+	system-ssl? ( ssl )
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.33.1:=
+	>=dev-libs/libuv-1.35.0:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.39.2
+	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	icu? ( >=dev-libs/icu-66.1:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 BDEPEND="
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
 "
 DEPEND="
 	${RDEPEND}
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 RESTRICT="test"
 S="${WORKDIR}/node-v${PV}"
@@ -88,6 +88,9 @@ src_prepare() {
 		BUILDTYPE=Debug
 	fi
 
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
 	default
 }
 
@@ -95,18 +98,18 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
 	)
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
 	use inspector || myconf+=( --without-inspector )
 	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+	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
@@ -130,8 +133,6 @@ src_configure() {
 }
 
 src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
 	emake -C out
 }
 
@@ -195,7 +196,7 @@ src_install() {
 
 src_test() {
 	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 7a8dc689fddd..f2c3b912ddaf 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -22,11 +22,11 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.34.1:=
+	>=dev-libs/libuv-1.35.0:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
+	icu? ( >=dev-libs/icu-66.1:= )
 	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 "
 BDEPEND="
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index c1261c9f7be1..969140a9dddc 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,7 +1,9 @@
 DIST ntirpc-1.7.1.tar.gz 373327 BLAKE2B 55d71932e35b844e382409593b5dead30246d0cbaa27d3d49ad94d09435acb8abb34b945ba90ab7ba9733a955b4184ad839ba202aa82f97eeecbcc502cb88bf0 SHA512 9a98d83db94b4775940584cd08a1105b79263412d44309f91d1e86c609e6d56a482ac239efaaa73ccc1c2f4cabb8b597ccb8931514f33b8b2fd5c2a11b731106
 DIST ntirpc-1.7.4.tar.gz 373897 BLAKE2B 7354c5d6114947c8d66dcbc4fb933ab38237dd70eeb318278a658946fa4ec354bcaf7e90ac210f39f76b6d8e60f865c0c63ecbf7cbd8ee1e8defa0d7622cfb51 SHA512 076d789edc3fdf0ddb75437196b72b1aef78780d579ae4db0bcc116a1a92ac861fc77e1611070f2d3df003bfec7883ab20653a3c2f2255c685aaed8e7c22ce0f
 DIST ntirpc-3.0.tar.gz 386738 BLAKE2B 123c8f31ea532f6a01b4544d4f19d503c6e44ec8f3923f3f053f1ccc2ff5c5dc62da6464373b25a1881f69749a4c62395838be4451f3281ed9e7446eb8380255 SHA512 a7e9fdfcdaa2e85d4631094874bd72dce6c2e93924f6099f6bc20c98a1792839559ffb028b100aa3c5ec0140c10e090b32155439846276f918e9ba017271e14b
+DIST ntirpc-3.2.tar.gz 386961 BLAKE2B 920917b7ec08e2d4147785e1753596f035de684ffd92fb55fdf553bb4e19160e40fb829bd867d5a3a43f36568f731f71c31f135b6fe07fea2a6088f27ee3c6ff SHA512 8e9b5b3e607e28c4033c5986dbbc248d0edfeda6138b3ff51cc0760dccfb1cf4a14ff6bbec4330421b1175c3b1b04a34a43f314c97be2758fe0331b775f86021
 EBUILD ntirpc-1.7.1.ebuild 768 BLAKE2B 991c49a2c88cb8459f947ec4de91d46cd7935ca5d868a362acffc42ac135f921f895a653a9bb9701e4d091b72d875ea4bb78c9480ce8096a8822efd59cfe0fe2 SHA512 258f6102ef485cfbd40d03f12c342316904d39d7e82f4c9b8e1d44ce90980e16029a00485a516ed3b102d7bba0544eeb165772458b425930dfe05f288a4628d4
 EBUILD ntirpc-1.7.4.ebuild 766 BLAKE2B 1f0d4c49179f54e224348fb7131a8f91eb11611f3ac79495a69a281017c370f4f0088bf2eb8703de0d93a1e1a1e48c80181fd50297489a1f32e2ec1be7ca81fb SHA512 8d704f4ea19eff1dd3b13f9dc8aa33679c9711eba909dc6683992356c29f94cf7b90b6f6db5df0ab84e30cb57de8a9286ea6062ec4bef771119751b507be7459
 EBUILD ntirpc-3.0.ebuild 796 BLAKE2B bdc1af534de852b497f9162e0802ddbfd6168b7e599198db3351a67e5d5fa2cfbe962ebe109007245f5711b6462eb8fd3acd8f752b1d62bfac3b0e8e1eb5e161 SHA512 ff8c7111faad2e0d582b3f3dfcea4feb26b4a5e9dcbdb561ce55e678f9b2436e8b45c7dd7f466df18e023aae233a85f11edd2335e1ad2f48f88bd71cee68524d
+EBUILD ntirpc-3.2.ebuild 796 BLAKE2B 436b858e3c2226a248f4865238387bc4bf400d69e696b35ef5ac297d97af91d95551a4658af768788c7411f774a8f77ec1485df03d1629c549339c44709a8a04 SHA512 f5096de5126ab2b269b4a7680d75537131992b23215daef0f103ee908b1dc2e587405788a3dc1351dea3fcf918b988339fec61556d272678d1a654efac6c99c3
 MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c
diff --git a/net-libs/ntirpc/ntirpc-3.2.ebuild b/net-libs/ntirpc/ntirpc-3.2.ebuild
new file mode 100644
index 000000000000..590f6fe9b48d
--- /dev/null
+++ b/net-libs/ntirpc/ntirpc-3.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
+HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
+SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gssapi rdma"
+
+# Since the GSS option only controls some extra files to be enabled,
+# there's nothing to list in the depend string for it.
+RDEPEND="
+	app-crypt/mit-krb5
+	dev-libs/userspace-rcu
+	net-libs/libnsl
+	rdma? ( sys-fabric/librdmacm )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUSE_GSS="$(usex gssapi)"
+		-DUSE_RPC_RDMA="$(usex rdma)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index ebda1722f610..319252831ea4 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 1863 BLAKE2B f5206d9132d4b0cc4da49248ec6cbcc8ea4964b12e6bab913242182700727e79ad98c789a534b9487751e29e6a76b00f41ec05182d0741d2a4ba054a126df61c SHA512 a08e83fe326432152fd2cb235b0eea09ac22a0deaa212f423bbef92c26d08e9f9e43fbe0736019cc0ac6ffa1daaade3ba080f9cb8db5d80176775ff8f4eefd22
+EBUILD ortp-0.23.0-r1.ebuild 1864 BLAKE2B ebffc293bf6082e5316dae660bdf1cc22a8289b91fbb23d9e526090c3b9875bb3c43d20faa47c54800dcc8e940d3ee57781707d726a082fba5dbbc416f7fed67 SHA512 742d49471af9c86974c33da62ef43e701e8fda9f06ed5bdbcbeff2bd52176a191e173d2cdcce408da2b4a97d35f50d4cb9e566a0c1836b7c91f087959d6a6357
 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 df0bac3e1135..dbff764b319b 100644
--- a/net-libs/ortp/ortp-0.23.0-r1.ebuild
+++ b/net-libs/ortp/ortp-0.23.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/9"
-KEYWORDS="~alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples ipv6 libressl minimal ntp-timestamp ssl srtp"
 
 RDEPEND="
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 6aa2308b561f..ba6ca596a747 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -7,6 +7,6 @@ DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
 EBUILD pjproject-2.7.1.ebuild 2614 BLAKE2B 10ee58a83d0ebce1fe52bfe395bd319e08a4128364f7fbf889d0d089daef222859992b12786bf0796d6bf77f599a9dcc9dc9800253d4e781069a9587efe07259 SHA512 2bd916ffdc6449e3fc62fd4aa1d3dee7634a97351b369e896384b46316e089185121c39efb8fa30143745c6c91ccd001c797cd0f13020481769dc3bf0e196e8f
-EBUILD pjproject-2.7.2-r1.ebuild 2752 BLAKE2B eda52740056669b8a86a9917031672cf359af5e45e3965f522e6b2551577068249de51b877abf58a569edffe1e847c4adf6b0515fdac0d90319d364ed145581d SHA512 d20c175fcd85526ae3fbccbef8bd958d9f22bbe476412d45a7cecc31a7b62ecc32e2ac570d24930c083ef0e3c3b0c8593b7dadfc28fb72d8ea56e80a7b28777f
+EBUILD pjproject-2.7.2-r1.ebuild 2751 BLAKE2B 63fde0f71193c7a94b7707767b820a450bfcef5b6c75ea17c642c7be63e116382fd553e7f1bed20e62385eeadecf9c4671e657e6c169dbd877047cf41749b000 SHA512 2d83d25ea6b0bc39f1a67c1599fe95c31bd36aa7e4b092434027a65b72bcc34023645ed1206823163785fe7f651869e997e4dbddb2f69e1a132883a546847078
 EBUILD pjproject-2.9-r1.ebuild 3027 BLAKE2B 07645f7555e389c0cbb749f790363cc00dbe649e4a64e6d1ae86d03e4f6249971f0326414f4673cf06917eb68d4dea0b5e7640f6343bd025ab0346b44320b498 SHA512 a8ff33d4ac36bca70ef47d6ba76330c29e033c901bbb40c868bcd1bf002c81e7376dd711b8ce93b7c7d68a9a49ce90b50d23a590da8e3c37a97b04fc4bc16004
 MISC metadata.xml 1275 BLAKE2B 6d833264ab353a9393a577f50a5241948bffe17ecfa551aebd4736fef54e7ef316c481faee27ddde3a5aab327a22bd38520e781aaeefc5a2c14cb2fd08dcf608 SHA512 563deb2cb83e6a638d9cc99b912c4ca907acd0ea133168a33d452f29d856b27ee38ee73bf27ed6147b6decfb6b4a74ef1ea40b1742e201408916fdeca9400771
diff --git a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
index 3b320d329fc8..75aeb487eb5b 100644
--- a/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="https://www.pjsip.org/"
 SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 8ae98e14ab82..f68208b120c3 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -5,6 +5,7 @@ DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
 DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
 DIST backtrace-0.3.38.crate 68133 BLAKE2B 75794901cf8d322cb642672eaab9403b00f802a917f04505d8a4df1466d340f92f1824cd0cd501d5f6017ff98cf17e4ad61ce32fce07b061fbcdaecce5ac0c55 SHA512 a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
@@ -12,30 +13,41 @@ DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef
 DIST bitflags-1.2.0.crate 16814 BLAKE2B 5b7aee7388b01cebf96651e979025e9bcac85f7324982055d7d805361f91da2b9489a07f00350133c8a58eaf70c5397e3561c15b3f2544aa8202bfdb852c145b SHA512 bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST boringssl-f18bd55240b229a65df48e7905da98fff18cbf59.tar.gz 17909647 BLAKE2B c14a9559eab74c400c412fbf62cc3642eff3811e7d93b57bcb286fbe15689ab799c524d2f843e027581fda04919c8fd52defd073da2acd3326eade166423eec6 SHA512 83cd2fb9cec52f97e046c5773741359f4bcea9dad38c346123348187af725011a5ade06a0e3c28609660b00ad1003d3e395b03af6cdeced8a850cd9bebc27e59
+DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST bumpalo-2.6.0.crate 124915 BLAKE2B 567e4060019477006f3ca468cb0e087d90626e37d2cb13cecd6938162f78504c8ea9dfb6c571adf573d631c4a60055e5784ee27f2cbf22c769428899d774f107 SHA512 0a2f9c9dfd9ecfdb159228b03dc573d790d0aca777f43452e8e1d638f180dc855b2239779e321fd0b225cf976ac81817d4bb5fc85ac1e45377c863607bef9966
 DIST bumpalo-3.1.2.crate 118677 BLAKE2B 1d956397aa3ef73dc300e15179c270f0e9e5b8b3a8d4dac00bd775236ed024dba6738d6e526bcff9f04edc61d5ec28225bfc2e6383fbf82764bc7de75aa643bd SHA512 c7ca828139a621a0f3404455748486fd7b0dd4e51c1e8584f302ac682f87ebcc46a13ec4edbcbf67568b7d620ab31317835a9dfbeefedc66b729deeef31c1235
+DIST bumpalo-3.2.0.crate 118891 BLAKE2B 9ba8c0366c5d6f0503d780d07b86a4b469e3da186aaf684c3d6b399b081103e3e58fec5d2f74e1e997821460fd8eb9d898037b7cf8dae79793caf14ef2373609 SHA512 705c2ea7cfdf04d7eb9b8810e2fa4ec925ca664a3a5a488cd3405a87f2f7a1840c7ced575827464149a8a538dda515e75a22859403038637d33348ee0dc883ff
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cast-0.2.2.crate 10318 BLAKE2B da2f8327bc3c2d884bcfaad9d4b2a79e009d060501be98cfe344598da66306940134c28f96eac39578ac98cfc26fd754b68707fa17adab233b371a79eda8a54e SHA512 7b0e860a3c6c809799a9fc733bb0303cff819bc2b884cf77e1517aa9824c819c259edda7793be2fa5fa6573de4f07c0ff95f90a03d0d38c5905260e291ff9786
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST cc-1.0.49.crate 49933 BLAKE2B 205a8622f1a85a1fb6816206378a63122d48ee69083932611064e41b22003715a0b3779a2052d015e39028f56599b82e0f56cec0bc77f04458c89c8b6bf83f5b SHA512 f78eaa1b81b8f84bb487889f27564f25630b6a83e89ff74dbd620bfc5080f85d74f6a6f4fc6b09e3a4918dc6998ac2087195850040d5ddcc1a1904976ab001ed
+DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cmake-0.1.42.crate 14266 BLAKE2B eab3de3a5a482f58dcf72809f63109605d71e1376e4ae2695345abad556eab86fc946c080602671b748fc79e6757478b5b4398a9985128d6189d5fa13ba8a89d SHA512 eb91ecb665924e433369bac77060e44950cefe73eb250463b0e0346e58b6545114e39f995f24c8dea2bb663db2b177cb9f1a8646b286906b3060effd6691e4f7
 DIST criterion-0.3.0.crate 87281 BLAKE2B 9c246cc4cb4a9007add5d73058ecbac64f8f9093d2272f21b311be2704ef129bbffe24717de10c4b061e0787febca2aab60b141b2bf94e81d3a45a7eb99a0f14 SHA512 d1110f0699493281013980dbeeccb93553e4147e138bde7ab4a6bffcd522385fb74e8f3f15c2bac32661c56fc720ba808e6483223ca4cae05b2a1da7307de620
+DIST criterion-0.3.1.crate 95450 BLAKE2B d63477b414176eb3b49857b6a6e3f1e30d72e95856756051974bb99289082315bde362dd39254a766480e167707a147b621ae84a887243ece6f865ba784a9210 SHA512 c6beae7350029632206cd201faf3e9aa16fae39e96b9256b702cb4c09b013be88280b2e8b87ec2790c386be8ef6f9e9179482655f3af3ec9e34f8b402fe8bec9
 DIST criterion-plot-0.4.0.crate 17204 BLAKE2B dbde14b2a7e3bcfc41886aade72c88f31835b0739dcc0d745233c4b936693cba3638ac5f60a47355f37f9caab2f6addd86c8ef1881c21899dfd43491b24dbeab SHA512 06e46dd31ebdd83621bab4b108892b366566ca6819db4a7832cb24fe5bb2155ce086ec97f282a6fb5aa1e1103de2c2d8a42a69b71af20cd62f49e51994c21864
+DIST criterion-plot-0.4.1.crate 17185 BLAKE2B 106f956a32ab2a0f274882e2cf5707c9763e16ca9e98d2bda2ac92520a9dbff46ff4748f4b14417ccbc288b48fc527ffb9810c3cbcd50c1744975ed2e998c148 SHA512 910ee12c373b2003be314a495d162eeec2b6c5d54fa80f3cd31f5b5ef4a5c1c32181ff0744dccd522ca2e5e501a88cf4c56b231f8eb9b2f2732707eb82f98c39
 DIST crossbeam-deque-0.7.1.crate 19407 BLAKE2B e2fa467b88ef0d6c7f6656bd87ade1306665bb5b56b1e494ed3a7bc59050ebf847de4c57c5dcc5d63688b60edd3645300cf4b3a2020280dcf0e47f434a9f3221 SHA512 6ea3f138aecb4e84b4f9754fa6abc164b5b558987b15bd34562b70cf93ffd9015d017f62098e578236ad8bc1db652b9bfa624edffd5a99f10c3618c3927d3fe2
 DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
+DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
 DIST crossbeam-epoch-0.7.2.crate 38134 BLAKE2B 1a71b24f507e95c9552a3d5906bdfa77add4723144e1f5275dad65a5de7cd82305eb2c4ad0d99b3f08a06ce050dbcfefff08790a4a65744f4d578c7106abc671 SHA512 672817b282692fa8dfd0e366853d72a2c14c43d54b8059a7b4761315bff20c342629ec1e64ca0e80e1e401cbd625b259d182546779291899334f1d9db56f1fc8
 DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
+DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4
 DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
 DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e9788fa546ac75ef449b298ff55cb20871cc00ff075814ee3c20924ce890fdf455c607313b9fd07252b576777bfc1713 SHA512 9a6cf2cda3a76f3efe30290413bf3cd539406039d29f42e06326822fcd32aed3dbdfcfddccdc5871b824951653836a8943e0d771c261fcf7878a8526927b5ca7
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
 DIST csv-1.1.2.crate 890778 BLAKE2B ac04af5edff7054c557f50c5fca153286fe6f9045cf12733bebbd377a7dea22e8a916eebfd72e17e0b8a4ce1446488572bcceffd28259635796e587c73cdcde5 SHA512 51c3309b3e4ea6b9c20881fd871dd26fbabc579dd06d714e979357a6073622781434a9f89b9cafc04f8528c9a058c3464516329f7db54b8b0f1c469b50e4cbb4
+DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713
+DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
 DIST docopt-1.1.0.crate 39021 BLAKE2B 54a0543879a68cafd91eb61f836426ed5c8b9e02e1fff6dbb9747c44bdf03a45237087e6f094687ccfac4b82aef07c4f8e35acaf994c4afec57f227bd891ccbe SHA512 f5dd97b4dbc9109811a83dba45bb09018f394adf3f5389cc62f7d42749c90dc337b7f5efdee569150a70194f5bda777a22107123ec7341a38c4f9923bb6f9f81
 DIST either-1.5.2.crate 12124 BLAKE2B 514fca1a11697b952d83b2058bfa21b9dac963921d35e055ddd5b132d8035a652b5c76d356a5c221f8eabb8e420ed727a84bf8077a9d4d4534faabee45f468be SHA512 88b4ad9854281d6748177b8e18a1cb1a9ac8948d2de8ebadbad94e72bf8b825361b142d890b6264106069af48328bb9844afd248f64b5469d2d2cb81d0ce5187
@@ -49,6 +61,7 @@ DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc48
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST hermit-abi-0.1.6.crate 6907 BLAKE2B a2c11ec832ea0110421f6be2fa0a5591e5908a74c68c5079f034908c216d6776ef0f4363b809699e58dafd98deb9ff19ee8b06b704d3159448d1b4376fc2537e SHA512 a557402a7529387832ba4014ee1a626d849eb64f873f69eaf53506362340c8f24c7456a8a04653f4ead9043768d06042aeca2aa8d95898dee37d367674854741
+DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
@@ -56,16 +69,21 @@ DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2
 DIST itertools-0.8.0.crate 78917 BLAKE2B 4b519303380c421b5ec9af7b5c97575a39899ed77b0ff462d5c5db65a70f9c1f56959254aa7d20db3fc4f8af033340a96fbcebb189f4d92a2e09f887c736a898 SHA512 ce1dd1f52f6792a6f5303e15f74063d50c11b75312cb807eeddaae7811686347c390426956cbe87b827b970b14b6e4d57fb4ac0f288632766218ff8661feb610
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST js-sys-0.3.27.crate 59423 BLAKE2B 19256c0ce8b33a134048d2ef68a2f87a183201ce44f95ddef57405cd5f0fb1e9c82af2b8e97d10f5284017dd8a3eb935e9f04e5bf9cb2e09dc62d4d93fcb24e6 SHA512 1bff1b24ab99243e5d789ad9f729b3157241b159b5520529a3a8bd152c60c4df416afe9ac0c054933406f69cf48f49da4c51d7c90e05e915c1e19af47735835c
 DIST js-sys-0.3.28.crate 60457 BLAKE2B 9dc982e95c8342597b94afd7ed2f0b41468634c43301f66b5c19be045dc8bce4b7cb4ee0cf46784ab76de8d3501ed40c58426fff8a7f2930600e8a8ddaa828ad SHA512 15036d58b01e4f616079d9155c2e8da387900a9f11dcda767415e85a65955f1106ff20b586f47e607acd2b915067f93fac320140aad789ca90c0792296914199
 DIST js-sys-0.3.35.crate 62149 BLAKE2B e0cdc501cbeef53d12b7ed25a976e4c0f7fa5d20b8741203994242c7e19a7db3ccce97e02c22dc537192dcf8926e16749e93703a8308d38193346ac50a004176 SHA512 d1181b01070d809a4f48be307e0ab8b30f383ade1f2ad19b7a95dda083008af98b01022f5c857d518ee1cbe28b70c67aaf32aa56e76c9f66d0186d49b7de581a
+DIST js-sys-0.3.36.crate 66941 BLAKE2B 37681d56a799833d4a897086594c9a2b394ef1c9d0f0a2a95f944a9b7855445a37deb86c6348d7e054a3a15325de21370629e927656cc58efbb333ea022d5ddf SHA512 811960047bbeac89ab654de2a7da237f2feffe287fc5c0a40484af1c52f73666d05d67a497827f2a55d5e244c2a3fd6ad8be0754330dd046e02ce51993697388
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
 DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
+DIST libc-0.2.67.crate 458605 BLAKE2B a4c57d6f9917b10e6e7747f40d769f16b9ed599f4643b7e55f7f61ee9a8a447f6a0d50932bbf8d87e29af328da4ad467f88b81eca281d30719ad3133edc94478 SHA512 da1c5a8d996f7f82ff45fdf0872cc2fe731a64f8ed4996291b7a7acc866b61433515240ae0069dd4d6c19db33a94541238195d82dd9fd711c4010a0cb0c0b41e
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 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.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memoffset-0.5.1.crate 5958 BLAKE2B 2ac071da35c45d498889d38805223b46a0ec81b3fcd95da85ffc0f4512ca45f1eaa9fcffa8931e92fd11d16806a887d62d8bf15d2f3f759cf9c27695595d0881 SHA512 8bd14c74a65464061acc5594eb108e630e8dd7a9dedccfab0606c255bd43e7b30241ba0bea11bfa80f9afd8fdbf0879ad7d998628f938a558716ec10da31008e
 DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
@@ -75,21 +93,28 @@ DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
 DIST num-traits-0.2.10.crate 41810 BLAKE2B b1968facdefb08c2ceae9ca6c3818f03e781e8524488fea26f1a992d3c40af38376d3e732d2dd75c6f666a38d15dce20d9590c432558d65e8fc585e33ea12d3e SHA512 5f945c8310a9b3e78d59a070639dcc1831a80ba682860bade38e738beb36b0496d268d50cde6623d3d20b8f5e68f6ada53d0f21554dab1c18fc225d397ef3761
+DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST num-traits-0.2.8.crate 39965 BLAKE2B 58b2c432e8523efd95724e01ed80d61b2c4a798fc451e1c7257a392f78617d0ecbab9b1c1d799dde8593cc69f1dbf30d2e966330766992ebd43d8626926f12ee SHA512 a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534
 DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
 DIST num_cpus-1.11.1.crate 11798 BLAKE2B e395b63d0c7050e06d4e70dd9581c0c005a673a1534b49fd4a257c3a210d3f48a32fb467aa4f05c69e1324ba0c1e117f3d0802df2cb54080d27ebf9d31d2117f SHA512 c3a943f5ff82eccee6f2e8af73e12fc83a82590030381cfdfa52c79b2f53012012b246fe8fa682606b7ddc011892d72d5579bc17ed072498170b51060c7e7f5b
+DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
+DIST oorandom-11.1.0.crate 9762 BLAKE2B 0589af12d0ad99009655272035738a6a5f57abb47eda2f2dc3be443474cb67cf4808207f95aee0be5417714f1c72c13fca82fdde778565574d670271ee9528d1 SHA512 faf840b52a315125d5f6c80f6101fcbff6ac29217d362915ebbae4f7337c18ecd46b89da96bf67147e84d0f805edb626be0da448af12b0bf537fb0f0a3a25c0c
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49cae62cc363a3bac98938328aebd527592270ac4014f558751bcdcf7e4994da5647baf98437200a93849bc9e549f SHA512 f9d8be381ffbb853b9a3bfdb0cf5b29c23fbab9b376ab2cc9a734fb7d573a1ef1ae3a32c5b4f080f534e52505fba1d6051475d62811da01205323420f2045dff
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.3.crate 34868 BLAKE2B f97fa38afb8abca38d814673e0cc7d17e3bf623984afa7fc2601636508d8b32160fff4079d2e266e2d2e4519d0d8942e88cbabcde54a869dde0a7f0961d2afaa SHA512 ff4e32e42d206191741880e362e39e33149fec4f94cb38e2693e956e4c0dd680dba4712f436fddbc092a7ebef23b7cd4693345fb93d5b9713a516960c2bfd82e
 DIST proc-macro2-1.0.4.crate 35217 BLAKE2B 5d807f6dcc4ba372d76ca3227b2ed6c6710ebf78c3c4e6ad8bf6020717a262861d9b4017c27e338addba240ff568fbf4510b0c6cbc06bf66a4f38db746e63f91 SHA512 e81800f46b8f0805d10a614848603dbee19ad24339c67986496597fcfd501c528ec4eec081e166b38283b3e7d64a0c2bd972280407ad30e388610b2b81594f80
 DIST proc-macro2-1.0.7.crate 35588 BLAKE2B 8d9b4c1f73c0959a77ac4b5839cf8b1a12259ef83c17fafd773a81518cf3750b43bb05df83719f2966afd5a71982b4a681d76692b93941127a52459990d3a281 SHA512 282514c6d052896130c83f632962a54f6310bea35b5418b41bdb540e51fad73d91bdb1c5e9f83dbd265c1f3d0fc67cd119db5483b5697e34b1598735ea9246b3
+DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
 DIST quiche-0.1.0.crate 4017747 BLAKE2B 2a78c68d418f70262bfd2916a44ccb2bebf76c4ace8b97b8898d3e04232dd3f48924b510c84080e4cd85642783c058e3514dad9f2ba0cc827cd24ecd2d47bc11 SHA512 9890d30017ce4363f1f7d0bb095c4050f9a5b57991ad740b6b484ba8086b2920b0e7a65760b9fcaabe37843f3cdd06e15ba7c0747dcec558823b4a6edfbfcf68
 DIST quiche-0.1.0_alpha4_p20190912.tar.gz 168349 BLAKE2B 7da7ca968c43ca065492a541e126909d3e884989d0f51775d7e78b1af1b2b7feeb7c913aa3adc99a6ad31bd3c043b79718a51b32fa9a38934b2bd5a2cb950c4d SHA512 7d2ca442efd83d6fc67fca3b3fd974400f76a1fd5b44b241079d386d9c94c8a0ef14f3f5ec17695dac04c42a8d441807bfbc2aa5fe155c7d80e1df01f1197dc8
 DIST quiche-0.2.0.crate 3588074 BLAKE2B e229a2e9b5030d348c847c5dee1add8376e9fecd15bc44551fdafdebfa52d815bfcc6f8289c5da31fb0fbe9fe3005be79734f3a8bf0017a72c296fea2bc3f43c SHA512 fc8220f50f4bb9bb44e7881737084cf07168a0e71a98574d6be9d030cee3f11d7814b882d7832a74b22a3db9abca28bf8a9f1469550917ed39a6e90366295ae4
+DIST quiche-0.3.0.crate 3521895 BLAKE2B 6c98bb0752b0aaa1284930ffcd30bc9378e58f75c2a43b566f75ddfcf17c5a42f749f3e02c3f879491e83d36100e9f73a7c27348f4d1e61897a71958b3afb081 SHA512 a10c54a54f4de4990c29121c6d14400a0385e884be79648a116a9a80d4abf8bf16145e5804a52bb5c556b437f0ac3b4a715af41c5fc1469139c52d46968f4681
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_os-0.2.2.crate 7975 BLAKE2B 281cc20f771956b5572f2eeeaee25e474be50abc58032f2381dc2512f02efdedf1cce6f9432d66f4d477cebfa78a1fda68ef054caf5861214533c8a8f1bac289 SHA512 7b7b9af819af1e53d941155c3042ecdbb33dfb58de8d0db05ac82eb12faf8986305d1c8b50c595612484c8ce754de20ffab60093ab92d32a8e4d09a622664b1e
 DIST rand_xoshiro-0.3.1.crate 15444 BLAKE2B 8e7ca59d27bf68ef8be1ff0d3b86cc9751c7506f4d2ab124de7832ae718d3f3f56c317a2106117d84071fd5c4603060d71e60e384d1f9a6551351c90c922af49 SHA512 3616554a4e2f781a62039420e24291511313be9965dc17a9b889dc6c92ae74a4ca9b4d7a24872781cb615dc321b4a31faac7359110ba279d28d718141c777175
@@ -98,15 +123,22 @@ DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b
 DIST rayon-core-1.6.0.crate 62221 BLAKE2B a7cca9fa19d0af21752458b58e22268dae9d8078d338714e30eec59e6b53dfbb717af9a919795828a165b42c8545414aa969875d216021632b7435304b8d72ad SHA512 78f231633fb2382fd38a89b967f5a2f38e611293a19db342039e63fd0c7cffd33a78d18b8f0788089b157373ebf20eae0c88365be9668f48abc3a390130be36c
 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
 DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
+DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST ring-0.16.11.crate 5334322 BLAKE2B 36b0b0905515c73071c074f78db00533481bf2753b357b4a7143bab2341a85d62e22a2fadc9f48e28cac13e3c2a1b09054782e178020cbe75878ef640c327a51 SHA512 12f9738f64b42fddc0815233a115a72a3b4347dec1cc6b995b7c93a8d8fe583902b45ed2a11e047abcedb2271b465b981cd2cf5296f489fbcbe72e31821d5bfa
 DIST ring-0.16.9.crate 5319964 BLAKE2B b1f3807beecc2aefce36ae605c94cf056483ea47f5250b6125dca4445be450be32b3c4afcd4575108fecc2ed61b900ee311d25b50d2499cc24b6eb62ce29020b SHA512 461458276e868764f886016f2ddd3270c97028114003f3509bca59387c23e21b258ebec9f1720e14be4db0e8b722ac0d411e2920929de7d1d08935378c035fd3
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
 DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
+DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.100.crate 73104 BLAKE2B d3557c4f170b31ca64ebd07bba8ee24eaf8e1ffbf192c97d5681dd2b18940c559c31b6fa9ab2e4d24d7b1ce9ec21c0953d37a1a5ee845b0d75d6bd1e870309a7 SHA512 bce506b4d30c9743f69a8c599eeb5bfde8e4951f1700901ce03eb9cd198e3725bcd625121f494f8d12e98200520899917794b5943b355acf8993f00d1ede4282
@@ -117,15 +149,18 @@ DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd7073
 DIST serde_derive-1.0.104.crate 49658 BLAKE2B d4a9ecb4a8df87776a83d645778dc050803b16fd5c9889f28e231238223d424dd25b101412e89741fb47be624d1773acf97f6e38809c81110b696701975168df SHA512 303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
+DIST serde_json-1.0.48.crate 72113 BLAKE2B bc522d0924044b41548b5c0ca63ed3e1fe70b7632b9e04ca6b01a63245deeae0e7154b0d913b3edfeaecfc816c1edfebfb666734c2a5371b416aaab9c1880f3c SHA512 544dd844330a26fbdaeb5246825f143cf06110065089c8be3dc44f8437f797ac083d7dcc5181656ed3d78428fcddc44e6802544ae304466eebdcd625a5a5fef9
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
 DIST smallvec-1.1.0.crate 23593 BLAKE2B f49a79a1c9c312559cb48acaa1ec2d414348c55f05ffc3c2e26da5e5c4ca260101a7f4857cc2d554b7d79391f2ce296df3f889bb1aa9aeb9b97c9be41845f8ab SHA512 78e1ce9b80f59254eec3d9b9788bcb7c4c63992dee0ba0da577c2862884e0c6b6fe7517f79cf3128527d7ec5d2d339de6fb79ce1fcdd4341dd2457d7dec7ea94
+DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
 DIST sourcefile-0.1.4.crate 3632 BLAKE2B 95a19fa0cd7f9f1a2085ca0f3eca4c083afc8923e29f3aa6b053209594df2ee9259d8d228d216acb6062f08ce1eb195dacf3ecc6c2b109893a61c1edd31be38e SHA512 f60c1c7e1c9acb5fad6d3c8343b4e3fde3569bb0c8da522968fc92b704f3eb1d5164fc17c482ea4fc4b78f33260ed3f51975ebf1f487e719d266cbd26c55f057
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST strsim-0.9.2.crate 9707 BLAKE2B e6f99a4292bdc2c83027b7686eb46b0524b8404949269f7fcd5d1af4c86d28422f3192d09512e8f20447b6361cc936b5cdd62a45d0ec513161677c87e37c23bf SHA512 2054444ea844a25f573219a4993986b69ff8c5dc0dfd2dd06fff638d596c8c5b5a1bedafc2bef3a1b9c146dd47a0769bbe039c54fd8e2a5d9894f29ab9f32838
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
 DIST syn-1.0.13.crate 195242 BLAKE2B c6889e24927ac5ebc1248be2d1dd1512b888e67ecad686dc67d29ff517aac2035cd4a8bf6dc87db54532eed72608f3a06ace41989bc7f47789c20041841a99e8 SHA512 234b470f432c1981f13e63e37334e200cd872d288f0ca10fb849281a5fe13c077eb9d41e75933a296f8c3d4e71ca8cce8724ef8c3d98bd9972146fab3d010663
+DIST syn-1.0.16.crate 198097 BLAKE2B cd09744c44726d755d4c3518dbda6bbd36f9bf0525fb2e4a04bae745b7dbef3a9d5eebca57c210af0da1a99cceb0ffc5540b3a1c148f87ffbcb5fdbfa57f586c SHA512 5960ce6d6d32eab252b480ba7a8603d45212e0823b5c96f4147f79173674391ddca82a17d95a8ba39e58d8849ee9c50168301e4e48f97517696e3d826e58915e
 DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
 DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
 DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
@@ -135,6 +170,7 @@ DIST tinytemplate-1.0.2.crate 24614 BLAKE2B 503faf7917be09f1b061f23375cfc4f0d819
 DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.11.crate 91048 BLAKE2B 2dd12260a77d9ec10af73bc46178cd49144a8c5206fbd7240c6bd933eb9cb854efedb947b63af165cec51e1677671ddcf2924bb55c4b759dfd2d0939db09f290 SHA512 bee8fd546d4d1ad1179b31790fb5a087daece8a0435d8ba85def9c1d1827a8ce1ca643924863f01515e8fa6f78a47041e1bcda644a33427c65a50c4eb47d5d81
+DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
 DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
 DIST unicode-segmentation-1.3.0.crate 90567 BLAKE2B 2bfce62b981b6b8d41be760f0663c3301f974fa9c975e7859c6cac6778cecafa2ee5dbe2e4368959b4fc2f0dee3d93cdab236dde593665b76740d07009051cb2 SHA512 6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c
 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
@@ -146,40 +182,50 @@ DIST untrusted-0.7.0.crate 7937 BLAKE2B b8b39b052e12135e93b4dd3f5566fff144f05583
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.50.crate 144511 BLAKE2B 7778d05717281b6c295260f6ec47898e0c565bb107d0c1f6f64f5de9e9208eecfa49cfd6c83eb3cd6eb6c698f5af74fe59ba3a86ec4f6d02439a55dcacfb4022 SHA512 d2c4ddc0d88864539b0f25511770edba61f54cd13a1f1a08c298dbb9433356a2617b24e3f0a1bd2e37eb418976c97ff11780df9ff809f566524462d965c35b53
 DIST wasm-bindgen-0.2.51.crate 147669 BLAKE2B c1221297c38e061da254cd2225d7788dee79c99c9303af3c25f867dd23693c6428ce1bc0c2a16f3843bebbd3f08df1ea43653a49cf069d9db8a50523eb19bbcb SHA512 d2f336335f61192da98750607b660a03d2e76c1808996a5a549b14205e76624f04f167bedb7fb0ccf371e49f1047688e5cb2289a92001d3b55caad3a8b6855d9
 DIST wasm-bindgen-0.2.58.crate 150537 BLAKE2B e958babff0b29d1c0b931abbbba924b2a2720704120e828c053fd0e06267c8d7a09dc45bd712978c6224ba479f3f61b83a74d2c3d5160913b9ec02becdddcc57 SHA512 c0fe39ec0f496babedf9e2754f3a71bf8da38cac469933ae708b4925ea660bf064c352ae67a0cb15a05328edc59ebe5cbeeb0f3035a6d7a674ebc0d271560667
+DIST wasm-bindgen-0.2.59.crate 152264 BLAKE2B aa52bdfc70c1098aac8506f8a071942a86da99e8ad489f9d0dabc297cf473bc4de215261c96c72d3f2f2a63bd0eb14c34b672a50265a8f54be44a01edf4a3d02 SHA512 f1fa396e6b1c67750f13f63618207b1b24e04d9b186f52a0fde2df4735a799507f23c577528c83fce37a294651d307882b7f4cbced0dfdfd98475968a95926c6
 DIST wasm-bindgen-backend-0.2.50.crate 21115 BLAKE2B 79f9322281636c6bec83c8c6aea5f4ceef360cc0b42ed28de667eb0b18f9b0772dd8f455df84933f43b5be0312cc03c02ebe8f11dc652a7aac3fccaa1d2e4cc7 SHA512 6e53da0259b5c3e167129ae67f8a45497973028af2f48d67964605f8924754a1c6ec6045fe0e3d30ab05902ea2962845a1944d3ed13ee4fc0fcdb6892dd35885
 DIST wasm-bindgen-backend-0.2.51.crate 21373 BLAKE2B 8641aea89deb10550b94a5e83e7b1d6309d3179c05b82f29536061f781dde9ac97449f892da06ddeac480426d9c18c1f4c322baff54dc1165a9f2ed8379a3ec1 SHA512 d0740d003e8dbb62494e6a12e41a7b10e0809877501d8a5f59979c797d08fe7ab57b172bc20ed9d2113ae57a2b1868ce923b68cc2413e1771fd8a4844eb58c06
 DIST wasm-bindgen-backend-0.2.58.crate 21479 BLAKE2B 101d311e32330a2d2d0cca325a9f544fb555bdb1d2b354f02cd16e6b3ec76e0a7056e189b1bde769e22e07a57b05174c6746cee9896141656fa095501518842f SHA512 b58388b94f0389bfa1a28fd975e3f239d05b57fa89aed7bf802ed4cf1065c016a925100eef3fd650d53a581990b9165f6431866ac64798bb11dce44897130417
+DIST wasm-bindgen-backend-0.2.59.crate 23306 BLAKE2B f963f5f7ef437da8c47493b0120ab1a2b1f6e14886e7f126ce2d125c010237437d782f988b6228b1191b3bad0cdf7c53255f5bd81ba23a059dbfe8d6288981a4 SHA512 466861080881dc16023e7c620d0b327a9587177cc608e3ab9652dc1857e8371a55720fb54c611498f70a42cfda8009879b5422b4dc385012c0fbceec96b25ad8
 DIST wasm-bindgen-macro-0.2.50.crate 10849 BLAKE2B b59e71d7f7ce427a60d0c48a5921b4c00f0b97472a8e3c79f9f2a0a3801c02131d0f6b6a249100eeef0e0d6d8fe616511422e70256cd74ccc9edbbe666b36097 SHA512 1d1c273f520c997c6c1b6d86c08ac99c4e25e04da12a25a6efb87e1b8a887618b8435129d6774a7ec2accded5c87c3561285dd8063d28efe19f60052e6d167c6
 DIST wasm-bindgen-macro-0.2.51.crate 11421 BLAKE2B 8bbb0a21d101fdf04db7d0ef31be58a24189c8e5a37593b272213ac4275117aed0caee7736a98f6263634186123ace9c5fb84593fd15fcdf21a4eb6f5293f3c9 SHA512 672a772952773566687ad167bbaa580463d7695d3e040a416263974a4941475b02554e334de5bbeed1f6d3951b1f647728f83055f8bb744a4782f58f8fbb22df
 DIST wasm-bindgen-macro-0.2.58.crate 11599 BLAKE2B 7ec50395addfbfdd40bc09820c73b56ea00bb22dbe835cd5572c0f44b86c862482a3fed5d85b285cdb4075f6a18010055f14baf068dcd52784799b33b8bfda82 SHA512 abc8731d6a6143adca93d7b0c24f3417191f9ceced08a1e2a7df3f8ec86ccf491bba84e94ffe5fdefc0897fe9b33a05355335f5771cda076ab9294d847d81e76
+DIST wasm-bindgen-macro-0.2.59.crate 11562 BLAKE2B b941e0e60eecf4dc043b956e2a0cc137a51a5d10693d2c0e0d7006b3a9cbf73c5145eb2a208e98a8a93bb49e43f9fe5a0614cebe86d6bb40a5bdcdab7155745d SHA512 ecc311c5fd134848e6b43431ead23a0e1616a1735a39f98d5ce91ad425bc4b8dd1ed8890f2ca534362ab1cce6c35d9b3274fc4007c96497d3277ee2a47afa55c
 DIST wasm-bindgen-macro-support-0.2.50.crate 16461 BLAKE2B ae44dd17804d4c554b676d11136868958eed5b6d3dfe58a80fb113c7546e511d20b7cb8a92d53b0b3ff3fff02313d407f8d4e5089b558f0b936332c0a7a82436 SHA512 f855ad370334fc64ccba2d3d00ecff0dec2319ce644b337f60300d4f76c9d8323e2676dda52fdee3ef58e1d9f16ee378beccacb6b02cbda16c2d40f82526df91
 DIST wasm-bindgen-macro-support-0.2.51.crate 16476 BLAKE2B d726d89f063e01c2caeea38ff44d0f7584ebd92a37e139dd5720430a4be54774faec9a4edfecfbc2771adb4b1bbea37c11380c9d9a264663007ef204eb8abc67 SHA512 a53252f8276494a8d706c401e5a5a4b785749da91f7f171f1242268316de926f518e7e3d8c4f36f139e21e2ee3150a6e07ad416125d6f738aa5633f2337036df
 DIST wasm-bindgen-macro-support-0.2.58.crate 16510 BLAKE2B e75fce5858219d70278e5b78ff68e6611226926f8d8ed56a1fbbe0cb73909cdcbbca65b748e1cdb6f3efc0394390628c1fddf09356a22d773851093003cc3054 SHA512 fc8d2606fbd9507bb681a39be26cc01ba1776995a5230f54c3f8052107c9ca177c4680a1f4e8d326bece0285d7d39e04c4291875e5e903f7c45fc721cc3ea9b1
+DIST wasm-bindgen-macro-support-0.2.59.crate 16875 BLAKE2B a3b92c007ec37c774219fe720f6f52b21a0f26cc7dfbc63a274d44dfb3f2424b587f240924417c18f1235e590da798284cc3927f3f747d43f5dd48be1d2a453a SHA512 65b4cddeabe6b9031b1b513d1df95b3308db89b066686bb9427b2cf826101e5dca318db9d4736674ad672eb306b1306d0061b736725b6e52a8f34ea9b09ba89a
 DIST wasm-bindgen-shared-0.2.50.crate 6727 BLAKE2B 9bd99d6f9441c748d1891c532bf42d60838919d3d100eae20b0be2cffc99bdd774a4172e106e121dbccb87130faa2c33e0c4598e43a6252647e63c1c490195ce SHA512 c1d327b1dcdb0abaf76f7121adff7e618691cc8efac5be3fe97e4375446003d9e0c41288288eb1b432e2bd49d1776be11b9cc4f675d42f78606456b711d4e877
 DIST wasm-bindgen-shared-0.2.51.crate 6721 BLAKE2B 651005f120d4d647c3a3db19bcc726ef0669577d2c072f6fe0cde64a7a94933ed51c7b9a5e4f87f41bfa6cc9b2d68e989345c71e4ce2ccbbb1869f0a1f179309 SHA512 29c36bcb531715457f1e2d4b017f505fbc81a685fa80c8137b3558f2448780357e93ca222c67214f32e248585888a58df3f3895b59246dbc59f47a7ddf7632e3
 DIST wasm-bindgen-shared-0.2.58.crate 6740 BLAKE2B f90364bb447cdc7409ea663f8df7d8b8d45df80d1acf1cce0ec0d3e9a1c3def8f93eb3537a69525d18941f71de04aa3e4824c15e34b396ec4462a46d8eff528a SHA512 970b60d8ed46cc86cef2b5954899e4bc4113e86f6d927e920b77194d078726213fe0d92e2f06e5ef6ca85b4379b002b43b798f7050573d68130e0099654b3f48
+DIST wasm-bindgen-shared-0.2.59.crate 6745 BLAKE2B a314206a48c0784d49080f0451a3ae64af6a5fadc1563f8a9d7b7fde805535c54961466df7759a236c2aa369c055ea990473fb6d7b13c018ba5d3069f1852dac SHA512 969e5c59b80bd83900affb82c5659bd1807014482a811828928fc34441e8d0c20b27aa838f401af75d488a70e8d272ef5429ad69c76a177c247a3083c698a3ae
 DIST wasm-bindgen-webidl-0.2.50.crate 24182 BLAKE2B 276641836fc21b2a7513534867799527e56e158ed9f8678f0c8a370cb38fc2dc5eb023fc9aa04db5afae0e7c3f49e5031ab4650daac35dd543594ebc834e24f7 SHA512 a1af0dd9c31cdb8fc52ed55b6f27f1423218c5fa427d8b295b3989122fc3b01650f1c9174bc77f5b6883ad6e05ce6e90af0e1e40aeb236772cf782c63c2d6c20
 DIST wasm-bindgen-webidl-0.2.51.crate 24203 BLAKE2B 7b8f5cf4cc74f357e8c1193262f667551708fea51fed9b8fd38c3bce2ca0608c9af86f998d2a8716024a645c90c83b31dabb214f515783f332991da47710ae95 SHA512 b9dade093a8ed835aaa1be2ef5b989176887c57dccc4cc90cf9e608b54da489bb66bfa9fdaf4c9edc2df1ab2c71fb2018bdddcc502c52250d3d5a36ef354b554
 DIST wasm-bindgen-webidl-0.2.58.crate 23864 BLAKE2B 1d7ecae7c1dea10aaaf830676b502a0ec9fd607a87ab3f3863eddbdeb245d695c08edcf2c954519b753b5dac05593140c10b058a8e08a6a7e3113877cdf55d0c SHA512 3344b82063f4dbcbfe9b0777b9e071ca072b716c87142e7fc2ca043f0ce973477b4609fabb415ab43261bbb19bbe5ab7df3301c92cd9d159dc0ae6b85fb20a15
+DIST wasm-bindgen-webidl-0.2.59.crate 35711 BLAKE2B a95e203ccb1df906ced64b3052662c77103017f67dfd0364335e19dabab2718ef0683809a7f67af267abaa99187c301752f89f3186ae4a4a1259b3766065289a SHA512 975b71a144a11ee005451aafef72d6410bfa9663702cc788f5604a773c88d0c2fe36e4ff53ec7bc882935662590f3b2503f7530cdb1e014d729463341c3ff56e
 DIST web-sys-0.3.27.crate 204250 BLAKE2B 73a067c079b3b3c5cf858adf185016f8be9cf02559c18b62b2f24628366df769e5e71010277718dee6a479191d38bc2f97dc42128b1327434dbc9f6c78d869c6 SHA512 906a16b5642a515dbaf996b4b4b42b4fc93ec1c614651fed476fd62ba3296f8e4d111a5f1f86bc0d3d565174e6a9da3a8f9b0a3b2dff827501b03bc734653b26
 DIST web-sys-0.3.28.crate 204077 BLAKE2B b8e7eb716e0eb6b20d2cd994cfe708964923be61c1d71ed303ff3b7a8210dfcb58858f608d28249f33bc6fb03f97ab497143e40fb2665523907b78dd122a1a50 SHA512 c26acca4493e3521feaeb081aea53a1c9be248bc547f42dbac7ef98a108e765e150678c37888de92cb06d97f1102ac96a5faebbf32621f9bd2bb74f668faadc4
 DIST web-sys-0.3.35.crate 204293 BLAKE2B 0f07e1da5ec23b286a1b7ac830050a0f0b48ecdffefb871f105647ccbefe8696d7c1e27498231b7d810ec9a9b73ad851eaad9ce9ed1fe87ecfc78b52b3e89388 SHA512 d9ba1d162030c07d3abb91f42c29f06162ad22952f7d55bff5b3f051de4be594eb1bd910b65d2e527c0faffaab2f731bff9e9f9573eb298e0392e918f7029195
+DIST web-sys-0.3.36.crate 615528 BLAKE2B 45dc9ae3227f04a9cba4c9c1cdc8d50f273e83ba83356d1fcd50f695559fbf36cb9c00a0ac5efc89d439c8ab213361cb6460798bd80f3864e45377c57262069d SHA512 203995e587c7ac9042587a79899834be4409dd1dc73fdb3a76545e206f0516093833d975db9fd2349d63e4262f50f6b22b3ef1e22cd556ebd377da73240e4761
 DIST weedle-0.10.0.crate 34686 BLAKE2B 9592932b38543c700717dbc1ea2852acc4fc73cc9c6550e4abdec6d230c7e4a2e01663643222a5fe025767d83d0a802be74a9798fcb57083dd795b513a64ade2 SHA512 c7e5ca778af68d69284cc93556a67884adbc437aae32f85ef305bb9489a5181dd3b77ded68657c1d3a088386586ead4830707a8e6bc0c912c953e1a74ded49ad
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 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.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
+DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 EBUILD quiche-0.1.0-r1.ebuild 3996 BLAKE2B 8ecef4042ef3c4a64b53766d8f5ea42cedb516bdb90392874a48e4269c3c7fd827b24976f4610d310317175d1805f5cd6434a7b4e6b2c6119c07459969926e5b SHA512 07a99f0d6787777907d4482efca69eaf85b0ae4abefae4a41d69a5fee7f262fa5cfe9fb9f37fdeae4a4d3b9cc7763c995093dea60cc667f7995659456f55053d
 EBUILD quiche-0.1.0_alpha4_p20190912.ebuild 3779 BLAKE2B b8afe84ecfb336e4ebb13d9299ffac0b9deb4f0001d97c9ce0b0cda6dcc13343945a26819f2cf7b72510eecc3758402b775e94301fecede64cd6b07ba8868cf1 SHA512 a3ccf728e8a4795f64f6735df4a1d00c801b0021ab1b080de2ba2cc778db010f046eff9fe2a9afad187d04d5bc406431493206da0763906ad40064636f4f43e5
 EBUILD quiche-0.2.0.ebuild 4047 BLAKE2B b54703dd4bbeed70f436167eec0a09a8f4f21a22c2ce01ea9f0e0454a16ce46bd1fab238ed1ebce9e75e336d64964fe1ba6b9598a878b708d42ad84297961cbf SHA512 fcf9df5c6b6db64824b467201377b969da8fcfe474a75f11306d08d8d70111a3af2d7b93e72a95a24fe885d9bc8533db541d3723017c93dce4a74173bcd65cc1
-EBUILD quiche-9999.ebuild 4047 BLAKE2B b54703dd4bbeed70f436167eec0a09a8f4f21a22c2ce01ea9f0e0454a16ce46bd1fab238ed1ebce9e75e336d64964fe1ba6b9598a878b708d42ad84297961cbf SHA512 fcf9df5c6b6db64824b467201377b969da8fcfe474a75f11306d08d8d70111a3af2d7b93e72a95a24fe885d9bc8533db541d3723017c93dce4a74173bcd65cc1
+EBUILD quiche-0.3.0.ebuild 3645 BLAKE2B 404205e38ec6feaa2f674e1ed7cd5e300c63d2d53ebae265e6eda458b50df3ec3fd56db3193efe5ed1375b9b3f3c0f4155779765cc710648dd1a9844bf95eb56 SHA512 da5a2273d70175e2e4bb49221d9ef80b387672d80f6e80938ab3c1ebbe5318052c9399aeb04ed1e42b3d43e5fac42602e4748358c8d2f9af3658845a75857f06
+EBUILD quiche-9999.ebuild 3645 BLAKE2B 404205e38ec6feaa2f674e1ed7cd5e300c63d2d53ebae265e6eda458b50df3ec3fd56db3193efe5ed1375b9b3f3c0f4155779765cc710648dd1a9844bf95eb56 SHA512 da5a2273d70175e2e4bb49221d9ef80b387672d80f6e80938ab3c1ebbe5318052c9399aeb04ed1e42b3d43e5fac42602e4748358c8d2f9af3658845a75857f06
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-0.3.0.ebuild b/net-libs/quiche/quiche-0.3.0.ebuild
new file mode 100644
index 000000000000..174406e41944
--- /dev/null
+++ b/net-libs/quiche/quiche-0.3.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anyhow-1.0.26
+aho-corasick-0.7.6
+arrayvec-0.4.11
+atty-0.2.14
+autocfg-1.0.0
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bitflags-1.2.1
+bstr-0.2.12
+bumpalo-3.2.0
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.50
+cfg-if-0.1.10
+clap-2.33.0
+cmake-0.1.42
+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
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+hermit-abi-0.1.8
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.5
+js-sys-0.3.36
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.67
+log-0.4.8
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.3.3
+memoffset-0.5.3
+mio-0.6.21
+miow-0.2.1
+net2-0.2.33
+num-traits-0.2.11
+num_cpus-1.12.0
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.9
+quote-1.0.3
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.3.5
+regex-automata-0.1.9
+regex-syntax-0.6.17
+ring-0.16.11
+rustc_version-0.2.3
+ryu-1.0.3
+same-file-1.0.6
+scopeguard-1.1.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.104
+serde_derive-1.0.104
+serde_json-1.0.48
+slab-0.4.2
+smallvec-1.2.0
+spin-0.5.2
+syn-1.0.16
+textwrap-0.11.0
+tinytemplate-1.0.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.12
+unicode-width-0.1.7
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+untrusted-0.7.0
+url-1.7.2
+walkdir-2.3.1
+wasm-bindgen-0.2.59
+wasm-bindgen-backend-0.2.59
+wasm-bindgen-macro-0.2.59
+wasm-bindgen-macro-support-0.2.59
+wasm-bindgen-shared-0.2.59
+wasm-bindgen-webidl-0.2.59
+web-sys-0.3.36
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.3
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.39.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+	dev-lang/go
+	dev-lang/perl
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	cmake-utils_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index c739b541cea7..174406e41944 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -8,119 +8,95 @@ anyhow-1.0.26
 aho-corasick-0.7.6
 arrayvec-0.4.11
 atty-0.2.14
-autocfg-0.1.7
+autocfg-1.0.0
 backtrace-0.3.37
 backtrace-sys-0.1.31
 bitflags-1.2.1
-bstr-0.2.8
-bumpalo-3.1.2
-byteorder-1.3.2
+bstr-0.2.12
+bumpalo-3.2.0
+byteorder-1.3.4
 cast-0.2.3
-cc-1.0.49
+cc-1.0.50
 cfg-if-0.1.10
 clap-2.33.0
 cmake-0.1.42
-criterion-0.3.0
-criterion-plot-0.4.0
-crossbeam-deque-0.7.2
-crossbeam-epoch-0.8.0
+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.0
-csv-1.1.2
-csv-core-0.1.6
-docopt-1.1.0
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
 either-1.5.3
-env_logger-0.6.2
-failure-0.1.5
-failure_derive-0.1.5
 fuchsia-zircon-0.3.3
 fuchsia-zircon-sys-0.3.3
-getrandom-0.1.14
-heck-0.3.1
-hermit-abi-0.1.6
-humantime-1.3.0
+hermit-abi-0.1.8
 idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
-itoa-0.4.4
-js-sys-0.3.35
+itoa-0.4.5
+js-sys-0.3.36
 kernel32-sys-0.2.2
 lazy_static-1.4.0
-libc-0.2.66
+libc-0.2.67
 log-0.4.8
 matches-0.1.8
-memchr-2.2.1
+maybe-uninit-2.0.0
+memchr-2.3.3
 memoffset-0.5.3
 mio-0.6.21
 miow-0.2.1
 net2-0.2.33
-nodrop-0.1.13
-nom-4.2.3
-num-traits-0.2.10
-num_cpus-1.11.1
+num-traits-0.2.11
+num_cpus-1.12.0
+oorandom-11.1.0
 percent-encoding-1.0.1
-proc-macro2-0.4.30
-proc-macro2-1.0.7
-quick-error-1.2.3
-quote-0.6.13
-quote-1.0.2
-rand_core-0.5.1
-rand_os-0.2.2
-rand_xoshiro-0.3.1
+plotters-0.2.12
+proc-macro2-1.0.9
+quote-1.0.3
 rayon-1.3.0
 rayon-core-1.7.0
-regex-1.3.1
-regex-automata-0.1.8
-regex-syntax-0.6.12
-ring-0.16.9
-rustc-demangle-0.1.16
+regex-1.3.5
+regex-automata-0.1.9
+regex-syntax-0.6.17
+ring-0.16.11
 rustc_version-0.2.3
-ryu-1.0.2
-same-file-1.0.5
-scopeguard-1.0.0
+ryu-1.0.3
+same-file-1.0.6
+scopeguard-1.1.0
 semver-0.9.0
 semver-parser-0.7.0
 serde-1.0.104
 serde_derive-1.0.104
-serde_json-1.0.44
+serde_json-1.0.48
 slab-0.4.2
-smallvec-1.1.0
-sourcefile-0.1.4
+smallvec-1.2.0
 spin-0.5.2
-strsim-0.9.3
-syn-0.15.44
-syn-1.0.13
-synstructure-0.10.2
-termcolor-1.0.5
+syn-1.0.16
 textwrap-0.11.0
-thread_local-0.3.6
 tinytemplate-1.0.3
 unicode-bidi-0.3.4
-unicode-normalization-0.1.11
-unicode-segmentation-1.6.0
+unicode-normalization-0.1.12
 unicode-width-0.1.7
 unicode-xid-0.1.0
 unicode-xid-0.2.0
 untrusted-0.7.0
 url-1.7.2
-version_check-0.1.5
-walkdir-2.2.9
-wasi-0.9.0+wasi-snapshot-preview1
-wasm-bindgen-0.2.58
-wasm-bindgen-backend-0.2.58
-wasm-bindgen-macro-0.2.58
-wasm-bindgen-macro-support-0.2.58
-wasm-bindgen-shared-0.2.58
-wasm-bindgen-webidl-0.2.58
-web-sys-0.3.35
-weedle-0.10.0
+walkdir-2.3.1
+wasm-bindgen-0.2.59
+wasm-bindgen-backend-0.2.59
+wasm-bindgen-macro-0.2.59
+wasm-bindgen-macro-support-0.2.59
+wasm-bindgen-shared-0.2.59
+wasm-bindgen-webidl-0.2.59
+web-sys-0.3.36
 winapi-0.2.8
 winapi-0.3.8
 winapi-build-0.1.1
 winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
+winapi-util-0.1.3
 winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.2
 ws2_32-sys-0.2.1
 "
 
@@ -135,7 +111,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	CRATES+=" ${P//_/-}"
 	SRC_URI="$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/${P//_/-}"
 fi
 
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index eba23d2096df..5e5a6da7b04c 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,6 @@
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
-DIST qxmpp-1.0.1.tar.gz 259791 BLAKE2B 3687dd8f74db8a995bc37850f6988b1750219b2f683281d26990a430046cd1d7f1957c19604540a56c3110aa5b9a40d037388f9726f684a56a0d15c7de6a4849 SHA512 b6fb5fc0e3edfd978ac47b3ce32d8d0892678247479ba3e30beba3a7e67da1eb053bb95de07306920cf6ca5e744c12fd31f1a72612c5ee5b724a3eac7b8d6c6e
+DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371
 EBUILD qxmpp-0.9.3-r2.ebuild 1839 BLAKE2B 59c6021302117272c43f63ff6f372f4248224c58b50c1376b8ebe4e44242f351462ecb9b8feb3455e47e2b230f8692063b3608270c0723c45146b38f1098d280 SHA512 1c2aa58ce0dc71faf748032fa82bfdfed962a8d8bcad1fa36db786d4e82b0b191779ff1c84ea1a3509198afb5f5ab3df1c6d20bdfa3c4b3b1d1e1172e3f8eede
-EBUILD qxmpp-1.0.1.ebuild 1380 BLAKE2B 744109d8c5fadd54231d67c47e03b468dad42df207475911af48a5bdb06338b552c85abffb7571fb162cb8e7bd5721066f8000aa7b9705ec10760ecbfd34f3b1 SHA512 d8c90421e145362accc6f12d7300e7a247c88ef061a430b60269a12825001b70ce9df04a247354db2b322ffe17fb95601c73001a09093c7f171291546502b0ae
-EBUILD qxmpp-9999.ebuild 1370 BLAKE2B 4b29c5e54630679f9dbbfc04f773f3ce4a2c70b87f0774d8b144bfb6d8008b013a227714d37e30f444c518da37d70ee0fb125eedd84494211bc53034d3181eda SHA512 b196a0a6a2cafc320bff35528a92f05dd2821602b5cbaaea0b9cbe9773352b27816aa7da0049fe490fa75da2bcd99ce3f444dd2750218e6284500d000c905169
+EBUILD qxmpp-1.2.0.ebuild 1306 BLAKE2B b815077c61922b2d7eb87fdf76156c02252498e5d6b1970d1cc4357ff170b86db3d29aad2b69a3d3fa29bb075d006ef2018f88fa8a8e186b097368d9d7c40e24 SHA512 5ccc1c274df875fe028067a5ac36c068c91d7c069ba3d21fb77ccb75a578ec321e5739d6f60a9d9495a12606667c79b8059b6777cdd4d72b0446a0c4f7930f0e
+EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76
 MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/qxmpp-1.0.1.ebuild b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
index e56ca1cc2f44..c9a44c3c89f1 100644
--- a/net-libs/qxmpp/qxmpp-1.0.1.ebuild
+++ b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,12 +33,12 @@ BDEPEND="
 
 src_prepare() {
 	# requires network connection, bug #623708
-	sed -e "/qxmppiceconnection/d" \
-		-i tests/CMakeLists.txt || die "failed to drop single test"
-	sed -e "/qxmppserver/d" \
-		-i tests/CMakeLists.txt || die "failed to drop single test"
-	sed -e "/qxmpptransfermanager/d" \
-		-i tests/CMakeLists.txt || die "failed to drop single test"
+	sed \
+		-e "/qxmppiceconnection/d" \
+		-e "/qxmppserver/d" \
+		-e "/qxmpptransfermanager/d" \
+		-i tests/CMakeLists.txt \
+		|| die "failed to drop certain network tests"
 
 	cmake_src_prepare
 }
@@ -48,6 +48,7 @@ src_configure() {
 		-DBUILD_DOCUMENTATION=$(usex doc)
 		-DBUILD_EXAMPLES=OFF
 		-DBUILD_TESTS=$(usex test)
+		-DBUILD_INTERNAL_TESTS=$(usex test)
 		-DWITH_OPUS=$(usex opus)
 		-DWITH_SPEEX=$(usex speex)
 		-DWITH_THEORA=$(usex theora)
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
index b1973ffc3cce..453364d6055c 100644
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp"
-
-inherit git-r3 cmake-utils
+inherit git-r3 cmake
 
 DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
 HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
+EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -26,17 +25,22 @@ RDEPEND="
 	vpx? ( media-libs/libvpx:= )
 "
 DEPEND="${RDEPEND}
-	dev-util/cmake
 	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
 	doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
 	# requires network connection, bug #623708
-	sed -e "/qxmppiceconnection/d" \
-		-i tests/CMakeLists.txt || die "failed to drop single test"
-
-	cmake-utils_src_prepare
+	sed \
+		-e "/qxmppiceconnection/d" \
+		-e "/qxmppserver/d" \
+		-e "/qxmpptransfermanager/d" \
+		-i tests/CMakeLists.txt \
+		|| die "failed to drop certain network tests"
+
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -44,20 +48,12 @@ src_configure() {
 		-DBUILD_DOCUMENTATION=$(usex doc)
 		-DBUILD_EXAMPLES=OFF
 		-DBUILD_TESTS=$(usex test)
+		-DBUILD_INTERNAL_TESTS=$(usex test)
 		-DWITH_OPUS=$(usex opus)
 		-DWITH_SPEEX=$(usex speex)
 		-DWITH_THEORA=$(usex theora)
 		-DWITH_VPX=$(usex vpx)
 	)
 
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		# Use proper path for documentation
-		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
-	fi
+	cmake_src_configure
 }
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index fdb3f59a3aca..b2f00477b0aa 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 1342 BLAKE2B 2b9a3a921ea91c0a3ca9f7c7cfc1b966994458f977462a311eaea42dd1aeaf16eaf9ba7fb194158d9bd88826ae295fb772c6dbabf4534c1f2196a2ae678566f4 SHA512 79d268e053bccaacb0d77cb63132d619baa4a19d92e869c6950900fc212ff0db7ecf234814d72e05560ee513586794ea5098a2cbc72931908bac6725182c4601
+EBUILD rabbitmq-c-0.10.0.ebuild 1343 BLAKE2B e347369578894b1cdceb766e0415d35e34bf824cfd61857abf3cdfc0919638859ee32ca140a68c28bf5130aed333e1f67b5374ffbf5f1ec84997d2094102f74e SHA512 2f775e2efea67b7a11de725eb84f2fe57712c7a8713600f82f2db5ff3848f4551c54a001a14c7b3b2a71fee20d01962a399628045244fc8616bea05d42fe1e71
 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 8c01fd50d02f..87168444b22d 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/rpc2/Manifest b/net-libs/rpc2/Manifest
index bbf1e47f6af4..1560a72ea0b0 100644
--- a/net-libs/rpc2/Manifest
+++ b/net-libs/rpc2/Manifest
@@ -1,3 +1,3 @@
 DIST rpc2-2.14.tar.gz 628236 BLAKE2B 7956bc218fbdf0d14390c7d7090f14dbc813edd1ea45e105bb75c99cebd4acef17e91db979390835449f9a67c4a5b2e5dd01150049f9fb64daa8d32dc65f673b SHA512 7d80a9d2c69469526fa31e0c0a3f0eee20e2662d1ee03eaa3a642d48f152f611f5e219a4d730a94d49b65b77e67eeefb179bc160c0cf7a9d0e7e31f8d7f882c5
-EBUILD rpc2-2.14.ebuild 606 BLAKE2B 319adc9d5eac638face82f1e683a7e8c742cf0a4455e9f3e6de542022a94b6660f2f071e1d8ac00fba7b98c8558cc10b2e1bf93a99263f7aa5d75e41d2eeefe8 SHA512 19ff4a64ccaf062ce5fdcf80efe9152a550b8bf99aba539368be57edf4bb6f7361604f2fe887a46373fa0bd35efa3a71337d52514f43ab089bb46820093e61ee
+EBUILD rpc2-2.14.ebuild 607 BLAKE2B a4b9d2d32cebfd36a7e16f8a0c9aa54224d773a96b020dfe8866716d5eb4a8031465173e78ad3042baa57ca08a659d07d84d3ae0667308d02b6317e7d2da6e10 SHA512 614dadabbb53043024c8191bd832ca4f316ad0f9919bde1e2e0151ddf0c0b4482fe6814fc66011fc7e97653019b985cac1fb63ed0a49ef83adee8d288c21bf3e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/rpc2/rpc2-2.14.ebuild b/net-libs/rpc2/rpc2-2.14.ebuild
index 841c66c72d47..a43d3795e550 100644
--- a/net-libs/rpc2/rpc2-2.14.ebuild
+++ b/net-libs/rpc2/rpc2-2.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/lwp-2.5"
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index c31a842c9f28..80ce33583989 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,8 +1,7 @@
 AUX rpcsvc-proto-1.4-external-libintl.patch 1718 BLAKE2B 9484dd528679c3cac286ae0aaea7491bbb54f00df14bbc7891809684d48eda81441745bf1d822c96775f02519de0f4e98ffd9f99cac86954874420586fbe35bf SHA512 92c1d8048e28ced24bae24e0bb7001cf65e6c8274b67a3ed4a1015e094201a812aa85d75ed280fca40b94a1b5c61b657dbf0afd538d7c59219abdf51c5af3f29
 DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
-EBUILD rpcsvc-proto-0.ebuild 479 BLAKE2B f4fde5d8542ff78e737013e93e0366ea44a27ef2fab96a0bb4c4dc43d66061968b1b2406364343c827b8afdc650e704fc62fba15660aaf097842e7b29ba7f1e3 SHA512 51fe0f823b36b5c3f73c915068c3f05948f4588990633de1e9030ea0876328d17bc71931e00850e0495f69c2898ee049de8d77ecb741426623cb207389e629c6
-EBUILD rpcsvc-proto-1.4-r1.ebuild 796 BLAKE2B 306c366e831e2aa2bd1fd7f900a708da745f20c48d12d851d9014e71b88718851645ad603ff3c3e7be1824048f1e428d95470fe87ee74d898ff80877deef7822 SHA512 3b84f4ebb089b47ba42bcf61b9eeccf2f92ed178b3ba76cdfc236c6560530b09bdc17da350e7a5852eb6338a7176e12c5f4177bff189037efdad1813761c6354
-EBUILD rpcsvc-proto-1.4.1.ebuild 752 BLAKE2B 45d27d27781b13e987436371a1fa98420f7f442efd1d6ad9aec3f32683a64a4473c01859e61f06d8e6d7f6521bb5e0ec3b9e45694e7d4c8c50e0832adb7597dd SHA512 04193d62fd8e9754297f3fb96b06c955a4ea7aea0ba481c2a03b8158bb500e08188b0e647f52fedad22afe54e8af0e21e878ff25e676fada1757f4def777a2e5
-EBUILD rpcsvc-proto-1.4.ebuild 639 BLAKE2B d889bb101dfac5514d5eebab13f64269ce63c3c1e5e5b27d05d8891c83df5eabbb965f21537defcca7ea8ec9bf70186b2858f09e49c0ffaaaad694e1f2bff931 SHA512 151e6127ed6229042e9f324aa3a75aeda3c39bfd9c3674ba15cd647ee59ae2e5c26e847fb11b4899f33b7a0e92fb7c885c83500cf439c5442803c2ee777af325
+EBUILD rpcsvc-proto-0.ebuild 477 BLAKE2B 3b41e6f21dff0388ec6db147a24b5a9294bde8676c7f4fd9178add053277e018ebbe68565eb702c58ea81d98954182e669f5ae73d7ce302c25f88cff48d35c47 SHA512 a9f8d371e81f61d357ad3833050a88d7f048cf68fe61d59b9f0d56e7c6551dea9d59fcd762906375800883d4bf2467a8e559384178dfd14369f132f1503f5099
+EBUILD rpcsvc-proto-1.4-r1.ebuild 792 BLAKE2B e10068094ccb624584282d9a0244582da2d647ac01d3188e97007aa6b50555336e03ade606e5c8524d9a1adf3d04f0b94204d96c16bfe219753a8a96ae866c0b SHA512 279a0cd728c900657e5f9455fc707a49dd2ef26f5356dd0c8c6ec3275a001328ccb7fc4261e9726b242664e8e9f1bc2e1bb4c833b6025544fd7402565147f794
+EBUILD rpcsvc-proto-1.4.1.ebuild 739 BLAKE2B 36d56f5bc792dbcd995fe3181f0a1793c115141f9790edda01935a7bc0ff00cba7792485314448b9b4f0a36caec70990655df1898b92bc5275af85c0f66e0d2d SHA512 f8b0768a5b6cb398eb24cdb9c8841af7114bd1f3d4377ccd143b7199a1403d9e6724717579e9103aaccb200d97ac84d0c8c913cc5f9b55deb2eda6bc165b8b0b
 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 bf9fff00b94e..6155980f7935 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -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 sh 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-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
index 00f529920fdb..89770401b6f5 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
index 4b863b0cd4d2..6898da16fe7c 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/rpcsvc-proto/rpcsvc-proto-1.4.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
deleted file mode 100644
index 30777161fd70..000000000000
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="rpcsvc protocol definitions from glibc"
-HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="!<sys-libs/glibc-2.26"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# provided by sys-fs/quota[rpc]
-	rm "${ED%/}"/usr/include/rpcsvc/rquota.{x,h} || die
-}
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index f9de23325823..804eac071cad 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -7,8 +7,8 @@ AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.8-r1.ebuild 2072 BLAKE2B 9b77effbbd3e992e6540fdcfe56243a878d73e9b03a91fba583e40d9851025a02361913d5bda2e37c3d6a686bcf4d0105bd214929ae82b75ba5f315604ae44ef SHA512 67af73ea366fc4dbb5eb6ea2c5e72bc453ca0e31cab28b2ed859fe920d4ddd1e776a1252e42e8e02c40bd1bde833118ab8849981395a6dd3752a27496baf4667
-EBUILD serf-1.3.8.ebuild 1459 BLAKE2B c0c7588273ab864c5c64df653fe895ea7c74c6d6696d6b40e4633f253a8e88c182651ec9e7604d81fd863ab47d84d9d8fad7f3be862e4b7d3a3d49a6d82e2958 SHA512 22e9f33a00af023027b8bedea3139c341ce38240f3d598a749a56f648203bc4a1da1a106de77f635c64edfc1b157d606ab01a57f9e70d0818cdeb576c808f09d
-EBUILD serf-1.3.9-r1.ebuild 2066 BLAKE2B a049b9aa26d7433a4634ed0cee0d44cab2ea21340509892234c950da7dd5f6046ba904f39ed73933d1e16c8cbfe778714c2eb769baed591bb6d22c7ad54c2181 SHA512 4f5f477cc4ff4375745d244f3c0aeef39201e5f2eb92bda77e5ecb94975733be3d1bd0dc15156c49609650c3e60ddd2e6ab98018918af2e508feab9f9a4945e9
-EBUILD serf-1.3.9.ebuild 2074 BLAKE2B 5ed91da31ae5b016c3e95b2ee2046425a8f60f2098f2e7fc23c64e5e5a0c969015681df9c9158a3f2afaebf283d80c042b98d4ad21f47069324e758696433f88 SHA512 95e3a931a29f6bf703914e5e53bf5c903b3b09e172acd9291f69eb2a077e2ca6c15187295f09cf22bf9717465923c8d1fa94748cffd9b7f883eb11ee88eee950
+EBUILD serf-1.3.8-r1.ebuild 2069 BLAKE2B 65a5e2ff2eed6eec0119275ba9547ff4b7a3ce78dca38374e45a8c060f2ff265e0cf7afb504a3c26476866b6579d597785a919905b593aa04685299f91c412fe SHA512 363a3430963cc39cf7f88575c401186d83be1c92b226d2e1356d84c3ad60ce3624ec78c398f99144d67cc26736705b9028b1cbccfde0e8d005dbba4c6a481a89
+EBUILD serf-1.3.8.ebuild 1456 BLAKE2B 17382c17f6e9cfd9c86a7439b4bfb809044cc109e3cea1e9c0f072ba30fb5997edbcee40b46e55784feed6efca4d169329baec3ef9321e7f24cf0228c4427953 SHA512 a06af1e5c87bd64727f309b0d85ae7676b64d0847c0cca44a2389448cd092350f559e67b213cef130e72b38b0425ee0e4a297f717832f9e132e1213adc80ca33
+EBUILD serf-1.3.9-r1.ebuild 2062 BLAKE2B 3a7d34b180841e89c7a30d8602c9ef404e3d209e4e4e5d2a8949fae157129eaf2f3889092691cd79a5f2e96f2fa8cd7e0f84567bfa559f7c2c7661afe418ba32 SHA512 21594b3383cdc8e5c3703c4dcf91de3c429c854b8ea58aeadf92ade890c161e548f562fc67b9a52163945a2a16d4c6eb59678b908000c492328524f72c124fea
+EBUILD serf-1.3.9.ebuild 2071 BLAKE2B 706481c2dd5e1f3150d04cb55bf33396010cbe9980480497fcbf5eb484cda2d06a6da58ce5d17a18587a7cf23c904e34f8d05217dbf827c7bc5ac6bd14d68077 SHA512 c05e6f9d6eb392836c80d553b3d56fd7e4b3b2df09b3365c2be48a4eefcd25ddad389b19aad6e8b82867bc796890240acfa081a1c581f75c3b6430fb8aaf4699
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index 65488051ac47..f951a44343b0 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
index 0071ed7279cb..5fca0dc8af95 100644
--- a/net-libs/serf/serf-1.3.8.ebuild
+++ b/net-libs/serf/serf-1.3.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="kerberos"
 RESTRICT="test"
 
diff --git a/net-libs/serf/serf-1.3.9-r1.ebuild b/net-libs/serf/serf-1.3.9-r1.ebuild
index c01698dc85d4..71fe28dbbe1b 100644
--- a/net-libs/serf/serf-1.3.9-r1.ebuild
+++ b/net-libs/serf/serf-1.3.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index bf6fda46ca88..4b06dc39a97c 100644
--- a/net-libs/serf/serf-1.3.9.ebuild
+++ b/net-libs/serf/serf-1.3.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index 353f83e7e92e..bc7318e7a4b2 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,3 +1,3 @@
 DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
-EBUILD socket_wrapper-1.2.3.ebuild 477 BLAKE2B dd761aee1c472cd1dec987541ba73286ed7d9e68cb78a5cd12aa853b0885cb5b79a64ad33d389dfef5c446ba15a8bc2ea917f7f48de16d4a4b6acade80e0ecb9 SHA512 d4cc629e0a46299f29d5dee1ef49b787c32eb54e00d2b3a78b2b7e8fbb5c4d990f5042b5c266c1cd46d7b4ae67b0d2bc439f23712f9d423d610015d883b9a12b
-MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
+EBUILD socket_wrapper-1.2.3.ebuild 478 BLAKE2B 84fad9a5947c2242cf36633c0ad7643958a658141a95ca3e9c5579add8a549f1fbc3b478cb04343037dfa71329ecaa97145a29136a1528280b1419469bdbdce9 SHA512 1d31e0d4940f6fb2b37dcf83546259ce0861d2d618550a6e5bddf65c4efe979ea4155bac16046cd45a70ae244d4935949350933b9a68c27eda1928913e7a104d
+MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-libs/socket_wrapper/metadata.xml b/net-libs/socket_wrapper/metadata.xml
index f05d1f266834..48f6ca46f45a 100644
--- a/net-libs/socket_wrapper/metadata.xml
+++ b/net-libs/socket_wrapper/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>samba@gentoo.org</email>
-    <name>Samba</name>
+    <name>Samba Team</name>
   </maintainer>
 </pkgmetadata>
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
index 9214fbdc49af..a34e9de9815d 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://cwrap.org/socket_wrapper.html"
 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/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index d711b56ea84f..1918aa8e9c04 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
 DIST sofia-sip-1.12.11.tar.gz 2927808 BLAKE2B 2723aef491b5f85c047cc54a191fdd2ae63b23445f24b6ee9910af88e2daa684eded6e44cee50c3a52bec2901b5310f34c09e7cf4efce714210755046ceaecd7 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c
-EBUILD sofia-sip-1.12.11.ebuild 827 BLAKE2B f5873a2708aad931a3d3077948518e24d6ecf8dbe368b86d6997a14593b6256915605461683b387e98354449f07242967fd550a00a9256e42eb1d157e5991cdd SHA512 3adde3c1ce0f05434cbaa3f29b07929027cb76b2ac6f2a039655aa4595f7f5873b6628e637f871fe2472e7f61a093267f0743298faabc414e7214d681cf1b604
+EBUILD sofia-sip-1.12.11.ebuild 828 BLAKE2B 010af087e22537d2a87bcfd2e57231c9eda8cce7d6335735a97fc0b4be077d423a1306bd8b72995c0dc825a961f79da44cbc082f660aeeaa17df500f2f89e847 SHA512 035c398d3ae23dec5abafcad47f273b5ed2c768f64283514716865168cc7082bef0e21f8912985f4abddb3d314e212888ff14734c87c85db1afab99fca309a56
 MISC metadata.xml 332 BLAKE2B 20075415729415694d925419349c24403e4dd8181e0e3e2b6dbdb682d0cd9625dcf6196152ee4983615fa34c7b972e10799d190fcde04f4e4ebd4e41c3fb942f SHA512 cd0911cea94332c8e64908a7537ea78683c562638aac05ab1659873ce5c43d378fedb09f848badb12258078779a172ef87313a2b6fb5001a3f33bd954ce7d420
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index 243bb87cbb21..74133e260599 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ~ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="libressl ssl"
 # tests are broken, see bugs 304607 and 330261
 RESTRICT="test"
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index a7a748811a7e..08889e2c6d19 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -2,7 +2,7 @@ AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 DIST srt-1.4.0.tar.gz 1293647 BLAKE2B 93edaa8b1d2b59776bc3efc851a5216e0acef3766b47100646306bb04e3054d4cdf612da07bc5d1124380abe595733393d7e47f1885282a75e24f34b688ddb1e SHA512 b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248
 DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
-EBUILD srt-1.3.2.ebuild 1248 BLAKE2B 76ec8b0e6b7e690ac936156f966400f3f581cdef2c9b1d2babc23d794f5861cab8d46364b2727a3b8020149dcb4d410fb0d76757e03117b94edec2a98a607ec9 SHA512 99e1c067191a0ee86ae749018174b0205c9093b1d77962fab0fdf162df26c9a06136956b72938daf49b3f1a9421244f727df7d558f73f7661f18ca9a70a58a71
+EBUILD srt-1.3.2.ebuild 1249 BLAKE2B 39bbdf7d0b084a4ac565f40f3bb319cc45c22e8dfb56ed20bd1151b2fc0b8d3bedfd15a4cb2fc833a560f20ce80f1f47dafc06b04ffb9440800c5aba0ca854d0 SHA512 c68706435da477b271334d4489b76ca8ae0fedd01f0dd780c1dfe668c510185fbb12e5608dfabae6bd313ef4a71249e87f20eda8557f95538df6792ddbc6b634
 EBUILD srt-1.4.0.ebuild 1254 BLAKE2B 377d38e6480cd261ea5106b8a735f343850ca52b525ce685bff11a0a1d15462b534f0c12c7aeff804cad91ac3d8ddb4c26c8a08847c9d443638cf06cc145f3b9 SHA512 8cf2d9f7162b27435b6474b57196624c4dc948abfbc4fb06bdc9ad644f8c87b1180783bf464db93018134ab08f86402caaa6ef407c0961ca64c22ec015eb1801
 EBUILD srt-1.4.1.ebuild 1254 BLAKE2B 6597b3e6ab38d5b8a0108b71a7a0ad95966a09119eb4be270f6bf7473a21f79f968f7515f9557f3652cd0ecbcd6f9c4e39fd0c008ad2072e223b8e7818426536 SHA512 cb585df5671adb3414c7344830ae9d1dc7bd85912a9f075a37b2b764a8a677d379524d187018902d20047995be583315fc6d4817a0ac095da218365d90834301
 EBUILD srt-9999.ebuild 1348 BLAKE2B 211466b0989c4a1ba51cd329746bb80410bcc922a30c800333e7dcb34762bf0752ae16847949d6d6b7acc49364b333070becb4e8bdcf205d7d5761f1d2d80f5c SHA512 99b05466a3a7e6809c1a79c07486ba2dafad524cec4e01617f026f2c9f463f079ed2557822477dbb33cb9541e075e892045a1aff7b0ec24148b8f0eef41c8448
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index e988ef09fb62..6e2cd2ff5ef9 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -13,7 +13,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 ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index d4452220ec68..1c1bec61a476 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -7,5 +7,5 @@ EBUILD stem-1.5.4.ebuild 1273 BLAKE2B 84c053e28a46142740b0e842d90b240b69ad0bb792
 EBUILD stem-1.6.0.ebuild 1273 BLAKE2B 84c053e28a46142740b0e842d90b240b69ad0bb7921aaf939f186ee5c7a03f388e38a8a1719ec9e69f004356ecc3ae527ba99cefd44491ae32529bacc47aa435 SHA512 55719fee3ec3e61489019272a2e2b48e392b3142f7ea5c1d5f5ca8cf8b37159ad086554e447bb7a5d2ba824295e842940bc2468d7f86a6a37404682db13ec00f
 EBUILD stem-1.7.0.ebuild 1374 BLAKE2B 35cdb0469f371c54567ff80cfec32004c25528d9d0700abe383d4607bfa6e6ac34c45975a532017c5b986aad6d1632e8008ac414902bb14014e015e36e56f517 SHA512 2ffdda0ce1900d247774a0bd372f61a0e68c357b57c560e612c99f1e9348c8148c4152c25b5ba7101eec62d1351e5b5f664d1f6b0f4be03b0332fdbc8a5bb946
 EBUILD stem-1.7.1.ebuild 1374 BLAKE2B 35cdb0469f371c54567ff80cfec32004c25528d9d0700abe383d4607bfa6e6ac34c45975a532017c5b986aad6d1632e8008ac414902bb14014e015e36e56f517 SHA512 2ffdda0ce1900d247774a0bd372f61a0e68c357b57c560e612c99f1e9348c8148c4152c25b5ba7101eec62d1351e5b5f664d1f6b0f4be03b0332fdbc8a5bb946
-EBUILD stem-1.8.0.ebuild 1374 BLAKE2B 35cdb0469f371c54567ff80cfec32004c25528d9d0700abe383d4607bfa6e6ac34c45975a532017c5b986aad6d1632e8008ac414902bb14014e015e36e56f517 SHA512 2ffdda0ce1900d247774a0bd372f61a0e68c357b57c560e612c99f1e9348c8148c4152c25b5ba7101eec62d1351e5b5f664d1f6b0f4be03b0332fdbc8a5bb946
+EBUILD stem-1.8.0-r1.ebuild 1395 BLAKE2B 4afe6611c452370d883502c030839ef0ef0ad2e73f5bd3a8cf754618311a02e8546b34d1fe400f1d0337b970f7bbaec9105c4bc85e01824a392a9350873d8fb1 SHA512 23f123595f9d164944db326b3d1f0077ff7096357d39a8446daa243d556ba79f4552a3235d9f21f83ed64a552765c775c8da9ce9bbf6aef416558f19f2054bf1
 MISC metadata.xml 329 BLAKE2B 78eb533a5eea08ade1c17f2a70d204af1452de6d09cab0e4e06582291469b2abfca6cf86dffcf339797285590d3cfca481f14078f9cd5aaf138ba88f95877bb8 SHA512 e0be0234c4994bfff08e1790f82b8728a33961b9896ff5483b19591e2f00fe4b4ad83d42b59e64c056b393c35ec9ae92737f181d9549655853605537ac017974
diff --git a/net-libs/stem/stem-1.8.0.ebuild b/net-libs/stem/stem-1.8.0-r1.ebuild
index 95d26e15939c..d24b6703b468 100644
--- a/net-libs/stem/stem-1.8.0.ebuild
+++ b/net-libs/stem/stem-1.8.0-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=(python{3_6,3_7})
+EAPI=7
+PYTHON_COMPAT=(python3_{6,7,8} pypy3)
+DISTUTILS_USE_SETUPTOOLS=no
 
-inherit vcs-snapshot distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="Stem is a Python controller library for Tor"
 HOMEPAGE="https://stem.torproject.org"
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 5bc923bcb7b5..25c1558d1962 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
-EBUILD telepathy-glib-0.24.1-r1.ebuild 1484 BLAKE2B 51409cd00b5bb79efc3147ab65c266bd6a5fc665782c5e7921f70022c7c4ef79013b69520da1a2d9e2bb0ff104b956e5b243066ac568b745e77a0300a0a65afd SHA512 c46ae24155de0d6ebac3a759f65f824c6da0725fc8f58fe91047b1acedc9768bed180ae6606450f950c73cea43cac91d5e15a6daed04d23947fb99b99c7c9848
+EBUILD telepathy-glib-0.24.1-r1.ebuild 1485 BLAKE2B 4dd404d1cc06092d2bd6a831ee7cf46572ad3289991367927566126afa8a9682127a4a694e2885d35f24855de583e94e979a60eeb02465ec8130322206293a0c SHA512 0b8e5f85908d52f2e0c39c05f57f417aaf4e4ec2377db281845a2f3ae9a7a097762170902e501d00ed9a32ab53140150e473ecc6f6c46c3370a6fb960ab4ee6e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
index a1622c2cc1c5..91712ab80a5c 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
@@ -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/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index c79322407b8e..166d868704e4 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,4 +1,6 @@
 DIST telepathy-logger-qt-17.08.0-python3.patch.xz 16228 BLAKE2B 8226a6cd0537e46edadccc50027da6386bafcf3e5cd2d9af2f7ce996da30f42762f43a00c1274771a15d3fd2e5de912ad0833cda6ad7630f1d25492cc27a9bff SHA512 c762213f09933ee08b755d830fd32309fb248ff91f2d4c0ac04f7096e874f2a63d7231aaf5abfc4245cf6f66056d2e9cabb6a83b0c561422efd0e8944bc05893
 DIST telepathy-logger-qt-17.08.0.tar.xz 94184 BLAKE2B ead0598c1f2f2786e026af15ef1424347b9ec9ac7d78b1e90943a8e39db1833f76353b9b9c767470fcbf635438fbcbcc52c9b969318341128f66b8b9ad5eb14a SHA512 1768509b61d83cdd39adf8abd74f71d0c9ae757411e08017c6788fe50962b57768a8fdc9fbba75f5968bb22849ff619e790323806d29ae63066e41cc5f22c366
+DIST telepathy-logger-qt-17.09.0.tar.xz 93480 BLAKE2B f516ff58b64a59ba3b51c0daf0c871fd0e03b7860fa94f2139175cccb3e5ff4f108b09db22366bdc2e4031556ab06712d1d935b8db7b1ed9b08803f047c943c3 SHA512 1524673a7dcba0d65c57e49d6e0dafd1b826b6444faaabc1dc482b29f6515374a1beb09a9bbfb115097e10fc18722ffe0187dc1bff9be06dc56a95ef32d805e3
 EBUILD telepathy-logger-qt-17.08.0-r1.ebuild 835 BLAKE2B ea106c3fce96bc9b6e95c8be598c42d4eb66d19138651815eabf50a1367122a7ee824fee6ef8347d57b6773d4738197a198f8aac5e9240b87c204db037dff3f1 SHA512 7967939f0f7da4cba9440d412aa2631fcc960c53ae6027f9895192e1ad9169acee9b2f229209787e0b24bdcc2f46ccc7b00d4ddf15924c4e552630b3a4af9fda
+EBUILD telepathy-logger-qt-17.09.0.ebuild 729 BLAKE2B dc88e546f31c4e6f76bad04eda197b12fa67c569f8c1733116e231bfd24491d298227bd6ac936ec6397419559c848e76820d8ca43a7dabc7ae3923b3550662fb SHA512 45c4ecc7496991e3db168587f8805f3e4b56c60d75c1ce24de12583da1c0f34926d4d4943d01dd835d632468bf9706d81cf00b3cdcf41ba6065daf3e49b58d21
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
new file mode 100644
index 000000000000..7f3ef62bd480
--- /dev/null
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+QTMIN=5.12.3
+inherit ecm kde.org python-any-r1
+
+DESCRIPTION="Qt bindings for the Telepathy logger"
+HOMEPAGE="https://cgit.kde.org/telepathy-logger-qt.git"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/telepathy-logger-qt/${PV%.*}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}"
+DEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	dev-libs/libxml2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	net-im/telepathy-logger
+	net-libs/telepathy-glib
+	net-libs/telepathy-qt[qt5(+)]
+	sys-apps/dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 48480c3c0dde..bd191d8f2246 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -3,8 +3,8 @@ AUX initd 655 BLAKE2B bc837b09c4d75cb086bc1757ba1b1963b60ae2123ba041a53557a2ae7c
 AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822791d2feccb8e44cf09e90779986210bf854c0cff0d1b4519c1b4acd92723e92b8b262859f7d9da7ee55e9 SHA512 0d90ffb47e42013af68b5eb7ffb03d670523b20de17ba7fe63e227502188cfd72242450d09e94d381fa201cdff459307622c9ab19f3bf651d6948979e103e3c6
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
 DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d86e472ec75ff45ff826712efa515682f9439181d52444b2a6a21472c6e78a3bea5bb7e356373faf733e2644a315d SHA512 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7
-DIST c-toxcore-0.2.9.tar.gz 510806 BLAKE2B e67bdb86757d1431cc9d627dbc9afa9f54c3deb7814b38c2126849d10e9225aa58d2b23d175622678be74894ea197d3084719422a605d95eb4c55c4597a79f98 SHA512 917826a906a9ca4f04f34494616b8e36ec9e74c6b0709c50e8fe2dd9da680d170013fef242a3fe1b834e8e54cd2dde6be1c14e5d977f8531436ef34280bc3966
+DIST c-toxcore-0.2.11.tar.gz 507476 BLAKE2B 67e86a5e5c8da1c387a319e6726eaccec28608f165f0b165d12e379cc7d8080baf9b89f438804ab8e59a8690a11bebba7f2ef689554800312fe039da77e70cac SHA512 616b30423a170463b4445f6940e038fd9af820946c970260fcf72cc54d08d2615364b9f086869180e3ae26154ea92fea6e9a602366306bc40c3e1575e86350df
 EBUILD tox-0.2.10.ebuild 3121 BLAKE2B 119362aea67de51c2e81f177d2270e8078ce5652c375dc65b6d83131448848cb0e46e2c25b28ea8d211c765e8ac7f6792aefd79cd121168a44b9fd36d8dda93f SHA512 c46a1896859fa5015737997eeac745edbe51b3c98e7acff4809c2322ea53ce0fb357e6e59f39993bfbc3d2e598210b08412de4180d3a48c3a4a0159fa633ea5d
-EBUILD tox-0.2.9-r1.ebuild 3143 BLAKE2B 188753e018b3e7f1b0d05aacbdbe1228dfe2a88daee901172a59307263b02e7542142445d57118aaf6ee8ec982f447e2f93edf3cb2fc76c9bf1e38e10fbe948e SHA512 8dd507bac0e293439a24f75209f01086f00e6809f5b6d0e9549b628862edcfa1126ac859b7dd29f410f879322452c47df3e73b1492c8c49b6cf6333c197610f7
+EBUILD tox-0.2.11.ebuild 3185 BLAKE2B 075ab6798fa2b54f4b5241acb85f9c3c66d97721151b4f95ae4bd342a1023f92167b85aeff0dd28949d0ab21d4d183fbac9e96c863cffed4fa1b20f703711ac6 SHA512 0a2a65759bd61ae3b8efae10e8c6b9fb875fba5b4d968b11485a6a13c6a95263176f3b5bcd8298222928b35e6393e8990a50ea2d609cc105c7db227b14eb3294
 EBUILD tox-9999.ebuild 3060 BLAKE2B ee68a7b8141408b59296d0ad7c14ea69d082ae31a736ea4405d10c35414ae91146ac8442dc242a86ee4aa79aa2652dee975d79f9905dd420263d670ee39981af SHA512 3f45c8b5d5e16c9fb52a895b15ba65036bbcae0e8086eac804aa6dd8cbdea4cb1dc3b2402e69c960444dd0ecedae28c2bf3cab716d9867ab97403e976eae1ec3
 MISC metadata.xml 870 BLAKE2B fe6cd17ce54fce4f002d1952694a0f3b6cbfc55be321de1256590721aa6d2e248bf8e9b080708c6cf06bbf8cccba327dc71a18223500d1a0910d1c6edb9ffc55 SHA512 7600b6b0558499e346cec1d6f5ddfadfa7a9fa97187737febe8076379af759f30f7ba90c46f38c70b69a91b39a365c7deb04182f6cc77ba54da9bd792ceb2025
diff --git a/net-libs/tox/tox-0.2.9-r1.ebuild b/net-libs/tox/tox-0.2.11.ebuild
index a6e9875d9fcb..4dbce23e16a4 100644
--- a/net-libs/tox/tox-0.2.9-r1.ebuild
+++ b/net-libs/tox/tox-0.2.11.ebuild
@@ -20,20 +20,26 @@ REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
-DEPEND=">=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
-	av? ( media-libs/libvpx
-		media-libs/opus )
+DEPEND="
+	>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+	av? (
+		media-libs/libvpx
+		media-libs/opus
+	)
 	daemon? ( dev-libs/libconfig )"
-RDEPEND="${DEPEND}
-	daemon? ( acct-group/tox
-		  acct-user/tox )"
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-group/tox
+		acct-user/tox
+	)"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	cmake_src_prepare
 	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
+	for testname in bootstrap lan_discovery save_compatibility; do
 		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
 	done
 }
@@ -50,13 +56,10 @@ src_configure() {
 		-DMUST_BUILD_TOXAV=$(usex av))
 	if use test; then
 		mycmakeargs+=(
-			-DBUILD_AV_TEST=$(usex av)
 			-DTEST_TIMEOUT_SECONDS=120
 			-DUSE_IPV6=$(usex ipv6))
 	else
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=OFF
-			-DUSE_IPV6=OFF)
+		mycmakeargs+=(-DUSE_IPV6=OFF)
 	fi
 
 	if use log-trace; then
@@ -91,12 +94,13 @@ src_install() {
 
 pkg_postinst() {
 	if use dht-node; then
-		ewarn "There is currently an unresolved issue with tox"
-		ewarn "DHT Bootstrap node that causes the program to be"
-		ewarn "built with a null library reference. This"
-		ewarn "causes an infinite loop for certain revdep-rebuild"
-		ewarn "commands. If you aren't running a node, please"
-		ewarn "consider disabling the DHT-node use flag."
+		ewarn "The QA notice regarding libmisc_tools.so is known by the upstream"
+		ewarn "developers and is on their TODO list."
+		ewarn ""
+		ewarn "There is currently an unresolved issue with tox DHT Bootstrap node"
+		ewarn "that causes the program to be built with a null library reference."
+		ewarn "This causes an infinite loop for certain revdep-rebuild commands."
+		ewarn "If you aren't running a node, please consider disabling the dht-node use flag."
 	fi
 	if use daemon; then
 		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index caa3e052b11c..546c38cd2395 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,7 +4,7 @@ AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e7
 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
-EBUILD webkit-gtk-2.24.4.ebuild 8450 BLAKE2B aa5c958a3b3961bb8e32ad0571dc18e69ebca19b22ed009e3398ee97ef137e19e1f997e743723491bf7c37a32f1cba69e21fbddb61d193f42b35a0ba48bae16e SHA512 6294d57daa1d3bc6ad1ee775c2bcadd299d6ce9498a77b84b1492704accc5442a2022e1dd52fa715b0668f6ab15e09fad6d5628a2d4ec1eee5cd2720f2e6e723
-EBUILD webkit-gtk-2.26.4-r1.ebuild 8751 BLAKE2B 12ea689a54a4edc3f2058cebc709702bd64e1b41d00bbae9ea9aff3453562c74ec9d5d94569aa5f1a4e34e4fdd55c354a95375e95f1447b54185ab5e2f0b0df0 SHA512 f53e17611ece19ddbf8f488bd80fcfff238c4eb8a725ea87534188b54c459d2839ca838efff9124559517ccbcb5699f81b3c1e8c40250e9f171e8255ce079f53
-EBUILD webkit-gtk-2.26.4.ebuild 8749 BLAKE2B 65b5c544b6713fc151dc7bd4b8419eaf59be2b6ab3291a6d5463352ff530c9c77da7afd23c63bb9dde48a77751e9af230f3eefeddceb38c5e2349c397b5d6971 SHA512 e3bb0dab5af99db0774d382a7d8c620c8de583b959e4c7c0c5c67339bdc4a11a966fcab3ea583525e7fcf331f62570d2e0fd7330cace6010a09acb6d572c820f
-MISC metadata.xml 837 BLAKE2B 58680ed3ff0941924b33c03aef91322437b90c88e46951bf780b99507b7dfd599d055c8109a45e8fde18a9d871c19b9e86d21550cd0a01bc3e02db2f075ccfda SHA512 6a8191200dd2e84ac2cfaedeecc753d8a9201d764acedd2b11c707e8ce21ba5b0e91e73c4342efb33c96a46a65c2a67736cb32599f07219acc9bdd38d453203d
+EBUILD webkit-gtk-2.24.4.ebuild 8444 BLAKE2B 0e07771b88a5956fb5b824d3713d6e2ffcf3e6abc0238efe8059bfae5d799e2198174b0ac015b57f8688b9055992730892e05bbaf106eb7f0df98d6088a5d481 SHA512 76d4910adc9c2a69a589e1261eccd7188aecb890cd818271e31a5c44bdfeddea82ef14ff1e513d8c35d9560b9b9460598d574dc55eb60eddb1679335f9e82b13
+EBUILD webkit-gtk-2.26.4-r1.ebuild 8758 BLAKE2B 0779af3f244bd5d36866c79e97150c17a714f5f3469bc33e1bbecd9078f91f4a3ab699147ddd9819df5122e4e60bef2e35f0a7890872ecf7972f086aa3469791 SHA512 67cf5221da862dbada5d2bbc88a2a587674f9233dd44553b84cea3939db495647878bb910a34ff8d240d680b804761d554ef012d5fad20e409216d065cb4d626
+EBUILD webkit-gtk-2.26.4.ebuild 8755 BLAKE2B 8b2c147789ae8e0e71f5051f5cb48334e73c1d2ef3d73a1f229700661c24c6cfe3485003dcf8dd8c5d3dc57c35ae724537fb9fcb598c5090a39e90af62986195 SHA512 caaf03779f43c9cd402b4118f75adf26563b7a112b7111a7bc2aac5d639575bad780db2612857f38f2f80d4adf0b563e98050b7df55ebf4f773b62abde038306
+MISC metadata.xml 760 BLAKE2B b6b93a6f66b0145a6cc95f62d9f4a19e6d69c337c6be1ab8aa6c2a2a5de5bed19466f388908bed34bc77b90285297f8dc2f332f70abcf70fea81a2aac8288c99 SHA512 849039d811ebc06003b7dfe505c6cf809b3feb95dd7965dfef41aa8c9ce2dfd773d019741fc66e784bdcde5f91c216e0f96f887647f3723778a21e500dded8f2
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index e88c10a5699c..27c7a387561f 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -10,7 +10,6 @@
 	<flag name="egl">Enable EGL support</flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="gles2">Enable GLESv2 support</flag>
-	<flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL</flag>
 	<flag name="jumbo-build">Combine source files to speed up build process</flag>
 	<flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 47f5da095e91..430f780b0e2c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~arm arm64 ~ppc ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
index 984486444020..83663f86017f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
index 3fc54945ccea..48c9e084906f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 6516fc61e738..2308e387f4ba 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -3,5 +3,5 @@ DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb
 DIST zeromq-4.3.2.tar.gz 1697442 BLAKE2B 70a1f6da357987c32483050fcf86cb81a1fb0b65a527f6900f54eea8958c6aa6024af04067114663824d42305f507cba67e03c7aaab7e23e4f6332d4368613eb SHA512 b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4
 EBUILD zeromq-2.2.0.ebuild 1230 BLAKE2B 3481bc6a49217938f6fff44ba4a72642ff3abb7dbc18bd911dafba960d698bc61ac88645dfeeca06b570d5730789c4d27344d60c2b75e188b30261b67465f5c1 SHA512 f11d23122d6ff6db52b5c625a5e2a994c0ab9741681e1be2dedd6f6bfdc3be9107141dedf9873a448447e61e1aeb1cab025ca37a2948930bc38ba780d25c612c
 EBUILD zeromq-3.2.5.ebuild 1493 BLAKE2B 44f12a38570540f82df5381908f68759b02a423b9a0e9ff014432c02bf6538f2fd08380eb241a6ef7bad12b50bbff0e53b72a05cea11dfb012dab3b229b7c3c8 SHA512 2b5999497c19de44b8846ee173d8dc96ace8d2e9ff1c9f0e1e1ef8633513ed2bea7a33cdf2947b8c5cfda36911a405132a71114efad45c1e40ca6cfb878a0918
-EBUILD zeromq-4.3.2.ebuild 1435 BLAKE2B 0d02a1ca2bbc9645e54deaaf1dbd6b0726fdda72cf6bb0e8735e78dc4a5fcb10bbf468a97de5f83ce4d3f50047cc1fd1174439fb6080abb8486693f86b379f41 SHA512 d956edfe303d77fd218b9d2d00b422f51c165f2e07d5dff06f24ea81ca32b44e8a13b89dc48713d434dae747feffcc4fe482b039cb0f945b450e515245201063
+EBUILD zeromq-4.3.2.ebuild 1436 BLAKE2B 500b642be77c2ae67926d932eddead3a872bb6cd5d0a752e2b7fe87f5ce4ba52b3256903f05ba62e923985637fa3c7af08fbbf504cf79b7caff2d74a7f794397 SHA512 333b64802cdafc872e5db83fc3566f6f307e07cdd668939f0c955e6bed2c156dd02ffde51fc17f393842ca13f57a5ec9f44f459eaa02d5fc9ee13331b9600926
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.2.ebuild b/net-libs/zeromq/zeromq-4.3.2.ebuild
index 0874e5a0f299..a35a1e964c01 100644
--- a/net-libs/zeromq/zeromq-4.3.2.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-libs
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)