gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /net-libs
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
197 files changed, 798 insertions, 1201 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 8e6a1e466f1b..705950ea1b1b 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest
index 802d8df1a2bb..a105864ea8f3 100644
--- a/net-libs/accounts-qml/Manifest
+++ b/net-libs/accounts-qml/Manifest
@@ -1,4 +1,4 @@
 AUX accounts-qml-0.7-no-tests.patch 307 BLAKE2B 2faefed0d6de1d0f271aece811b5fa064bf67017a8964ad4cd83d2b618e30cce6fabc0272ba3fa5949da1229255602a4b86191dd9e27a91c9f95fd20cffb26e1 SHA512 d0b199098bd7993178084b795138fc87282015525d11e14913056fbaa1b0954fd37d2ad6bb56855513d900fa0ea7a4a4beb31de6bdd4338785bcba9eb1df2eba
 DIST accounts-qml-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1
-EBUILD accounts-qml-0.7-r1.ebuild 950 BLAKE2B 93ca277c37af7f038abfe0713fbd4817d9efee5fda7284776c5df557e375478d00da1e8334f49226391416facc440def49aa741ed540eded891e96c8fea5543d SHA512 69464f8a6e33658b4e730cf0742c4131348a311b996dbe64220f74071d8ec78d3eed7de0351a955cfaead2d02f17ae897a69c7a7679a67fc0ced4b5d8fda6e43
+EBUILD accounts-qml-0.7-r1.ebuild 957 BLAKE2B baad8108e86fff3111dfba98d278cb3036433d3c3ff6cde753d1d0e5a4fd1c8f2ed2406b50b769d288156f4ce613de2fefd9f3907f8dbf4791806c7f2ecf2666 SHA512 9c72c785e91cac3da59710be61edef09f4ce0477a2476822aca1947f52d1a62e39f02955584e1edee3fa0977377b2b82b5258e3ab0752aca053a090def4e196b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
index 275e673dde18..f64502423fbc 100644
--- a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest
index f40e13006b53..1ffc04c2081e 100644
--- a/net-libs/accounts-qt/Manifest
+++ b/net-libs/accounts-qt/Manifest
@@ -1,3 +1,3 @@
 DIST accounts-qt-1.16.tar.gz 64445 BLAKE2B 380d34857e9eef5bec1f1a3d1d789c67b709e8a80b648c61cb4fe4bfe84fc08e18b88e1729dfdb35587c148781574b1a2bd9973cbbc87fe6842b6c61e3d0035f SHA512 ea495f508cd383a8f936277b5e86ceda86b2912d262145e8c097b713d53c14760c6b5b8cfb58de1d0aeee6d13be504fa94a78db07ff027ea9d28f5a43d4a29c3
-EBUILD accounts-qt-1.16.ebuild 1135 BLAKE2B 557d0ec4edf2be2e2363346b08447f571e3df9adad1b7d14350f9d35283205d8a35c2ec3e87ede3e467cfd9699382e8df2e77e54a5b5fd70a676ab0c3c31eb18 SHA512 f67647ea7d04edbefafc64cb89adef1c5ffb92183e7a6c5e37dd6e68768e165d4cea73c11c9464c38bef7e26675871e137d183fac7d887c246b37ccebea65292
+EBUILD accounts-qt-1.16.ebuild 1142 BLAKE2B bbd2926c482e7031b18a4a9fc8b69d82a4fbf04b5cb9a74999bf112cfee70153d1210ec1ea6143f06fec89a330500b50b1acf84520899b2b4d436b0196920ecb SHA512 4e530d2f259835ade132d8de0a6f4b4bb31d88519516d7af45e17cae4a8917e1784fb9b782f35d7aaeb682b906b8f7bb393c88900c0321f0b49d6bbc8db40f4a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/accounts-qt/accounts-qt-1.16.ebuild b/net-libs/accounts-qt/accounts-qt-1.16.ebuild
index 36384c3ff990..129f2b2b9013 100644
--- a/net-libs/accounts-qt/accounts-qt-1.16.ebuild
+++ b/net-libs/accounts-qt/accounts-qt-1.16.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://gitlab.com/accounts-sso/lib${PN}/repository/VERSION_${PV}/archi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 22afadfa4886..2fb3526b6d86 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 4584 BLAKE2B eab69e7acdb6691357123663d02daff808c5e892f935f358f2c9271ae8873ec42ffe44c2996b0c363c9ececf9f7b3e27eb9cf03c42a40fc5ee1764df989a8fd3 SHA512 821cbce58b6a6091956a10d51147fbf34d965dff7f489ea56c834f2a44004d3d2b648e47617d4f8a3531f3f8d976913d93733c50536d562f0d4c536034432821
+EBUILD c-client-2007f-r6.ebuild 4585 BLAKE2B c6b441bcbd4ed9cf73aa27dc3e47aaba6e37095c26b657966af6fec6812fb5e293d4ae9e2b8cb1d535d241f70bd6e893fb41858493fb08ee364bdf71c19c7a15 SHA512 e0c08dc4008d627907f4013aa76264c9ede0998cf95b9cf9925faad85d4a9111f673f16736bd14c371bb475e5dc1ff470b91923ab3a5d89a7bf11dd75b3f6b4e
 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 46091dce4391..84ee5952b557 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 ~sh 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 1a08d421c81c..9890f1fa33f4 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 4503 BLAKE2B f7da9bbceb5cbc3eb7b2ed0075ae41ccbb7ec68c4b14d85f35a937aaf055e6af2555d8f5bbd7da6e0ac21b4d8e4156bb55c6fcec74658f1de1fceae93f0032d1 SHA512 2377192f2252912a6ff63c0390c533852f885a923141f9c76631aefd5ce1cff8e001b844d199d1ce138c6137d28a3847172b6f569b88efa298a8f09ec1c351c3
+EBUILD courier-authlib-0.66.4.ebuild 4504 BLAKE2B 1c9b1759dfd94087a1802b7087d142caa56d2f33950535e005eb29bcf71c4cc58bfbc34baa619bdd2a6b6abd0e1657f4b746c4775bd868b5b83168ddf4fef5f1 SHA512 f3057213178b215edbb4905036248c252cbc21d4558da2254fb462fecb6da26e29a029e98510523a24ad844a5eaa18086d8de5355558105b275a58868ad1f458
 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 4512 BLAKE2B 02b1d273bd5f53ce0415ac047e4ebb840923b37e441f39f4696b04e784a704b0c5888db29d45cd0ee644cce310f6112dcce2ed9b12b79e9844c0bb271ba747f8 SHA512 5078372621121fd5b68803326c7f1d19c3cc221d33bc8d0447b5fa8250f45baa92ef97db2f136b9e44f61119625add93b20f8137764fa7b1859c5df653e716ed
+EBUILD courier-authlib-0.69.0-r1.ebuild 4513 BLAKE2B 899e6752efb51e88fd7955a38c623fe546fb90fd84733423ab87f3ce8c0c200e7c0e1ba0518cd8a74d2e2ca130116a3fa737d8572f405dc2f11580385a3b52fa SHA512 f29203df491ba3b6b2b51442cba59e97221f3dd57539ffcfe4243376f85f3277fcd86505dc9e67e5237f3f1f805dbd874803558ad32973e1c3c336f64f706f28
 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 2a259296223c..38d8b351961e 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 ~sh 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 9508ac6c4803..c57a079fa276 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 sh 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 be0b9f08c721..854b1ecfa99f 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 466 BLAKE2B 79030906832674165da0d1eb6ea9ec739ff5ae7c2d5c327f51ce8a47dbfac89240050c58e2573bb865b4d93f0bf7c1caf64416fdc04ce7bbb174e9841b076815 SHA512 3d2b082b9268aba5bc3630c8620ba563918fb8f77b22182cc2c5084529781848ddfaa9377a2528a290b37970f30af2b1ee69b71cd653267a50e7ffffbb8d9ee8
+EBUILD courier-unicode-1.3.ebuild 467 BLAKE2B ac1a4de9cf4f84bec6acf39d7b85c1f799af52d31bcbee1e067bffe0a09a71cd0fa80afc0c43b26df257be8d31f50afcca87710e6ad5484e2702f02400e5b170 SHA512 3320c49aae0191ec590dc82b030c6dbab1aea4b80a55d53bc3adf352a2f211b17f3319ff1d83e2ee10bf68e110c07a6042f6c31c2841f10d70779d1b3daae890
 EBUILD courier-unicode-1.4.ebuild 479 BLAKE2B d7f051ef5cba4aa2641aa3dc6fba505a1dcd1fb13a59bd2b41d3ae9165dcdef37c20b98aedf2a5e9a9900dc9b54731e34261ed6fc5d9d8497b540e48fb85f154 SHA512 5a4c74f25b4e4a07f7b1be28385b990ddda5156a343330278191084b8baca73de3ec86044f73768638a9751354853d4205b9195f35e3577f5f9defe5721092e2
-EBUILD courier-unicode-2.1.ebuild 478 BLAKE2B fee5e5ed0a7c096bbfede8b71b3dd6058b6f70a09742ab49d32f1e91d15be9269eb531e6303f18799f44972d9d567e6ff9bbae8b44f21057476d39163eb9db1e SHA512 a389e97434eb0297e8d1e45c9fcb799d95f9cd5f13f8aa2be485070c94ae804e597b63ff3a9d8b195c08c03e05cb61929f1e8519f3a1a0b633d8f917e04ce572
+EBUILD courier-unicode-2.1.ebuild 479 BLAKE2B abaacd19a56c2714a9ba7cf294619063c4fd5f416a0af36fdd04524218f57932e3e8c9da66066752eb21c7a8f68fbd29f80c16f6f688e8e92135419ed9fb1ef3 SHA512 f6e0f19cf686db2a9207324ae3d4c0ae68cbd5f5a939bea65f192215c1a7ab2142d9e84581cf72f42a7a3cc45b1e9db5feeec62a7b4f4c415af8122f646f6fbc
 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 1e48773f7f1e..5889c05b80ce 100644
--- a/net-libs/courier-unicode/courier-unicode-1.3.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm 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 bdd83b9ae951..5a1f7dc87613 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 sh sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 0182c665af0e..292fb044ba13 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,4 +1,4 @@
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
-EBUILD farstream-0.2.8-r1.ebuild 1823 BLAKE2B ec2e9332008aff2e2b510a473addfc3d424152b25045714544a2b12d6bec84df95e82869a076ca6c0eaa8461ea1f1cf897e814ea817b3e2e74b30371be91e144 SHA512 11cdf3f595e40cd4dd6fd328313e4f8696a82f86083f9944ec60e25e68389aae8e54b7791b83cf7638becf92e1cf00badcbe5d669feb70412ecd1520528ac65f
-EBUILD farstream-0.2.8-r2.ebuild 1859 BLAKE2B ca8f932d7629fd0788b57e7247e2c2f32db9c2bf3052d73ef56dfbfbe3de9b06d932d252f15c1aedd730f5bfccad5a474b53c6930a530bc7b7c657c7d09f2e90 SHA512 2793e70ed29a4aa6e239e4d0fdc2021edca9ebf594da1229b7ad08ad2fd2063bfcfde61dc9b6fb9f06c3aad8b990a95e16d4632d98da09e7d966e896f4cd27ba
+EBUILD farstream-0.2.8-r1.ebuild 1824 BLAKE2B 2b4d10ee696d3cc28ce5042661e21d6f89e13bcbeb6b59662a27170c40927078a92e9737e88922ad93a6b1fa9e191b03595f434fd8978eba00332574c013a7fb SHA512 92195c8321cef7c047027d70646b4f7af374580f2a4126e7ab393fdeb5ca08d0d1b7ec653a066c9a8fc76ccb8a6693f8b222b1a2d2e3c5e58e1d9fd82404d14d
+EBUILD farstream-0.2.8-r2.ebuild 1860 BLAKE2B e80d8868614111ba86fa4d803d74451b942208b299acd0a282f9437f3abb097f51e749787798273512b182b11dba538071bd178a8e606a4fe1e9081a9f8fdd0a SHA512 91fafd03bc9be4a0b886649f8cfa66dcddf811b782855d3ca159f47daaad97733935bdda530b1db3d2d90954476dafc4d9f4417500148c226b96d32d5a0bbb80
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r1.ebuild b/net-libs/farstream/farstream-0.2.8-r1.ebuild
index ee9b123f673d..01d19e14316d 100644
--- a/net-libs/farstream/farstream-0.2.8-r1.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r1.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 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index 2477ed524c06..c5a2f6eb67f3 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 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 5863f03dcc63..c4b6c37e20eb 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD glib-networking-2.60.3.ebuild 1769 BLAKE2B fecd9867d1fa1964a8dbb23150682931d1ea195897d3d93c3f2303505f4b2ab97025413c36bdffe677b10e95c709a1ed6bb4ca8439351ea517a4f5c39e849b6d SHA512 67bef7c6e15116b927a42463bd86a319c8a70964eb9544698163d7fa8fad5706824a4a61f5517c90cf3dfbce4e0f822e37e1276b3569bc5495f89de3ec0b9136
-EBUILD glib-networking-2.60.4.ebuild 1780 BLAKE2B a32b7d6c7ab3a32d8d182ff4c9da4d6db43de26d3c9a0c57cafd6b61c1c254f9b19880931580e78b2c323e6b271e7e937660a08f281241f4b303401f8d0dd47e SHA512 0169e55c4053938fdf226d0a8d04ffb80652b5ee729b1abf9b883dab08e45bacfae18ec486d680d6e580d7af2b8f9ba35674e2f0f87fdd02a1280c66231186e9
+EBUILD glib-networking-2.60.3.ebuild 1770 BLAKE2B c0db1da80fb63c85a5509060519a324cfded0b6197a82cfeff9a092728dc52361dd08fff810c590c0972330e66a562679ebd4c72190dc25a646d673d6cf07323 SHA512 768bbeb31d1efa08aa29d71e4c9238d7ca47eab2af0887843e0505dcdf6bdb865319d9138453774fb0308341ed12c2b87f21f10e02a2a3f88844a83ebfb982df
+EBUILD glib-networking-2.60.4.ebuild 1774 BLAKE2B 473c47915a77d0b5d08950de766d36400f23f5f02c427954fcee242d19a598bde9b2619fce817ac00c5003d32efd55b4009c3fe9c50d40bbf8f525f30dcf8530 SHA512 c7cc16e4d2552d13be188d27190f1d87c4c3646e0c84ca3aac6f481032344932d723d4da9a9698f2db3a059bb85c9e4f4f7e9b9820347f6dc68ae41d12554a5b
 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 0ccd2dcbcbfd..4b873b20e954 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 ~sh 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 43a3bcfd5c52..5e342cd4972a 100644
--- a/net-libs/glib-networking/glib-networking-2.60.4.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.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
@@ -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 ~sh 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/gnet/Manifest b/net-libs/gnet/Manifest
index 45658c903378..51be3f9a9aae 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 1985 BLAKE2B 34029ded17037e888cc0046a3c6118df0b4f90d6d2a00701836a68bddd35950f620f64e17c545a1d84c7958bb7f66b7f74d2fb5ef6b9c72354fba822572cba3c SHA512 06814837d8817ff49914227ae957943dc62634a96a9e08713ceb6e2ceff51a5298517bc699fbee1a7d7a6c899b6e1ff4f5edbc784663b3446b6957c8ab42fbdb
+EBUILD gnet-2.0.8-r2.ebuild 1986 BLAKE2B f1a4cbaa9ddec98cada9174b88c2e12f70cb28adfa7d8a2ca7a554089b3415d19955a38e703ff06f58082c052b6d30244a1f6a34350d8d52242e27ccfcc34e8d SHA512 5cd4654020c7de43f87e6e827cbb10798bc1555d1e1f06a74ac6a0dc7d52491fd0f0e0eee85dd302a7fd8e42dd794bf3f0b8bac2e1ad9777bd42360c974601fe
 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 835538e654d7..90f06670c8ca 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/gnutls/Manifest b/net-libs/gnutls/Manifest
index 4243bccd530b..8b37cc878c97 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,9 +1,7 @@
-DIST gnutls-3.6.10.tar.xz 5795984 BLAKE2B faa4069613bacffbbc3fe00a7b8963f0aa7eacc7946ea51912e2b6366964cf7001d40aa5de3f0543405c54a3200da0c0029150ec7cce84d598bce44b461f2fab SHA512 fe0481f9e4219e983b01b91e69ffd95819a4c0d0c09028509106d561967e9c5d900bc5e3a48140a34fa4467feda2a619085adf3fa8fdade96c8debf125e91ae8
 DIST gnutls-3.6.11.1.tar.xz 5902328 BLAKE2B b0cb2fd651411d1647a927bcbf8ae032e68b2d4ab3ae4a1d2b77d7dd13420e2e31cc66c3e106d830051cea5e0f9d3ca5419ec5ae57ec490638cb033fa740974e SHA512 55fbbf0ebc824fbc91ccd08d1708452c5b1c12af75e332f29414540eb2f81337fa605a693ce9f34319a927e9d71177e6e7ffea5c6747792d341fb740f68c9489
-DIST gnutls-3.6.11.tar.xz 5818536 BLAKE2B d413b49b3f7087bb91c2b700ded0825f55e0750d1dc509bfeb4735ab7fa8992f02a71c478bbb492a68d6b673c6662842fc7992ccf408379eb142d41b00eb2daa SHA512 dbf6766131496f66d712cf3a8f042e93eea057d843972c7cc0376c25b6f3802f51af4fe9b38fbb07e8194748a185055a2bd26c1fabd234d330b892466061462a
+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.10-r1.ebuild 4016 BLAKE2B 161ea3056a5368688f2fad8be7cb2aa04da9a19053ae650ee9f9fef64de01b6a376dcec24e8367b84aa405a163fc445859a25082f1a1b046545447e116b5b3e4 SHA512 bf9d4b3f68def6386d78044dcf56fab28992720e933f7bf1522dbc2d70da34efddf49d96ccfb5c29e4cf0bd1a1d62c224331a0ddc3ee483de4da75875e782dee
-EBUILD gnutls-3.6.11-r1.ebuild 3998 BLAKE2B a142d3cba3f4df0daa1300be72e0ac81f1938cb2ef1ce6b7f9dbc9434fda44b3e2f98e0253e039c85f7befa77ac423df08b881f2c2a3eb861f8e269f3d29f0dd SHA512 fa259b5cabc58aceb9c12a76a69a0fa79b0ee2a3bd11970e398c68bfb4edb491d1396d7e41f841914ea6fcb7c8bb54f7478cb59adbb914d8ace98e27f3a505fb
 EBUILD gnutls-3.6.11.1-r1.ebuild 3998 BLAKE2B a142d3cba3f4df0daa1300be72e0ac81f1938cb2ef1ce6b7f9dbc9434fda44b3e2f98e0253e039c85f7befa77ac423df08b881f2c2a3eb861f8e269f3d29f0dd SHA512 fa259b5cabc58aceb9c12a76a69a0fa79b0ee2a3bd11970e398c68bfb4edb491d1396d7e41f841914ea6fcb7c8bb54f7478cb59adbb914d8ace98e27f3a505fb
-EBUILD gnutls-3.6.7-r1.ebuild 3996 BLAKE2B 8b3d8104ace6c4fb9feeee846330425e234d7aef901d938d85b8759170e4b471e15f206508627962b428d54b4b447954639bad5a926adce4649164b4f8ec01dd SHA512 3d71ee2df60845ab0bf09b1cafbaf6cede2fe67a230af6057004c668aa23b94162b81ee5d4f6406ffcd3e51c4381f2c13f9939cba15b38890989744f6c665a7d
+EBUILD gnutls-3.6.12.ebuild 3998 BLAKE2B f14fa6c6e917e13d610516f7874abe09a3ffc29cb507aad547722a1ec6b9ee82b1afeebe19e8d1c560e613aabdc2b217f1b0e98773f14a4d05a63bcf37805a17 SHA512 602bb6d3fa5e4bb353d63ecdedfb8a474bf6c4780d2655c747f439bb5e046dbdcb6ed2b6208652de8e23afd48b082ec07dac2652387e0d1d64afefb776175f20
+EBUILD gnutls-3.6.7-r1.ebuild 3997 BLAKE2B e5d9b53082a66adf4bbe923904e8d3f8da79f50772402702b894f7997bb5704429e97849e1f70c47070c528927009036b1c3e82b202487a2e50a905846694253 SHA512 807a8baabb1b517808f812144ea9dc8d4837a69569979b6c81135821c3e4dff7d23469b726f7fb1067b8e84944fd0ece2b65e027626ea913e8bb5219291cdae6
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.6.10-r1.ebuild b/net-libs/gnutls/gnutls-3.6.10-r1.ebuild
deleted file mode 100644
index 4d07f7a574e5..000000000000
--- a/net-libs/gnutls/gnutls-3.6.10-r1.ebuild
+++ /dev/null
@@ -1,129 +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}"
-
-	# 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 "${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.11-r1.ebuild b/net-libs/gnutls/gnutls-3.6.12.ebuild
index 86457bd17c46..5fb2da5dd557 100644
--- a/net-libs/gnutls/gnutls-3.6.11-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.12.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
diff --git a/net-libs/gnutls/gnutls-3.6.7-r1.ebuild b/net-libs/gnutls/gnutls-3.6.7-r1.ebuild
index 5fdd7b50a321..d68bfc2a8d96 100644
--- a/net-libs/gnutls/gnutls-3.6.7-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.7-r1.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 ~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="
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index f246e3a36f9a..5b2f7d1ce150 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 2243 BLAKE2B 94561febec20f04fc09a302128ffbedc2f513cb6213abb23337ac379f52b5457de24b91111640db37210db1d5f62eb816af219428608d1db00c4eeb2380b5df6 SHA512 32d49de2d194fd9e4b7de5689e4680c412dfe4b5cbd00216b3ac4f10a4421914652f35cf006d4ca9829571eed6c91a0714218a774e81ecfe35886fb3d51e8300
+EBUILD ldns-1.7.0-r2.ebuild 2244 BLAKE2B f594756ea80c6f4d505b647603abffbec73b0fcd7e622092c6975d279d35bd4780c2167229e3219267d88fa67b7e2a4028428b1994605f12ed18fee73ecd950a SHA512 ac65a45bfd291a2ff223622a9c902ad0a231e2dd36edb01481356da073397e3ea0892e3dfcd9aa82bec4f151f442face8816842cc8a52548ed8f249754ec5ad2
 EBUILD ldns-1.7.1-r1.ebuild 2754 BLAKE2B f687038d2ccc75792ffadef332b45a0195c819edf2d89f36e9422bfa804da3cca53338ec7ec76b448ada9317219f7e1e93bcda1907ff376bf332dc3abd68aa6e SHA512 11a66754492ed884682f0706aa5e2d175d8e949dd094f592ece054ab974e16b816edcec3b5acec9758ea87ed3b9769ce5ee2e7ad635f9c19f9628195ab553627
 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 be44e8016816..8a9a596a1038 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 ~sh 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/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index 200e68b1cb1a..35bb6228d543 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libaccounts-glib-1.24.tar.gz 116578 BLAKE2B d3569ee9d4b92f285f20ab7bc285c62c9817a16f632ad9da83a86ab69e7e3ded74afbcb1307deee788a74796372c0011563ecd293cba4b0e81d15252eae4cf50 SHA512 d4e6906f642c7a196cb42172f31345f58037d528950bee3af2b8cb388aea386056cbaa22f0e7c604a4e00038b231e9ee455f6a1d48f82344cfc0037ad7251b7c
-EBUILD libaccounts-glib-1.24-r1.ebuild 1217 BLAKE2B b6ab737f6f4e8457a3a5487be1fdbb99473a887a5c3d0206732037b78735f7b814c4272495a84a5ff4a045faee913d2e449668ddb5354e08f744d217414e5574 SHA512 48844d8f1a2f8fa39b6a0d66fba49b7e6f01e39c61e47dcf4ec1fe5f6216b6f7f0f34af36a3d78b6956099477f9d516c58526c05070e3f4fdd437ba5bee3c17c
+EBUILD libaccounts-glib-1.24-r1.ebuild 1224 BLAKE2B 182cab44010e82d4f03117ac6389bb342dc6be98480d1971f4574b240401b94d978e9867e70bb99fc05520b15319afcedf9405c7dc9ba90b8949b44722a65490 SHA512 abf2db02a4678f7968568dc510f64c40e6f6c7c1dd673208b81c0c7b989036dd03c65ad4f0580cc86351b904349071ad145559a8b9f3546ce8da12767303e6f7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild
index c7d039a2bf1f..04a8a740b14f 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.24-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
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VER
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest
index dcd39b985534..fd11141cf00c 100644
--- a/net-libs/libasr/Manifest
+++ b/net-libs/libasr/Manifest
@@ -1,3 +1,3 @@
-DIST libasr-1.0.2.tar.gz 406428 BLAKE2B 527ad44cc4202dd195d6376cfa25b5d8946f24df9c64b91b3468ee961b6d3228f8a3d38c94299e630df7088ae0bf7b16bdb560521124f2a3ee77edb2e67539d0 SHA512 a4825a30130f70a452044c484871ac37459e1c1e6659c4c38dead7d3abbdaecb3517b7accb46586537975fee033857566fd279ecf97ae87dc80bb6bcdd467d3e
-EBUILD libasr-1.0.2.ebuild 400 BLAKE2B 79809730d0c8ac358b44cdf8201eb223f62997a77be49271d8a95d9bdba04a42fd9a0002f074b858e356e5e97f23b22f7ba104a88c8860d9721efb10367b2342 SHA512 bc790a9487ec9c6d66f9c13ed70cb9c3790946534d6290d57cbceccdc44cfc06f4182097e31d03d622bc599400310c7802fdae3bd54d6555d6079b0403c3df14
+DIST libasr-1.0.4.tar.gz 413258 BLAKE2B 971dabb83e322808344c4b53622623556f662c6ada200862469dcfe4f0277ade438b39e0c0e19d372622dfd3c3bc69c2bf1ca22200e6318c062f280f72efc15e SHA512 6f189f9f492da8204396fe1246b4a0162751b2060a881469649ecf987b7ac1cc834193d2052e80a09bf94fedc8fc64123e9dfcfe3a2e4395f9e26d37afc84501
+EBUILD libasr-1.0.4.ebuild 397 BLAKE2B c54a538c3378209f7f69a97912d9dcbb6bbfea4f11ab22b983826d6d1f0bf34a07b691f993675e65580a42fb985b4d7f4ce86325a22020da11ab89b7370aa766 SHA512 6ca184cb4d5bc22ebdef9cad546336aaca5fec5812cdf10315e39d4a1e2d0af5ce7ff8eb0c3698f73ce815be663a6f94f298c7f55b4eb316dd367e90e9edc78f
 MISC metadata.xml 331 BLAKE2B fb0ff46381f7fa14f0fd15ffda08e378a5a88e9771ce464ad813e4c8cf7d2146ca45b2c2cc8c13756bdae2413758f7cba2c68cf4752405359f311eca700c7fbb SHA512 dedfef00a1e0f26438a1e0fbc9b53fc64566bd6def05260410d21aa3ff941ef0c5c9dbc205b3516052b0409943acbfb431e4702c87d1c94e9950ab9492f68850
diff --git a/net-libs/libasr/libasr-1.0.2.ebuild b/net-libs/libasr/libasr-1.0.4.ebuild
index d58a1e625377..8c80ebc66324 100644
--- a/net-libs/libasr/libasr-1.0.2.ebuild
+++ b/net-libs/libasr/libasr-1.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Async Resolver Library from OpenBSD/OpenSMTPD"
 HOMEPAGE="https://github.com/OpenSMTPD/libasr"
diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index 343255d21948..c5f4ff00b09f 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 1331 BLAKE2B 63c9d78caa9db28ea9ae6d3a8cc8e315a0e65f0f3057e171d3b6f0ce25965f4eb1e30a25dca7161bbd126d7fe9f9de4e5d3eec43a47280c9270559af9f732b51 SHA512 3a4ab1833ff3190ca45551ef4fa279e57a701ce2fe7ee50dffb50cd4d1e60a7e848ec7ae8ca4971b04425646b281f38a559789cefc8e471cea61f7021edc3a0c
+EBUILD libasyncns-0.8-r4.ebuild 1332 BLAKE2B 2b08f70ea572d73364c3109dc51bc3482b7f204c84a9892319c7939cc1c9ae9d176a3405a563cca81e731b594bba7ed029db7215d78d0c720717924373baf23a SHA512 b5ad69f252ba4bc425bce98a58414f2dc3cce1aea85a85a17be973fe118b374c324c3ebd50622f52636ce24e2616c646f76fdeec9dfe42eea511dabc306b7595
 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 6765072f31a6..3c615b46d8ca 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 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc debug"
 
diff --git a/net-libs/libecap/Manifest b/net-libs/libecap/Manifest
index b28eefba63eb..41d70e533f7f 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 614 BLAKE2B 8c32c8515c9424ad2cd3285d0a1e5678e9d79872c549bd49ef41b898f5b5a3e5e63a3849b905535f09d60f370fef7323a7a4daea875a7ce57b7c8416ccfb3834 SHA512 6ec3513bfe4628a45e58cc23ba67da3751f01d8cf566e053f1c3f7d1436ea46ee5476b442eab31ec035af81175fe7cf3984fbfb0bf7f10ff6a76692d6150417a
+EBUILD libecap-1.0.0.ebuild 615 BLAKE2B bd34d4b6f07bdfd296616eacec3346d904af8ca3eddcae498597ded05f1a86c725a2f736bf1dcee0d6bd3286ac1e04ba129b887aaf760caa863c6c700f3772fb SHA512 2b8baf3190f739ff642905139bac1424982edc5fef097462313b309fc28643922c5f30c55daf9554ab27db5960904af805951224ccf90ec2fc0e5531752255db
 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 f74c5f0f4b48..5a6f822f6045 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 86044956c078..49a5c6e8e280 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 1081 BLAKE2B 2d7d1105db3e1b749fa4799fac1101411f77dd38885d48e374952e26385fd071448b313a6f4b64a75ca34499f3095ac1d4f30c948717a0f6f871623a2b2a1cdd SHA512 34bd645bc08fc711e8171fe1145dc0fcf7c9a8b5feb386ebe2e32207892979ea3813b1fd6664ee99f5d027c12d809f39dfcc15d3a3e5e23e0820781084a5cd43
+EBUILD libesmtp-1.0.6-r3.ebuild 1082 BLAKE2B 8741520647b6a1a143898153dd2d9dc24ed0cedb184ae698bbc8615f491b6e763dd91f5aec1d9b882254b3db846c8f14cbdd7a3594591ae5e62f750975d73818 SHA512 f562a23dc7837c4e2294d18c87acdbf90ae9f08cda76a54f3eb9279333f1dfeaf1c0ba948539821468009076cffdbcc9e613cbccc0a56d0822be67a92c6c597c
 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 28e48d438487..b32129bd899f 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="debug libressl ntlm ssl static-libs threads"
 
 RDEPEND="
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 9a1f990c2c76..e15046bb630e 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -4,6 +4,6 @@ AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f3
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
-EBUILD libetpan-1.9.3.ebuild 2094 BLAKE2B a0fc87cc47d14953ad09b935d74169664a107fb1cf926e107e9c4054aec6f0b65d6ad2f418e86e8e85a2c3cfc6190c0f93c9d9af961a823f5fb41ef20963d5e5 SHA512 033699e03bc14f272cab0f96ca5ca7a1fcfce8eebe830720f069df4f47b7f7cb091065ced9b153841d80432d57c95458c8b9935700ea18e4d761a3c68be48001
+EBUILD libetpan-1.9.3.ebuild 2095 BLAKE2B 33033979dd1ac166de1672b049dfcfb21446adc4d077cbb6c91dc5a0a76a7f2d61df009df7635dd516e5de8641370b7492a9914f0aab93568e19560a380a776c SHA512 258ce593918c8520d2c44eb5617b54abb04df7bad41570fa7fc0aca086fe77c4537daa8d3f4badd1221a4f47acc29cccb2109add9b8449c426b05428b0e57e58
 EBUILD libetpan-1.9.4.ebuild 2198 BLAKE2B dffcda40ca003f71ccef117150da920bd3c0b0f498af9219d4192ff12e33614c91eef9b0129c1d7083f70264e6f8088fd1770e467c4ec2b159228b91a5cd6437 SHA512 f10e83dc9b8ec6961be171901e1238af7c8286f417125c7800e8407754d162be488197fd8d734dac681f43a1577846d3bb8200f5cfa9094c45151ae7d1fd1c5d
 MISC metadata.xml 828 BLAKE2B c33cbf260d3d2f9529101c441cf49fcce001deec2b23c22a63715ff2ecc0e105c46a37e0aaf9641449d88e57b148d5fbca534a3b81475ffe795aeb07f5c1441f SHA512 5e13ad73cf38a8e4690506fc56f3482d72675622d3882c4cae335c5146c6cd9a942eca23834d1a010d3edb7deca8325d9f4ff576b59a3879b47966489fd28a65
diff --git a/net-libs/libetpan/libetpan-1.9.3.ebuild b/net-libs/libetpan/libetpan-1.9.3.ebuild
index acac8681ac94..ecf5da4e9357 100644
--- a/net-libs/libetpan/libetpan-1.9.3.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index dbc6cfc369ea..e173f6527847 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,5 +1,5 @@
 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 1291 BLAKE2B 10c941dd42ab5ab2478bd915f4c70faf442abc7f1dcd65444171134ba6618c76673bd56768a775d84631f24354ca6ccf55dc769d2e101cf346326eb8831d1232 SHA512 f9245ec916ad4cc0381fee2ed3f8ff136bb6143095ba6720d888d1d15ccf813e99cdb79e3b41469683a8f3e4b53836556c78921fb61a643c135a8ad92b8a705d
-EBUILD libgadu-1.12.2.ebuild 1412 BLAKE2B 8618b371c30b6eef11c7f313629c48e7bd32792d188c2532642d8c01697392e47c7959f055aa0441c89484e42570acece2e97b58294af97557ecf7bd9dd053b2 SHA512 c4ed214ce611c521ac6e98a4f35707c3f0eacc6e1d3e9f51974ff6bef5ee5dfca943ab76c38ef219f041f5a8b661a600a30ffd0fbfed8eabc67ebd2aa17c62fb
+EBUILD libgadu-1.11.4.ebuild 1292 BLAKE2B 40404179c96488fed718be19f910d1829a14b46faaf3450c65fcd42d7b590bc060bc772999d8153f67a61bcda31e413a934f599de47ba9aa767b84c307d3b3e4 SHA512 441fcacc738c922f50fae46c0b12baf43a5cbea937f401ad73978e248906ad48de4a0ddf8f5406bf97a13904919708070b602057fc1e06211ba64027483583e2
+EBUILD libgadu-1.12.2-r1.ebuild 1120 BLAKE2B dd5e351f16b7939df2ea3df069bce09c3753a70623740bfa91c1517e6ed2d56ae71841872ce6831a807e68727beae0dd343cff23f59273ea13e282769f84c21c SHA512 be04f5871e20b5d1bb2c05972e7f1e469a4a42c0b8afa2ab205424061e220df0d7baabaa27e3a809d012ba287c8b279e7fad0e599f0a611d9cf788ee20e02731
 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 1e153cd06f82..fe5d209e2d8f 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
new file mode 100644
index 000000000000..6172f02348e2
--- /dev/null
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Client-side library for the Gadu-Gadu protocol"
+HOMEPAGE="https://libgadu.net/"
+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"
+IUSE="doc ssl test threads"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/expat
+		dev-libs/libxml2:2
+		net-misc/curl
+	)
+"
+DEPEND="
+	dev-libs/protobuf-c:=
+	sys-libs/zlib
+	ssl? ( net-libs/gnutls:= )
+"
+RDEPEND="${DEPEND}"
+
+BUILD_DIR="${S}"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-protobuf
+		--without-openssl
+		$(use_with ssl gnutls)
+		$(use_enable test tests)
+		$(use_with threads pthread)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( docs/html/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-libs/libgadu/libgadu-1.12.2.ebuild b/net-libs/libgadu/libgadu-1.12.2.ebuild
deleted file mode 100644
index 8a6c3f71c24b..000000000000
--- a/net-libs/libgadu/libgadu-1.12.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
-HOMEPAGE="http://toxygen.net/libgadu/"
-SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-IUSE="doc gnutls ssl static-libs test threads"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	gnutls? ( ssl )
-"
-COMMON_DEPEND="
-	>=dev-libs/protobuf-c-1.0.0
-	sys-libs/zlib
-	ssl? (
-		gnutls? ( net-libs/gnutls:0 )
-		!gnutls? ( >=dev-libs/openssl-0.9.6m:0 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-libs/expat
-		dev-libs/libxml2:2
-		net-misc/curl
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!=net-im/kadu-0.6.0.2
-	!=net-im/kadu-0.6.0.1
-"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-src_configure() {
-	local myeconfargs=(
-		--with-protobuf
-		$(use_enable test tests)
-		$(use_with threads pthread)
-	)
-
-	if use ssl; then
-		myeconfargs+=(
-			$(use_with gnutls gnutls)
-			$(use_with !gnutls openssl)
-		)
-	else
-		myeconfargs+=(
-			--without-gnutls
-			--without-openssl
-		)
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(docs/html/)
-	autotools-utils_src_install
-}
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 27957f7db591..cd1b0619f424 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 1302 BLAKE2B 28e59ead33c7f85cc4094720041eabcb2c2a890c1002681a2574783c4aeda12182b5e4e1a22cbe3245964351a7c147451039d5f4ae85348ac609c4334622406b SHA512 0cb98199e126eb67d7762df8a4fd01d6912422b44e0f0a92880f9a2df230e590f9d8bba7f43ca6dff49cf56b6e8570b172150960e38d860167be4c189b5c4217
+EBUILD libgsasl-1.8.0-r1.ebuild 1303 BLAKE2B b6039e43b3ad7e1d890903927bc62d1949c6d8bf70c835e8c864c001974108edfee1c04cb8d4ff9d481494ee6d4a5c71205d9c9ef7dabdb5bbc9e40b3e6492ca SHA512 ad87c24d6d82cadf11491c7fb25de6b9a1e50bf912d5621ebaba3e1eb29e7e14991473ba2a4c42ae20ab66705d46fcc013105c1e23c409b3482933f96a8c46ef
 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 93845f3adaf1..c086cf43a496 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 b791960d334b..14ead7ee3380 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -1,5 +1,5 @@
 AUX libgssglue-0.3-protos.patch 415 BLAKE2B 1c9a1592070eeeb3189ab7a64381f85c79fc8676b1efd744da70768767741ba1e3978c8dde7762c9c22e4de98c0d1e523d5bfd28efb7e5f97e5404e37dbdd183 SHA512 0993ce5908d1388490c195cd7da7950d019ac2937e4aa374dad515b12c9775ebbc578f2635b508b333fd8f961b4f8816db7c5e4891ace07f042c7ea6588c0307
 AUX libgssglue-0.4-implicit-declarations.patch 474 BLAKE2B 578c3306d1dc40165d20485dabac62f1a0d211e0ad3e0d54f79f7330c3ec7c26b0271345124b459eb576571735c9e3ec79687c1fce433fba5501a2b9ff59fcf9 SHA512 1a76bb2b53baa8277e117d8161cf186c569ae1d2e8f368a17378b33fb623e0be8b76ef6c36d413054d5501f344093be7691ea6e042b6367619de6079cd116c07
 DIST libgssglue-0.4.tar.gz 346984 BLAKE2B 5815db41ff3f65b014e713b68667bb49d3aecab943e891de881af2a2d157cceddc5173e7eff9ed2eac714b2e1341429694f1051ad98a3c4b728a61eaceeaddfb SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29
-EBUILD libgssglue-0.4-r1.ebuild 895 BLAKE2B 1513c78dabb7c1435e69feed494f1fc55657ff8b64db9ef6181946f16bb929e1778a9e763e2adca0b8fc0bb8011cb4fc490f56f7e3118aeae1a9744babce57a9 SHA512 dd10b3fcf99559ef6c858dfac75a39d8945c8fccce217fa22924160f049de0aca780a8be957ed41bf39448617573040319d76e25f407bf8d0c63fea001182e72
+EBUILD libgssglue-0.4-r1.ebuild 896 BLAKE2B b4b41a59660f4bed10a69698f573a0a00d20e59a3a896bccddf0d7e060b547c880f0e4cc744ad0102b56f7463ab1fc506ba0f52c15981a3c2dfedbb3859edb59 SHA512 6c2214f279951ec695c1541de52f6d30c1d1d79c27d4ab35a5be70e3da9bd80cec5280827a35127f232c42bbb08003e8a35ce77f0961772de7160f9e4e908500
 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 452961467a84..a456ff714ec2 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 sh sparc x86"
 IUSE=""
 
 RDEPEND="!app-crypt/libgssapi"
diff --git a/net-libs/libident/Manifest b/net-libs/libident/Manifest
index 74d5670f3425..95b7d17fcde8 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 530 BLAKE2B 4aea1ed723ce4c4be1f8da40215337967b91f8fe7fdd06bdcdc6598efc2bb5cf0bad11e06b426a97621ca13592513e849dcf11140040bab9a0e4a5d5644cee95 SHA512 86af06119bfc0df607aa63fb0c536de1ff341aad0dccedef0bf96e469ab1ee8a2637b340c8c3eede3fc4738b70794c8aa14ead27055feb5b0e79b9f9bac766cd
+EBUILD libident-0.32-r1.ebuild 531 BLAKE2B 50d6dcf6ce9675ee11b7ab00263bdf10058cc86b2828ba2e87ca5dc02d250993eafdedf1e227bd38f209ce110c368a4c494ed9b8680f92ebeec3e65eadfbe5d5 SHA512 823c78126d0b2a79e53ccaf25aaa0e1f5fb4cdd06d6603ca19391249f1756fdb662767b28eae408766d35289bba02ddddf6bdf7f7b12d9d30e0b830e1df5d646
 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 182b8f4bb1dd..67bf36f7a442 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/libkvkontakte/Manifest b/net-libs/libkvkontakte/Manifest
index 67205b97fd1f..78b8ec5f8037 100644
--- a/net-libs/libkvkontakte/Manifest
+++ b/net-libs/libkvkontakte/Manifest
@@ -1,4 +1,4 @@
 AUX libkvkontakte-5.0.0-fix-warnings.patch 11751 BLAKE2B 5d8f45c2c8b6205e0475067e8dce671b1329f5775a799792792a53b9636f7cd707fafbff2af2cc197b45a65b899c9e23112acd93ac0d7657e0c0e18130d4eb31 SHA512 f1596051b35f999589f5c48347ba5f303a9af97fa8affc70189e27464579f50e583fcb3d7ea6286f9cf2a30306b56f05abc2146825620f6938b409bbe87af61a
 DIST libkvkontakte-5.0.0.tar.xz 59116 BLAKE2B 18b4b3c0eb7e408a94c1d2d3613b4c2ef3c485490490aaee42a35175c81453961773031030ba3cfdf9c29fec7f73f7670d93d0c9ac1f748b33dc66d497434c19 SHA512 bc7fa3d2d8a815c3a8b2265bf45500c10ac31383883a6a19802c5d01be5c16c1e72a8fe0c2c7cc086c9a7403ce001df0629e546caa872a2ae599e3a2650ef1af
-EBUILD libkvkontakte-5.0.0-r1.ebuild 882 BLAKE2B 6831397ddc4cba601ff6f361af92de0b60f448b05dba88804fdb17c77b3f85a1b985006ad375ba20094a06b94b0893c15596f4d965f9698ac0d27230c0d76589 SHA512 60958acea7f350bfd626d3d43cc92e0279fb4e17f8516bfcfa210c442c815f6d80673f5555b26fc2b584953e4f2e7ca8f0bbf616d55cbad4cae8fa817b8ff560
+EBUILD libkvkontakte-5.0.0-r1.ebuild 889 BLAKE2B c7723c1632a4b2893daa4470042f0d8f740ecd823ea453f73aba4cf61c5528914287dec517a1ca610c528c3b450ebe0c131deddb0736b086bdadf1fc181efd5b SHA512 bd91b003d90236f4c13a74737f3acdab2cadfe7b070c48f97d9dec7cf0d91166d31722f0c8dac6be9d059537ca2ceb0822aa321d67eb3743adabd02906d6284c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libkvkontakte/libkvkontakte-5.0.0-r1.ebuild b/net-libs/libkvkontakte/libkvkontakte-5.0.0-r1.ebuild
index 114605f96a43..9575a5125215 100644
--- a/net-libs/libkvkontakte/libkvkontakte-5.0.0-r1.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-5.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 233bcb4284e8..8055e6c4f010 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -4,6 +4,6 @@ AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c06730
 AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8f6e4067802648212e7fb28bc59f55c4293bb319b6186251890c164739daf6076aa5bc4f8ba083c9f68c0115be8738d SHA512 e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
-EBUILD liblockfile-1.09.ebuild 1213 BLAKE2B 6baf53369f3dcfbc3c3d12ad6b4b3f146b4d649aa587a4b29db73959fd9a0623a7b0671089f06210d613a18f854ab127799d3621e1af7f7c3a319fddbd6beb4e SHA512 dc6a60b2695e8f22c496ecdbf4d4520245ebdf4d9306ff4d03e71ece099f590940f16b080684983228f80569596a8c401f6f604077d9a613467fd0d7a48fd4e8
-EBUILD liblockfile-1.16.ebuild 1332 BLAKE2B 224829212979d45c77fb4fc171d629dfabdb241dc0eac96d74f1616f092c4b492434625acec12954e186b7abfb4e67f5733ca2a54746e9402d8b4b6370827646 SHA512 adc936a5db4f0443d10e7f5887a54e7340de044c91eff3ff4f4f4cfbc7b00b777eb75a098fda6f62edd426ce00a2bc3e03269454b777e9e711610103c65f96ec
+EBUILD liblockfile-1.09.ebuild 1214 BLAKE2B 6ff0fc868cd36467903bb332460d6eefc2f9f73a24e2d6ea9ce6ef170aefca91dbc7d3092253e700de26c3318de3223009e45f47603a121d72f35e1a341ab27d SHA512 47266158c92b618968d9bdca784e24eefc8666bcd34d5b8db11595ef4034097d4dd4f932a963222ed9e1209a9a85ca92ed38b1815ac5c16097ba4f872040d788
+EBUILD liblockfile-1.16.ebuild 1333 BLAKE2B 80ef3d0fd89374e8fc4d9f9655bf1dd20d440941881f865cd2fbad0ad05f930970a071ac38bffec0f1c8fbe80e496abc962b6581f45a8a1d2929853c026e8031 SHA512 c3d6a25d23b5315ff69caef8f7812ec8f7569157a27489fa63519e40beb354698cee5d1e042f628d1cc10de632d94f0a1cb443c8ffd58e7cd60c644f4e77c91b
 MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/liblockfile-1.09.ebuild b/net-libs/liblockfile/liblockfile-1.09.ebuild
index c2e69373adb2..eeb84dd9633a 100644
--- a/net-libs/liblockfile/liblockfile-1.09.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 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-macos ~sparc-solaris ~x86-solaris"
+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 ~x86-solaris"
 IUSE=""
 
 pkg_setup() {
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
index 24f4f3a0aa16..fa8d31db2fb9 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 ~sh 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/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest
index 6e522c88d229..9e5bc0ec8825 100644
--- a/net-libs/libmediawiki/Manifest
+++ b/net-libs/libmediawiki/Manifest
@@ -1,5 +1,5 @@
 AUX libmediawiki-5.37.0-fix-warnings.patch 5020 BLAKE2B b00f572a413f09112cb9712efec8204b15ac5a77a6ca672ce5a4c0e53b2b4f7c329c6c792bc2d29a65afc131c8f17cf5b7ae14943296cad0b6e1e6275702a23f SHA512 2af979b26bdc224afaa9bd8259bc28085ff89ae0ec623620900b02e44467c13cc65d91c89789970f30048061b8fdfeff8b8be324b7e886f6700d12c3d1d6dcaa
 AUX libmediawiki-5.37.0-tests-optional.patch 470 BLAKE2B 856433e48d50f6046d1d994cafc081d1afe04a7d82fe30476e129716ede33ecd26ee721fb566de4fd094be4d897a204a34102790225b49f8a31f26f23cccc4d4 SHA512 91e483c2483e2d07ed2b4d974f37c19bcbcd2c69ff9841451d4aa182945469b83dcdbe5025807ba83438cfcfbf4218fe32f7f6d5f5232cca913285fe8b9bc33f
 DIST libmediawiki-5.37.0.tar.xz 55188 BLAKE2B d04ea7dc346792c49009b382fd774ad9573e70cb52599caa57ac3f0dcfac93c0569a42cc54e11ba185e80fc2a5847d6a6f6c81adda9907c87dd3f7459771da3c SHA512 5efcd30782c8d54cddad51c6a96065f2942529e89facfd1c3a71af343a898858db02fa95dd0af0161b3e13aee6a9a373a0a641ce64e128c7282cbf3770db6993
-EBUILD libmediawiki-5.37.0-r1.ebuild 842 BLAKE2B 60d400ecfb3e354b023b1d349bfbcd62ed98a7e58bc65ef6984ed653ed56bd8e9feaf75e768cdd5b8f48b99ad3243bb4df868994a7e48e1c00de03482f187983 SHA512 c79ceca6690aa1397a293b6796b02b4944d643b2c0da78cc0ee18238703d8434a41a710ca9e2c53b8fc98d59965aede8f11181f57abd25aa9fa1b24f2daae32a
+EBUILD libmediawiki-5.37.0-r1.ebuild 849 BLAKE2B 721bded8441c281f008f7c53ac69bf6d7e819470ee91ebee8d9ccd6717e500cbd971002b17f47574f04ef3e2efbe25eb2cc6befe7b96b7d0cf297c42b9bd4834 SHA512 8f57d19d7cc6dedaa89f9ad1e9d0c09516b64243aed70115d1719725c7c3ad714c925d809c95272dddc3f44064c8bc16c1b127b72e540dd1c46ddd61836d4f96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
index 7bc69c7a8f6b..620b8aefcf78 100644
--- a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 DEPEND="
 	>=dev-qt/qtnetwork-${QTMIN}:5
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index c6dcf6f96042..006d54ff9ee6 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,7 +1,7 @@
 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 1290 BLAKE2B 986e70136a781a204d31a1deb3ab4a248ba4549f1539574c8c838224b8ee1d40ec6af7930a7cb30d04cab71dcc9005bd6a9a4fa2c4f5df2b5ef27565f013f444 SHA512 f0ec497fa405ee34e2dace388dbab2525f163a6e4a38f3082c23327c4adcce4402ce1ba7ca76ebd6f99520a3cdb15d4360ba9f44136e71965052565b7d92e0ce
-EBUILD libmicrohttpd-0.9.68.ebuild 1277 BLAKE2B 35a36de31cac4a723545eda33472e59b313189b103ed744468e5c6a5b889b47e3651ee1be8cf9b184561c4939cf0030f5f320ed044b245b3877d7e10562d9c73 SHA512 ad2dc9791facaa2f8daecde876ee20de02dd4f2acc75af61647a8d5b5878a8d45d9a36e3d1a0032e0c9fd4e27d55d811a4d8fe2a70b88bbc28cf00edfab5c6b2
+EBUILD libmicrohttpd-0.9.65.ebuild 1291 BLAKE2B 0b33d2f21e25c8e27e4e099c2d0c43c2a268da545c47413e7a2de518824bf9248476ed57f595dcb4a2cbd5635cb6c53825aca750ecc81fbc1689a4b6e80f49ee SHA512 febd59b68984448beee57fe44f6034d1d877ac66efe415130b12da3fcf17c6f14518d599fe417c228398f7d9a1d686a809d5407a257be8ddd7174050edcc47b0
+EBUILD libmicrohttpd-0.9.68.ebuild 1278 BLAKE2B d10caad6e5d64365a0034aa3a156985a99fa784b8f5b9367ea26c0c0379e1124c50f1d2688ee1d8414187223636656798fb3580c707e47a700434e8abb4c00ba SHA512 212b42bb1b1aa54b27e86f831ceed435e6e22137a1bde912694bb47e82beeb9b9beb9db0319c7025b9da0be737ddf904e3aba591a90e9f8fad2c238f606774a5
 EBUILD libmicrohttpd-0.9.69.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
index 5aa1b47456fa..dc816c65eebf 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 9196967b0d04..1503d0d6dc26 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/libmnl/Manifest b/net-libs/libmnl/Manifest
index 560ea180c300..165aa9b5f825 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 768 BLAKE2B ab9d2f485c645394d059516fbc40107dd3131eb8be68e28f8c19b7f369e5dad4a3dbf177c990f47534b27b1b491961eab23bf2b66e2706d30ca55340b94963f4 SHA512 c4133521cc284acbc9c9cbdba8aa230dd4fd798b7d88cb4374c55947c4f42d323c68543bf6e32c9d69d7ecb10e0ed8f6139debbb6e4330fe038ac1ad2c4d5b53
-EBUILD libmnl-1.0.4.ebuild 781 BLAKE2B a187372c080edb884d622f8a4fe19386f942da401417266e88df304f6ded8c0022952690d7e2d2c3d016a63c187506419161b056b9d03d187084218042145dd5 SHA512 4be264f989629a47deefcdf90ffceaee59717a0b65bab12198e164b733a0658947014b09aa686885f3cb9993c442655a28aca6bfe2b88a8c10d8e28d0d5d3747
+EBUILD libmnl-1.0.3-r1.ebuild 769 BLAKE2B f305393d27fd3924e35a47d3ae75a8d566195e0299a00b5eaa27b0fa08288fd00d88ef8beb11976e1e5ff1896ecd5921be9030d75903b365d4c94c34b415c257 SHA512 c4a2c5810d8e9b0a48f0c4eafe0d63e90b38359fb2527e8f21b4d0dcc51c5e1d1fb90f756fce11b68c8508e63674fdfa5e61889e982e07afd7b66d586f4bfbb0
+EBUILD libmnl-1.0.4.ebuild 782 BLAKE2B 8edf635b88d4b34dc93d286029b6a5a5a6f6897b912d5c7e1e76895dc47f16c43c3ae7d3c3ef98ae6e7bc550b661b74c93cb3a54a9ab29ffc3941d876145e07e SHA512 19742a10fcf20b6d7b90c8f2573103f022a1cb35beb2ec76d65718499276c965a9c9d46f35d651be6adaadf489262acb6bafb8cd089cc5ed9fe452b0dc375f73
 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 67fbdb2cc36f..d1cf56913691 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 sh 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 794d9e309842..3714395ea849 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 sh sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 0ed7a8eb0674..d3b5c07af52a 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -4,18 +4,9 @@ AUX libnet-1.0.2a-funroll.patch 232 BLAKE2B dc4eea13f830b03e02cab52d594dbd0322c3
 AUX libnet-1.0.2a-gcc33-fix.patch 462 BLAKE2B 04fc43b82605a6200aac4edc5de509bf545d0fd103e9d088db147bcd5042c11827b918e8560792665982548033e439cd0a5af1938415c2852bd335e0f6f283f6 SHA512 ca4913145ffaf42ef1d267558ac00c096d1561a6dddf05b11f229aef969cc1601492168ae238d5d46b7015722822f9600018bc8a7cc344a4176e4d6c6e0c363f
 AUX libnet-1.0.2a-slot.patch 6244 BLAKE2B 61f4131eca23d9dc20922058e0382c38ebba480df267472bbaa88481857511c3fa2ae5ad4e6203425475d7a2c3a1421873c3d03b00a5e5cc311bec7f64b8107e SHA512 6f800d91cb16077df967227feed58ee61b60ab1d248eda5fe788c21ba2cd7c404647213f3721f19bdbe80be0c45d571234dd82f010fe9fc70c4c270c97e138b5
 AUX libnet-1.0.2a-test.patch 1172 BLAKE2B 105a23a904da361216f370b005016d205ea971855a064d45b1282faabdb11878cbc2568ffe311074eb437677e03d604497727c58273711826af125a1cc3f11a6 SHA512 3ab6e667798362d605c2a1a5b8c172c80a99d2569d4418cb47b7bb8f69ea424e718b2947ea22b43d882c556f65470bec04451d9356070b8a4fe10f6505122bf7
-AUX libnet-1.1.6-musl.patch 686 BLAKE2B 08d509fbb0dc960aa8e3fa622e958fe9b4fbadaf8cd47896c02eb90bcc897eb1a3b7699350f7a64f63a529efc325573bd5b5d730f7129ea601f6338db2d09fe3 SHA512 23bbf5e87b704b2d4cf3f6da308b29d840950fde67eb67294ed44bc18eb327b4a2bcd04218dbd1a27a2445b3df7a98af72b1d5bd1afc83cb448a9e8f403aec01
-AUX libnet-1.2-_SOURCE.patch 735 BLAKE2B af32a0eb7f6dac2fb909785f7ef95bd98d0bd92f48759ab4673d2c3f10b894bd0732fe82fa1fd60ce897c0c4b0eaefc8ff57b3cd13ec632f89ebd00376e5fee1 SHA512 698138d6d39984090fb906cc0201b720c399f0a55dd06cc8857159f0e045bd980c195876ef2662fa4e54d6dfd12e1a106e6c829dc201226c97296c2d24bc2a59
-AUX libnet-1.2-rc.patch 333 BLAKE2B 5e3d0803e985f2ec49f11236b8fdc59742aad401448e921c3c5180354f52e4bd9be28804c656ede929c107c7577c48241277642a5650e0647b0842194afecca0 SHA512 144796cbcf550982a523df46763a60ee5261c8fd80adc674c0a2075b1003623785a1c5589e6ff53a5472e43f3f16d859e71ba6fa98aaaabc767ceb4805676bcd
-AUX libnet-1.2-sizeof.patch 239 BLAKE2B 141f8d9c32d351e5f30eedfe0b92b0d9cb7ad0ddbdc811f4aafa1e482925e0735b7d8722aa513b62ec2e79d457f9b72fbd3d1188342666b331cd1e6d9c7bc456 SHA512 ef1967dc7fc18b5573dcb617a855b3401ca843936a690f26827effb61dc8b30c5efe9b3a5f3cfae448a134c57517cbf14e8bca4cb82629c65b61dccea9ff0bae
-AUX libnet-1.2-socklen_t.patch 145 BLAKE2B 35a13516984af9f460c0778a25e205c79e7152178549203f070676dc69ae20b9c99ada7a0194ec898beaa45b403cd584a458079b1d2c458b0b1923f9628d7d8c SHA512 31e7dbee2e6d747a69d86f9cfba43d1f591d97f2868b14c9fa16884f5d1650a7602ca10e875afe5779477d9358db6121fd66371fe183a865860376fb809aef97
 DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
-DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b1044fb292693581c8fbc8fb99c565e0a9436b35914bdbda65798b00527049f279da3b3b6048e32f575f51b92c3309 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
-EBUILD libnet-1.0.2a-r5.ebuild 1547 BLAKE2B ddd70dac9ecada0c45dd08e391d15a388f3a370356af91190a3f4bdc6aa267febb69b32420194ffb1a3ef88c61bb613865b87d440cc03fafa3c5384b7d1b0291 SHA512 52fbf03433c1c43f93d173051fbc1125751fb1ea1fd5190679cad0b396d38c6f3383820f7ffde729d1089e25358164cd50d360025ab98551768188591b8da92b
-EBUILD libnet-1.0.2a-r6.ebuild 1300 BLAKE2B fe48dca00c2a8d75a870249167c92c53ee7361aaa642549f48808e3bec38fe7d8e8f2f4c1f623998d72455cd27de02240e7128a72ba0c6f433b29de7e61c2621 SHA512 4ef639aa0dd8832828208cc56bd7485d9f4ce4068f74045d741ca69cbd80598eabc57dee2f965055a5c8a45e21f2288b30aa3d2e31d2876cf87029be4df16614
 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_rc3-r1.ebuild 1177 BLAKE2B a55b2b372255c92e2ca74f5408ffe85f36df6ef50ba62cd0e4d24cf0b0f3a52f9271168b0042c12c47446afffccee2b60938b5fea19fe81c4c8926f19136a752 SHA512 c6bea7f97ea6c5a8c1330347ce258716c66248ad4036ddb6353fd73636f20d52757c5d4006865a7d779347ab8512c908d7634d7d17c99eef9dc6e0d2ce9a2af0
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/files/libnet-1.1.6-musl.patch b/net-libs/libnet/files/libnet-1.1.6-musl.patch
deleted file mode 100644
index 238fb8acbef1..000000000000
--- a/net-libs/libnet/files/libnet-1.1.6-musl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/libnet_link_linux.c
-+++ b/src/libnet_link_linux.c
-@@ -30,26 +30,15 @@
- #include <sys/time.h>
- 
- #include <net/if.h>
--#if (__GLIBC__)
- #include <netinet/if_ether.h>
- #include <net/if_arp.h>
--#else
--#include <linux/if_arp.h>
--#include <linux/if_ether.h>
--#endif
- 
- #if (HAVE_PACKET_SOCKET)
- #ifndef SOL_PACKET
- #define SOL_PACKET 263
- #endif  /* SOL_PACKET */
--#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
- #include <netpacket/packet.h>
- #include <net/ethernet.h>     /* the L2 protocols */
--#else
--#include <asm/types.h>
--#include <linux/if_packet.h>
--#include <linux/if_ether.h>   /* The L2 protocols */
--#endif
- #endif  /* HAVE_PACKET_SOCKET */
- 
- #include "../include/libnet.h"
diff --git a/net-libs/libnet/files/libnet-1.2-_SOURCE.patch b/net-libs/libnet/files/libnet-1.2-_SOURCE.patch
deleted file mode 100644
index d9c74f40e300..000000000000
--- a/net-libs/libnet/files/libnet-1.2-_SOURCE.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -157,14 +157,14 @@
- case "$target_os" in
- 
- *linux*)
--    AC_DEFINE(_BSD_SOURCE, 1,
-+    AC_DEFINE(_DEFAULT_SOURCE, 1,
-         [Define as necessary to "unhide" header symbols.])
--    AC_DEFINE(__BSD_SOURCE, 1,
-+    AC_DEFINE(__DEFAULT_SOURCE, 1,
-         [Define as necessary to "unhide" header symbols.])
-     AC_DEFINE(__FAVOR_BSD, 1,
-         [Define if we should favor the BSD APIs when possible in Linux.])
- 
--    LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
-+    LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__DEFAULT_SOURCE -D__FAVOR_BSD"
-     AC_CHECK_HEADERS(net/ethernet.h, \
-         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
-     ;;
diff --git a/net-libs/libnet/files/libnet-1.2-rc.patch b/net-libs/libnet/files/libnet-1.2-rc.patch
deleted file mode 100644
index b9e44a3491cb..000000000000
--- a/net-libs/libnet/files/libnet-1.2-rc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@
- dnl
- dnl Process this file with autoconf to produce a configure script.
- 
--AC_INIT([libnet],[1.2-rc3])
-+AC_INIT([libnet],[1.2])
- AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...)
- AC_CANONICAL_TARGET
- AC_CONFIG_SRCDIR([src/libnet_build_ip.c])
diff --git a/net-libs/libnet/files/libnet-1.2-sizeof.patch b/net-libs/libnet/files/libnet-1.2-sizeof.patch
deleted file mode 100644
index 603224267fdf..000000000000
--- a/net-libs/libnet/files/libnet-1.2-sizeof.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sample/sebek.c
-+++ b/sample/sebek.c
-@@ -167,7 +167,7 @@
- 
-     if (payload_flag)
-     {
--	memset(cmd, 0, sizeof(cmd));
-+	memset(cmd, 0, length);
- 	memcpy(cmd, payload, (payload_s < 12 ? payload_s : 12));
- 	length = payload_s;
-     }
diff --git a/net-libs/libnet/files/libnet-1.2-socklen_t.patch b/net-libs/libnet/files/libnet-1.2-socklen_t.patch
deleted file mode 100644
index bce36704477f..000000000000
--- a/net-libs/libnet/files/libnet-1.2-socklen_t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/libnet_raw.c
-+++ b/src/libnet_raw.c
-@@ -77,7 +77,7 @@
- #else
- 	BOOL n;
- #endif
--    int len;
-+    socklen_t len;
- 
- #ifdef SO_SNDBUF
- 
diff --git a/net-libs/libnet/libnet-1.0.2a-r5.ebuild b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
deleted file mode 100644
index d0a9ef24bb05..000000000000
--- a/net-libs/libnet/libnet-1.0.2a-r5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
-HOMEPAGE="http://www.packetfactory.net/libnet/"
-SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/Libnet-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch \
-		"${FILESDIR}"/${PN}-1.0.2a-slot.patch
-
-	use arm && epatch "${FILESDIR}"/${PN}-1.0.2a-endian.patch
-
-	cd "${S}"
-	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
-
-	cd "${S}"/include
-	ln -s libnet.h libnet-${SLOT}.h
-
-	cd libnet
-	for f in *.h ; do
-		ln -s ${f} ${f/-/-${SLOT}-} || die "linking ${f}"
-	done
-
-	cd "${S}"/doc
-	ln -s libnet.3 libnet-${SLOT}.3 || die "linking manpage"
-
-	cd "${S}"
-	sed -i configure.in -e '/CCOPTS=/d;/CFLAGS=/s|.*|:|' || die
-
-	eautoconf
-
-	tc-export AR RANLIB
-}
-
-src_install() {
-	default
-	doman "${D}"/usr/man/man3/libnet-1.0.3
-	rm -r "${D}"/usr/man
-
-	dodoc VERSION doc/{README,TODO*,CHANGELOG*}
-	newdoc README README.1st
-	docinto example ; dodoc example/libnet*
-	docinto Ancillary ; dodoc doc/Ancillary/*
-}
-
-pkg_postinst(){
-	elog "libnet ${SLOT} is deprecated !"
-	elog "config script: libnet-${SLOT}-config"
-	elog "manpage: libnet-${SLOT}"
-	elog "library: libnet-${SLOT}.a"
-	elog "include: libnet-${SLOT}.h"
-}
diff --git a/net-libs/libnet/libnet-1.0.2a-r6.ebuild b/net-libs/libnet/libnet-1.0.2a-r6.ebuild
deleted file mode 100644
index 850469f76099..000000000000
--- a/net-libs/libnet/libnet-1.0.2a-r6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="library providing an API for commonly used low-level network functions"
-HOMEPAGE="http://www.packetfactory.net/libnet/"
-SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
-	"${FILESDIR}"/${PN}-1.0.2a-slot.patch
-	"${FILESDIR}"/${PN}-1.0.2a-endian.patch
-	"${FILESDIR}"/${PN}-1.0.2a-_SOURCE.patch
-	"${FILESDIR}"/${PN}-1.0.2a-funroll.patch
-
-)
-S=${WORKDIR}/Libnet-${PV}
-
-src_prepare() {
-	default
-
-	cd "${S}"
-	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
-
-	cd "${S}"/include
-	ln -s libnet.h libnet-${SLOT}.h
-
-	cd libnet
-	for f in *.h ; do
-		ln -s ${f} ${f/-/-${SLOT}-} || die
-	done
-
-	cd "${S}"/doc
-	ln -s libnet.3 libnet-${SLOT}.3 || die
-
-	cd "${S}"
-
-	eautoconf
-
-	tc-export AR RANLIB
-}
-
-src_install() {
-	default
-	doman "${D}"/usr/man/man3/libnet-1.0.3
-	rm -r "${D}"/usr/man
-
-	dodoc VERSION doc/{README,TODO*,CHANGELOG*}
-	newdoc README README.1st
-	docinto example ; dodoc example/libnet*
-	docinto Ancillary ; dodoc doc/Ancillary/*
-}
diff --git a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
deleted file mode 100644
index 40c3c26cfb68..000000000000
--- a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="library providing an API for commonly used low-level network functions"
-HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/sam-github/libnet"
-SRC_URI="mirror://sourceforge/project/${PN}-dev/${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"
-IUSE="doc static-libs"
-
-DOCS=(
-	README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
-	doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
-)
-
-S=${WORKDIR}/${P/_/-}
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.6-musl.patch
-	"${FILESDIR}"/${PN}-1.2-_SOURCE.patch
-	"${FILESDIR}"/${PN}-1.2-rc.patch
-	"${FILESDIR}"/${PN}-1.2-sizeof.patch
-	"${FILESDIR}"/${PN}-1.2-socklen_t.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc/html/*
-		docinto sample
-		dodoc sample/*.[ch]
-	fi
-
-	prune_libtool_files
-}
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index c260192ffabb..126d1ba38eb6 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -2,8 +2,8 @@ DIST libnetfilter_conntrack-1.0.4.tar.bz2 428147 BLAKE2B 24c2909ff62483397cf7295
 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 968 BLAKE2B c1d3943def2e1b3d8eb61006a6426fb23ca0f9062522d8f197c8af3baa366181ba11f1e3ea797d9a461898d8fbdf40036425d36897e3b570dd3932d47f40b5fd SHA512 c1eb29f822d2ed62dea906fb0040b49a9edb966372959cd98a2297dcc88b718c2eb04d6b36d79030d2e473885c299795541a9017005f9f90d6fce176360b660f
+EBUILD libnetfilter_conntrack-1.0.4.ebuild 969 BLAKE2B 0f11a6fa0e31b11b16e22ecba4f78ea1c82d5b748a8b15600c2c098f7d995a6c7316009a466907199939be183b6dc5f65eb3140aab70604a883d1e7a50899ab6 SHA512 7bd81dfe03287a00917ab91520cf2644f377136f380bbe09be28c1179a0c81bd78ff2960c5e3f516062556c8a60e81b9e255fea7ac3306ea9d79aebb733ab8e2
 EBUILD libnetfilter_conntrack-1.0.5.ebuild 981 BLAKE2B a6cf9640745c047eb38ef0cbac268ef21e379289b6230d4042b10b040d8fb0faaecc1bd37a026356e6c2d28c5ba68f73c4172584b63db2eb0f19341c4a3538b4 SHA512 23b8a125ed2dbf01c324411085e8464e60d6eb03980a185b34ff6675065e5a1a6963c001f24d242746f8b8b54e02db20925543f853962dc18694246723b45af2
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 968 BLAKE2B b4e9b7a61352bfe98370bc1279307663e22f0aa642f12a8b76a2cf662b30cb12a5daaae01f32ce6fa3cbf7f7697b49903c0022b925d1f4cfa9dfd60ab30403e3 SHA512 df358cda920583fae2ae4f6e5a02f5ef06aef910dbb37222751949ae3b28acb8cac2019b5658376ee237865a3597ea286b4fb1fe2fa7cdd9f484301c544b2931
-EBUILD libnetfilter_conntrack-1.0.7.ebuild 981 BLAKE2B c39e1a11445e87d8a4dfbfeafaa9a9e3c31903d4632161c7e40ffc5d23513f74d111536a2ff80e1d16bfb481deacd2a5dcc0dbf7f64d0174508617bfd16b792e SHA512 cb19e1486db81b3ed526053a2d2712545fb24160bd2f24da86d07862d79287eb4433b62d8cb5262b699acbdae3696a8b5c10f29b21f91a1e14c200866644f5ff
+EBUILD libnetfilter_conntrack-1.0.6.ebuild 969 BLAKE2B 23fe2a76299843350018cdaf39d284764732f55be25f36daa5c0d922ee788bd86169ae0ecf42c5cb1557745d4917f24906eec3d16b347e9609dba5ce69324485 SHA512 6ffe1a4467ab16ad059b4398531187ae8129707986cad0365d600fb4e91ccda2f8b24c2be9b426ac6a7451b994ed0a4b773366fe997f8443c5fd84cd29afadac
+EBUILD libnetfilter_conntrack-1.0.7.ebuild 982 BLAKE2B 1073a78d6cce12ecae29c76eca220cb89d7915c9e4070ba410dfe47c27506d72fffb97c03cc2bad493591dfaa723beb02ad8fafd683c34e3d21c537683bc57b6 SHA512 8412f0da0de954d391d797086c96c1599169d7c812d4b88e0bfba92b82fc3958fec4fb9e3ef2cfe6da60cf8c23929e9d8baf49a6e79849cb0a6861a42c9829fe
 MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
index 0e2d8d465f37..34dff8ee8c98 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.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 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
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 0fe2fe586750..b7629d8fe9b9 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 sh 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 cff5f0c2b66b..f37e7ada4cdc 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 ~sh ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index 160192f34f60..fe186d0438ae 100644
--- a/net-libs/libnetfilter_cthelper/Manifest
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -1,5 +1,5 @@
 AUX libnetfilter_cthelper-1.0.0-clang-export.patch 12273 BLAKE2B 644fed60ba6e7b3476a4264fef8ad3fc553c3c6fa889a24d0fa85b50e1b1d407ed58f3fe9187f4933ea9d471b1ef0b6baa8f2922957a1733fc1a7eed6794219c SHA512 e7eb99bbf29b95b18c7ff25d8c6fd080f8b77a451cd5d7fe737705c3f5c93f2a078f703fcc91f0d04f3ac0e18bcacc34483bc764bbf6a441d72d41fe539a594a
 DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45
 EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 765 BLAKE2B cf85b6675bd7f8bb6274587787073beb1e70ea7db14ee8ef76cb9070b1db0a5bb484289c22c255847df27e7d24cff6d8044ee8f2b6985668cf43611b7eb19024 SHA512 230a52abc9917748b59d8cc38ecba74f05f11aeb230c4165e8935c187c13d897ae7ae623539e52f09e67150d3f1e3749881e4f69f63153e31ad365cc0bbe75e6
-EBUILD libnetfilter_cthelper-1.0.0.ebuild 697 BLAKE2B 4b241ef9706daab8243b6d2ccd7fca50e31dd32cae3cb4d2d4f4b7d0c879639f1e893a5c2cdbdf229479ef6482d4b214a3c01f9ba6d7e3e64dacf92d4113f7fc SHA512 031daa0c68910d0f3119d3121137d4d829f4742f7944a4e5c217da11fcc98dd7035787512ad7463cc3b9d44e576f61d219eae62f778243778b3a23dd7ed85a7c
+EBUILD libnetfilter_cthelper-1.0.0.ebuild 698 BLAKE2B 6e98f8d811786b1fd580dfab41552f186f4368452e921cae1cbb9bc13985c01a787961f6b91f70ebf7e4b905c000a38c67453ace28b1fb01611b2b6e5a89c909 SHA512 5bebcd332ca49d18ee71dbdc756fde3bb50cecedfc83d9cdbe08bf530a37cdfbe3fde3dd23510542814712116da9e02a20ff9502954367d4c8a5bd17f1251533
 MISC metadata.xml 380 BLAKE2B b3be5da421fcf323bc491a3d1d7d131c0c1ee03bd14929a3e577c6121dc135b89610967f2acb99f10be2eaf947cd45438328fa5391f38a7fbc49ac1e170876e6 SHA512 fa7fe723f37affb303cf3c826c5edbc75ae79b5b4da381f496e9b8fe5fc0071bf45fa8325f9e15e2e7c7f794060d8e924b1fc872acfe0d38426da5c80dec2a2b
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.ebuild
index 9dad9b97b636..e35d8b98d2d6 100644
--- a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.ebuild
+++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.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 hppa x86"
+KEYWORDS="~alpha amd64 ~arm hppa x86"
 IUSE="static-libs"
 
 RDEPEND="net-libs/libmnl"
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
index 50ca14d6861e..6be2b8fa12ef 100644
--- a/net-libs/libnetfilter_cttimeout/Manifest
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -1,5 +1,5 @@
 AUX libnetfilter_cttimeout-1.0.0-clang-export.patch 8628 BLAKE2B 8e0b283c0ee2b5a41116bf3c87f30ed0c13c9711160b64c6f8b2403e9590bb058e42afa5be38d60a2c6156462d31f55dff07d008f14e54661dbd0e60da80886c SHA512 d288dc0ad2fe6e15fa425a5e125e2d953e34bd6fbb7f57f7b7fadec030e7caefa39a4fbe9e7be90ce5aa7f5b4a44ad0e9df1c98ff6100f134ac3839653a542b1
 DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85
 EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 765 BLAKE2B bf865b336ce61e5471d34592fd37eaab5bc83dfaadc231637115a6b9a33c8d83fa2e3c0b5e8f8dc9c61689db6f819a833d7ef890a36f0e6a7c4104d522b2ace9 SHA512 e782ec61b8c9b06fd4d6e9519d001fd93ec5fe93590248fc41766d7c3af2aa5e4c6ff78404d68322ad247e0289e68efbc9d81e9f67efa52b4e56e3857af7e29d
-EBUILD libnetfilter_cttimeout-1.0.0.ebuild 697 BLAKE2B 0aaab17466c3a7ff511b65d12ea978f061e69b80710d092821da0c8ca6c78388ce90772670a5b798140a406c2fc103f3ecd2db7816360beb65e481ea28c09086 SHA512 7b724b75ee17c6e9928d4b7cc65efe252efb1cc628abb332f760cfee423c125c62db1cf79823b4321ccae79b05e5886a0336ed561a98594ce835df677bf9a6ff
+EBUILD libnetfilter_cttimeout-1.0.0.ebuild 698 BLAKE2B 79dba7475fa9e72bbbcd1b3b48bf23f6a07c9f4036cf5c6a394b7667417a0bc9b4acc748c06281c1663509f0b401d77d44d8a1b006b859cf2e7910a5e4b460ad SHA512 6fd1ade3105e8106e7d03b088699aacd6243255ecdcb47b731f1e6b09e81e1dea9b2f3a8a9ae0c622dffaaf0c096eb1d6fe94807ff0c1e58d040b2b86cc0f65e
 MISC metadata.xml 374 BLAKE2B 93797c22573c07b7d3897cd10159b7cef6162c4483a13b93ddbe034cf883953c990ef6f649a177c252706306dcb716057ecd35167a35da1c3a955c586e33955f SHA512 7d6b4b79303957a1668019f24f08a0d116ddd21abdc387ca82ced9bed93b05fe5bd896fc4216d02961fc588204353204d1ea2c6d144efbdfe1cce44d7b26f143
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild
index 0b5c6d9adcce..60818a760351 100644
--- a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.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 hppa x86"
+KEYWORDS="~alpha amd64 ~arm hppa x86"
 IUSE="static-libs"
 
 RDEPEND="net-libs/libmnl"
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index 2e3930429077..be23c1b227bb 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -1,5 +1,5 @@
 DIST libnetfilter_queue-1.0.2.tar.bz2 354201 BLAKE2B 5df5a94ca07a6fb919d8a153143a0e340c323bac6491c3d03f9d871eb3c31e85ab0290cc6f67f678038605e829af0dfbfbb966b1a6b9bb76ea7acc4275a7d3a4 SHA512 89fec4d943b85f35e7cef3b1b9071b1280c6e1b282b7e5cb97eb17d05b9ddd175194639ead986767d27152540fe8e167383a1f7bbfe3cdf874a5a42a2c096f11
 DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
-EBUILD libnetfilter_queue-1.0.2.ebuild 734 BLAKE2B d8d107fefaf2cadf8ab1d447a3057d4dcdb7761be47ab71165a0c7c47c132e75058f88856c957329ee18ae94ed940f222ca986b79f51aa8810da21ef8102b7a0 SHA512 7de798e5f3f7f0454df64bfda182a312a96f5b33b15b86380ea9e3f8d94140d6f8559df945dfb81de2768ab90ca54cd1ec1283ff7ce4620ed9f64057be4deaa8
+EBUILD libnetfilter_queue-1.0.2.ebuild 735 BLAKE2B 7fe221b9fcd4c1d63a41780ad66f9546ba62920f06b467243480479ff08cb390127872d911c6645e2e99a786e4f7a9236c235f4472c9cd55b75667aa105c18df SHA512 325bfb2a0129705224d0c62269de7ba36987cc1d30bde44e366fd3f821f2b2b17b321c721004ba419ff3497f6feaa886f5437ca7915a2d4a7a5665e201751cbc
 EBUILD libnetfilter_queue-1.0.3.ebuild 731 BLAKE2B af4d66659b119dbb220e8d01a735641447c01e1bfddb5359c9eac608b874264046597c28f9c98a3df9fbdf6eccf233e3a1701b6604851c62763ad6b4a96b7a05 SHA512 9dc9aa4d5041c691faf05cd855b60d5a60eb87632bb9f702ce768f79d761b305cdbc45f88f3e0fd440185a254f6ff440e72fe03a50e8045dd1237fdfa108c8e8
 MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild
index 929d37364501..5a763069ce20 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index 283f9ee86a97..b1c2429ad278 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 1490 BLAKE2B 00d5bb529d106ccce36e8ae5f702edb28abda84998b02aacf09e639fcb38d924977bf7746b480e43610cf4a757c4d50eef410a0b9f70f39199bd6c7ef9206cce SHA512 ad29e647e4d00cdda114b8579807ac3546431123008fe7b3f40260bd15fc5a530b5f97b242e31d1687322d11a5c278d9cb5f11730d5e8a419fb7b98f4b48dbb2
+EBUILD libnfnetlink-1.0.1.ebuild 1491 BLAKE2B 4518555de24016fbdf500c799889ba3b4dd7b0db9f42e9175c159a80462803be49f2b603324b760f0ae7119af997a77be7e5bccaabaca4e18e98dd217793b8a8 SHA512 b50e44bcd24d5f6d0f5551242c2a6fca5ffcdeee022e94b9b218ba29ecc3974dacab7b1850b07bbfa3e57684fc0a33366baad1ce440ce674a56a4557d33a781c
 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 77067c877d04..7f4eb46d560e 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://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 sh sparc x86"
 IUSE="static-libs"
 
 DOCS=( README )
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 2025c89974a1..57a2d2ef3811 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -3,6 +3,6 @@ AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37a
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
 DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.25-r1.ebuild 1222 BLAKE2B 330ac209ea2c836320d71cb91738cf140a2207664c469c0470fb8e7d37b8690b2075cb67c727019a738a3d33cdf1ed79f956e7d1abd781787a79602472549e90 SHA512 aad280f52fa485aedbc4fd0856f57367bf25aa8888aeea550d2683230154671d963b6645f972d48c0e9d20c1560a07d51a4eecb2d6ae442f55ea4de71fbf1f8b
-EBUILD libnfsidmap-0.27.ebuild 1343 BLAKE2B 236b89cc71a53cc3d2690ea33eea195069d18615fb39136ca0ebb8d011711700a38cc1f9a1a57d67968c275574806092842c742844a742c6c3b78c2e4827ed6c SHA512 502ab6399b26f97661ce82497963cf318712dfaf3d9d60cd389374e74b09c44324db3cdabb5a2ac520d0bd7124c4d7fb9fd8f654b4bb0807418c3e3de1feff3f
+EBUILD libnfsidmap-0.25-r1.ebuild 1223 BLAKE2B ae79a23338129b33a90dbfb413e7e79e7c7197ce49cdcbcab99d85e2fbedf3a3be6d554e599c1efd43c91554d21cd57da0d0f06762cd33737491100b3b2fc71b SHA512 6755869f3548ddc644923c8d0bb2fab4ddf49eff2132ee3947ee887e4453cb0d0fa4313c348082f8ad427d3103f8b4166768b423f278c607b969e0fb5452ab29
+EBUILD libnfsidmap-0.27.ebuild 1344 BLAKE2B 564b19b40ec929cf5935b4f7dab0b646df7f684096e1f67c404772f333fe8f73d45608d102605d1eacdc90cde1a9f97e75fa751e810cfe564286975d751c8e2f SHA512 571afccadb16609314c71ec1ee0bf1d6624d13f6215660910add92af96fa0c278d491b56cc3372376077639d3f6c60c9f7b573df89b9785c0a7ffe88b01d4de0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
index 97ca93fae281..e069cf37e05a 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
 
 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 sh sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
index 77bda5dce31f..868084a9906f 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 ~sh sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index b43ba28042bd..13e031c1c287 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -2,7 +2,7 @@ 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 1191 BLAKE2B a95ebfa37d23c20e23d978f2cbb90629c4f0b525134e47106a3cf9c5a80de7b6bc924cdbc76f1b7ba532cc0fde5c56820a25ef36be5c63f235ac301bb6dcfed5 SHA512 d076046e9809dd532d7903b6b55f9958ed98cfe0139f1d11f29d4b4187161923d148b9280ebf3bc03a6505bca46b6d2e3d34c499315f44345e2bad4d4055a364
+EBUILD libnftnl-1.1.3.ebuild 1192 BLAKE2B 48ce07ee115942e601082e6e6d09560b7ded6126a9c12ecb594b78bffbdc1693b8f5ab7626293d822e1c5628871ab8cb9d054403fcaeda29a49c2292018095c6 SHA512 5638ce0af63f2981098024414e146af7f451531da472335cc0340f1d5afd12fa55572140cb4a96511fbdfc86be79688b3f1494adf6eef2db4193b1060c2e2470
 EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
-EBUILD libnftnl-1.1.5.ebuild 1256 BLAKE2B 8855d31b7e2bcc4f987864231f08bee17a440790c05f5d407a9d6ae91faf594912af5ab761e029950c7437a7d617eb29d106494e15214d54495db441b50cb26a SHA512 0ea44c78c770f3d8b1d6416be4b88a0cc55ce1e97ae7262282a9fa461bc36af12d8ff6e9594d5ffaf684ca7ef6a8692ef486781b5c63d54456e104e29e56828c
+EBUILD libnftnl-1.1.5.ebuild 1255 BLAKE2B 3ac4f306de704aac6c2936fcc310606f59efc165d91cb17a4ad74c8708ad24546d418e41e3dfcafcf7ffd88ba0c91cc603a9c8f48d749d3c12c8af8d68a4b998 SHA512 3d206d7e333391c9f75e5ffde0118a7e4030e18ce6724ebaed7bac34c31e5b3c915da5b61443d48f75b55f17a2861e2c71de5e8e52a69cfdff58ae341c9ef359
 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 985d410c3a6c..7419887359cd 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 e9f2995b2868..cee09c2b2a12 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/libnice/Manifest b/net-libs/libnice/Manifest
index 6fd279145dfc..9da049c507e1 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 1566 BLAKE2B 4b5dcc470188b8fba4435ed7be47dacda438d59821ecc69f5f6875572d91b3bc6a4039febb7d2c241674122b6db0aecd1dfcf2c15a226bb144850d7b403fefb4 SHA512 85220da97849a1202ff57fc6864011bc5d6c7e2ebccdc7ca98a852af08defd5616dd55bea86cd101c60dda24444258d51374124ff2ce52c50f47a6dd7c0b0137
-EBUILD libnice-0.1.15.ebuild 1756 BLAKE2B fc666c0ebd79c3e8e271dfce4ab139a3c52d75f4a03cafa809fa73fddbaacd4b0f253cf941ec703cd13d857584f98efa861865f7102877d8a28a918f595535ce SHA512 6d1b127fba16c9af920a3a2baeacbee5f4a58e8f65cc06f14dadf7032c2845da6fba52d3e3a430d9d1f9408d9bf5872344bc00fd8f196a5efe886ac2ac99f9a3
+EBUILD libnice-0.1.13.ebuild 1567 BLAKE2B 2207b245d4948206a7a442deb0ef9e1179105516127366427bb17ac747245b2a59dda65d5071d5b158affcac424d1f9cde4dd76d25c5dd1a0db5b5ef7f5afd3a SHA512 9c56ca2f7a6fe9b038b6a56548d6e0c73bc2cb529263b2a86b4406a0507d5f89a6b9e461c148bb4555ae85f05f7c4c77e8627bc4553c1299bc8132cfdcade622
+EBUILD libnice-0.1.15.ebuild 1757 BLAKE2B bc0a729e748099d45813b16ace34d4cef84af5e68c09a222fbdab2e865e4829953cc2ce2cc5ca6290d39fb2c6673a4ef556ab79acd36243a71bee9c01148d7d8 SHA512 40cfc7e059c10b798a8356519b21df122f9fd02abcb18f737ea31ec8aadb29625a29dd6b678b1504e259e1557c81e48648a85fc4166235b381516e743bae9373
 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 6d2945cdeb5f..5db85112c135 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 33ecd41e4bf4..5ae866da4646 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 83a05f8a886b..20ddb84bf06f 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,6 +1,6 @@
 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 567 BLAKE2B f177900284d5ca68d483b67f1f371f4f329206a930c8cd49c531d59795fff4268af2ffa68e2627880f8f5f71fdcb9df53e3416c1d8b60f4da75257bfba802de9 SHA512 a05cf1e7c8f24c96ead7a7483500c699a77fb01edd779f6d4c897ae4196c851725a55a87d48d01badc52b35537d45888d58114b31917b672440537faa834cecb
+EBUILD libnsl-0-r1.ebuild 568 BLAKE2B 97d5884c613727bc651317f8a244085a724f67ca4120851a56b328ab510f384717a02d972ebdb300a95ea402070ee166da78c2b18e680eb340a965410ee9e8e1 SHA512 58c4524832511c93ad8df7bd3691ba98a393d25ffb7f7884a7bb82ef95a291804c46878f74d8ba59e3233969ad4371bc4386f08eab2d8f1d5d3fa031723babd5
 EBUILD libnsl-1.1.0-r3.ebuild 892 BLAKE2B 1c243867c38ff5726b35d48f60f984fd950c6ca0968b5e8f6487e9b25108ed6cc3464201829424503a6dab92ba4b8e259bdde2533a1be5b8112f3e0fecd5567c SHA512 a3a17f4d91553e6fb5b5f154509e657be6c48454b9023b19410401bd307d7ca932bda806598db4a55644ee442b31ecde910298ac179f87d05f00ed5bf6ee3ad8
-EBUILD libnsl-1.2.0.ebuild 912 BLAKE2B d0cb1c48fe3f6357a6b9d59a67b1d1a2704a4c75d145ed35dfd2468c1eee6b42a687b5afbc3e060a23a19e226a105623415bb42d8ffa9011dbe39cee5e1def44 SHA512 bcbb0585be6dcd61d711aa06a70f1af2421b02605cc9d22123c50582d67eaaf1afdfbf82dc0484f72f872bf177589c2c6c76c20dfa628440e4793d73f159836a
+EBUILD libnsl-1.2.0.ebuild 913 BLAKE2B a683bd937b16a437e2c94a7c1467861bdcc458dacd6d9f3b578f09cb8e565697510f5d66cd03a41c10f3d440836119add33d11201297e228417d8f0237156b66 SHA512 c7a1b5b97fc5d667efc6255a46a6ef845e44edd67fe15af481b2c675f1c658d82748eb3501f88d7e4048f07fe8182d6c682474d26b0f5c05351b4504a3397fcb
 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 ae3cd9e79b33..f46a44178cc2 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 sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index e22f84d1dbfb..9d9a7cecd1b6 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 sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index ed917ca1a8cd..f6da957de265 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 435 BLAKE2B 9175e279415c74a3f04e2df33730eb005e46507e32d899cae7759cac7ccd9c7b3365b297c19882986088fcb288dfd3ee485b9b3206772106bd657839ebb6aa50 SHA512 0a2773592b72e50d503638e7b6744501162bbefa97d9d9f7dc5ae171d6f7108708bc84dde41cd7a0e568cf30ffee9f02645196ce90cdcc029fc8d7dd5c567d7e
+EBUILD libntlm-1.4.ebuild 436 BLAKE2B 9110766aabb8a9ca4699a82587f5a4e60fd11d0561e19ce779238e6d4469122d8245f42e6671faf38a01bffdc6a527bc8a0ec90d8cb9a45c7bacf35d6dc8aca4 SHA512 cbaf634723a125fb1b8a455f1696aede78a194c08be321baf50464521e3b7370bacfe45e6f746929f350305328188b6145dabce0f5f469cb8f2df0f746b6f6a5
 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 063db00f1dec..1a1fdb3b567e 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 aa7c0b1e2f19..fe0b3bc87d6b 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 1574 BLAKE2B 2ea82b2ad55d4f4d9c2257732c75dc3d0e54b17ccae1a36bad595ae649df8ef48f0f5b074c4056d2d3824ab7e3a34315c9a333208b3caf8e017b08d58c588c46 SHA512 a09e3fec90db3a57228ed6b80c19a1debc87555242eea72a43cd923b579bf0010e02cf1b09bc84b903b5bec6cb43c27e6e9b8aec4204552256c4303b8f05f29b
+EBUILD liboauth-1.0.3-r1.ebuild 1575 BLAKE2B 0ea574bccb54e22630b45b486eac53ff9631dcee3d9829bf648b593a0a28544494c222fca551eeef5dc6eb3d6035e88c4098143738226dc2e29b87f4fb0edce3 SHA512 b99c69353bbd8a32243724363ee2f65302cfeecf7a45ed0fe18b5635bf9e788f0f6963777815d4d1ce5ea0ab95fe477885098672f11c883e11dd09551796b5bd
 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 3540e299a28d..6b2538ef7b4a 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/liboping/Manifest b/net-libs/liboping/Manifest
index c2f3fb3e37f9..ebe99b6e31aa 100644
--- a/net-libs/liboping/Manifest
+++ b/net-libs/liboping/Manifest
@@ -4,5 +4,5 @@ AUX liboping-1.10.0-no-werror.patch 240 BLAKE2B dc51e4dbaa3259d9e751d00be4d61f63
 AUX liboping-1.10.0-report-right-error-msg-when-select-fails.patch 963 BLAKE2B 94ae49152a81164aeb73a3498a9c2a1b2c901b578387cd8c4a376e0f2583d63aded21d9d22552d5804b332faaf9770c961e7e9f2a7312406aed3de68c5afddfc SHA512 506e28def5b7337fd6f883041ee4b69b1bfd4151b30fce5dc330d4d08fed4333c951e5a58791b5fe5d5f65a2126a4268e7bd902715bfdb663f54814cdaa13348
 AUX liboping-1.6.2-nouidmagic.patch 741 BLAKE2B c8ee54176ded65740d5b035a4f572b45b42f8c4f6f99b723eef7c73d459c4b38907570c3da3dc54c2b71a360164ed1d84dce44a2053050c7ef13f72a13b36ba7 SHA512 d991b2871091c3e92d6b194bfdaa77db34455aec3c32087fff0a02ccee0e1f6fa0e0453a61d28a0fc9549644359f91425efef0b94e37c033d4d43b12bbd7b07d
 DIST liboping-1.10.0.tar.bz2 318150 BLAKE2B 2fa8719df251116c51aa93262697751df72b93368d543e5bb34668eb1bb07d7c0be143c943b32b23ee8d02e94ac2cc66f46f923ee4ab672b414ef16ce2f75acf SHA512 f1e9984cf0c1df89b29f7bc657c19a5439019db7643680744d8f353664b6a53070581f40b51e72f896c7df88799c6868257f6308e1a9d84b4d2a0666491214d8
-EBUILD liboping-1.10.0-r2.ebuild 1525 BLAKE2B 0d94ad961d13162f64372dd68e4daf300852ffc4d42f9a60e3dbbd80e8a503eb3efd0b8abad4743c55501f330265c3499efc9644daa363b800a70e6ab049d441 SHA512 9664da516ec6598bf373adb101f01e20a1d026c376aa1164f5b49b244d8d9c2419b3ad0d03725f971d9d18defd66e1c616f86107b3d659170a543b3523c4a2f6
+EBUILD liboping-1.10.0-r2.ebuild 1526 BLAKE2B 0577850ecad3d6cecdecef60fda37eff4192eab888278fca45bde5d39954e355f471560932bd88f6729200155dd2ad94664f456b359e19f44efcc168e8840fd5 SHA512 a3ab76ab407389d65152cb90fbe5ea6c24a3477cf48f26227207e278a4182f46cd7e04201f0a42c4740dac8d2f1826c89d0798045efa8508ca959ff9fc06cb61
 MISC metadata.xml 717 BLAKE2B dfa3179582723dc5deb92ec7a8c0bdb39151f99ef68cd5033dc867811574c3b46b1390813caaf65aa18d5e3fea13762b7f5d38069a775c703ee6e849275fe00e SHA512 ef68e308920311969fc83de9e82e6e97648b5376819a5a122e1aa4c68ef3f6ae0bad6dc95a28eb4629f8915c4658facbeabc7740df090cff2598b5ebbd049edd
diff --git a/net-libs/liboping/liboping-1.10.0-r2.ebuild b/net-libs/liboping/liboping-1.10.0-r2.ebuild
index 6cb053832fe9..f0b1c2e7bdc3 100644
--- a/net-libs/liboping/liboping-1.10.0-r2.ebuild
+++ b/net-libs/liboping/liboping-1.10.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://noping.cc/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/0.3"
-KEYWORDS="alpha amd64 arm x86"
+KEYWORDS="~alpha amd64 arm x86"
 IUSE="+filecaps ncurses perl"
 
 DEPEND="ncurses? ( sys-libs/ncurses:0= )"
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index c9166d08d77e..3bca8e67dad7 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 687 BLAKE2B dadf73107171a83c518914f207c7708625d405a456f02f7b23c7595dad64774269c885cf4d4247ebb083438917a0ee2741ffdb9acf3d186a974f2f7aaa1077f1 SHA512 a530c2025bd24001ff89554d661eb317e3c0d2f80b7b2d25e17574477295fbb69b8b8f1b5fe004a98d7581d50795b0be007de0b4beae26e223435d15f6b1dcdf
+EBUILD libotr-4.1.1.ebuild 688 BLAKE2B b8a3b34cdd76f2449d8950a539e632ce3ea263286e8652bf1720c1531196caf7e9bafc4b214784869c9ae6fd3f7bec4d36e0a11339ebebb46b100f32d26f198c SHA512 5c249cfb798340ef4934890aa898aaa1a0751554341284a0986b023aee90ab911473b1e816ecb213ba189d0cde997ab662a375a546ccd42c776739437ea324f2
 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 ce15add6ba4e..913b278fd97c 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 9018dec6f44f..ccc49f58f82b 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 1884 BLAKE2B a34eee76cbc93af2422a8955cc3acff6f64d3f5f37872a1483a8e8f2a0f31ad9841a7df7d4a92c6bfcf290f72648a0be15e211f41183fa4af5c4c57d20093f90 SHA512 88e91069f211a817e31eca03b089fba36460acb6611df2bf318476925ca1f060908d799cae6272f37c0a7c1a87ef8ee95a15a9fa0a051aefe0b50261edcb7443
-EBUILD libpcap-1.9.1-r3.ebuild 1866 BLAKE2B 29020b5c2af6944dd5fb9d5905495970cc531399a6f61acbd51ecdd6aae6a30c3e1e5b54f9725411c2fa75dc228fca1c55c612afd84f178c63ff125dec1c445e SHA512 6c569bd80d6997af0790df6409b9c13520ac7a9056576311a13309a4c12c3d8c6a339b9c863bab39dea895b085d2424c86c5d1cb0132127fa71ea9290e67f832
-EBUILD libpcap-1.9.1.ebuild 1762 BLAKE2B 0af976643a8d21329d27e4a5cb67ecb7cf0e9eb16c9387ef4b562badb8d55ee851d1c9ec15a42aadcbf67b86bb0579c2fdd3931d5f7e4e52fe34d1a16beb6523 SHA512 757cca1aa5964ce64bd6bee285a3bcc99ab225dfbc63433871964bc84b07d0569ffd2e645a2b98460cba7e539e96048b9cb8526ecbd4b90215881b0c0dca721e
+EBUILD libpcap-1.9.1-r2.ebuild 1891 BLAKE2B 17126e5f18ea988e73e2bd47643bbb419f783cfe0e6d59cd1f45b1ffc0a4a83abe24ddb2d5d0a9332c1a35a8531708271dec8b43a30efa5f2ba99ae9529f2eda SHA512 e7207fd3b6727973d6c3fa766fc140e3117cb5ee936abad08ee36b9557f1d8e8a43be677e47cc1cbd8a5c9b344f17d29725232418e7bbb1795c9f61bb6aab0fe
+EBUILD libpcap-1.9.1-r3.ebuild 1873 BLAKE2B cb06d4694a9bcba570ebddbb4426e86f1c6e8f56b85dd498408badfdddb7a44af901be602718bf8dd34f8072dcdb390fe8713d1c23bc922c428a30682c022418 SHA512 2141fced1a48f22288aa712cb69229d1fb5e5583c9bdf274c93bf48dca556f043b757d53d331195e75c6097153c46f210ae79f0a347d3a059eb562f733477614
+EBUILD libpcap-1.9.1.ebuild 1763 BLAKE2B 139c2018a2f15097971d814b0a85eff10fc24d9381472fbb0e1481bcefb789376dd74be86bc220e1461bb8351e86c66cf570e815c08e4997ec1da852fcfbacd1 SHA512 a24b353553930a591fb0aa78e08b161132a6fbab1e1c0b1b5038cf4c5762c8b22b157183000360826660addc40e6afc969be15ee254f78e736b4f8ee8cba1ccd
 EBUILD libpcap-9999.ebuild 1661 BLAKE2B 306757d0d320e1da01ded053903966f50375f46c14e8d2ea1b9c0fe9282f9b0bee25a8ce8fc9eb5fec2c0fe21d1b3b0d93a5176e71bbc700b7f00ea9f83845d8 SHA512 01caa0d110f040593bb54480ad8b2605105a5a9408571ac35a4ef66ab2cfaf0b3bb40f3777b87d0956895be61d412f87a97af2dcc3ffaba2d0d0c467fed88254
 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 d2811226707a..19c8f3201728 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 ~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 ~sh ~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 9628a24a510e..0e379a44fc38 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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~riscv ~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 3cf06cfdf4c3..ab9d35c786f3 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 ~sh 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 566763bf675d..5173dfbc36da 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -10,6 +10,6 @@ AUX libproxy-0.4.15-python-3.7.patch 774 BLAKE2B fedb3b9c1f003a24706a8b9b66d70f3
 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 3162 BLAKE2B a47bc29f68d55349482c655bceadb23863dbd759eaf932d2750ecc9d710d2e5fde03ddd919427fe194d8c343a300214bde41301d8b467f3ca57114455b84d588 SHA512 b78198fe3dda3743208f7a1e0f4a04fff1d27e34993585591c32ef968759dc9f8372107d7dacf5cab6794404f865ae4e26bf74fd5c76319d4f944b94b245db1d
+EBUILD libproxy-0.4.13-r2.ebuild 3163 BLAKE2B 25c81153d2e89f3f7de46f73ebff9a97795bf971b7d7fbe26bd2071ee2a16e7c193fc80b89f789629125cfb7374adcab68bf7b38d917ec619b5a2121d69a9d7d SHA512 f6e62e1caf57342e4f0cf44e43d346a5fc24e5a318ba3e17da84226431d15cdca7aaf21cb53391d1fca0dfdacd9d46590a0a8d6420947d56ffaa9ae52b370d0d
 EBUILD libproxy-0.4.15-r1.ebuild 2742 BLAKE2B 9003e479144af87af66dadd27f85f9725eff3039f7bd549e240509bcd5153be695bf53f14f011a036ba4b465f367ea10f3f1c4501ecf6f3c2f6a0e76d25653e3 SHA512 1df55a2ab9368c149fa0d59baf92110fd76c1319b66b1e37003af0a2879d6149f002691bbd02d02a535bde50f9c60e787f8f19099a695b39514e7ddfe763e7c8
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
index df49a04dc033..7b64ea32c3d1 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
@@ -13,7 +13,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 ~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 )"
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index c5eabd31d0c9..f397f5dc8902 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 1471 BLAKE2B 9af489487b1e22a454b4415f44bd0fe9e1802b4bdf1746aac66a4eb449839c39ac49f03d62b95c2567a67bc9ca515d7a5a11a8f5f9d13c0d23506189057c1fb7 SHA512 021bfebc1b92093254849da5049b358225b0cebfd3bcf91267287010db72fec4bf12e09641501ae086c69a50f0181af95bca354b289eca364e71932beea29798
-EBUILD libpsl-0.21.0.ebuild 1479 BLAKE2B ff312ad95930488766845d42231747110e760c3af16413197bb1ec17009187f4279a154d1963e594e7c2fff180e382b602747423a14b6782761c98559a86377b SHA512 5e8d12938ddfcde7f429330b02c863325d407c55d1d3af5e87e18c91137123d6794b8d84ab79b648c32304863145c7dbc03571e03665773e6052bd8160ac3fbe
+EBUILD libpsl-0.21.0.ebuild 1480 BLAKE2B 592b61af2d34ed4e87b579258f62f748aa004b5cf85fe14d3f2d7043d401398f306c0a3e9b2449f7f099a36a1edd380fc4a935fabfac2139a386c8d121bf7fb3 SHA512 411c42c0d1ed1e73cc824e1d8afb660ca3e58166e2aed92278053cdc5961cbe386051af1976552ae57db5f152815a7164e94aa1dce1960e33ecb8a6821cd906a
 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 d7875f69fb95..8d013ebe7b36 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 afa4e23ed3fe..ee4978cc350c 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -9,8 +9,8 @@ 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 880 BLAKE2B 92da9999000bae998ed7761373ec8d5dca977280cfc713d600de73ba4a9b6c186503cb9c7149d9167bf24b931e4decd2cf87c3bcb3f155ee0196ab0517f3f7ae SHA512 0096c65f111f796ee1ff6ffc26053bcce03c65eeda12fa7bf36c038768fe027587e0666104f66f107784cf1680810da28b2b620c4710a5df2032cd7e5a4c2806
-EBUILD librsync-2.0.1-r1.ebuild 670 BLAKE2B 4ce6598ddb823e0fffcf09097b226820dee13699b15e0df10481394014f803279674195f5781a17e4a417967f4acc86102ef69ab3c2f87b0169ddf677b9a8b52 SHA512 bb4ae215c3680313652ac5e919eb3c3458f9ab42b968b33b29fa250537bac4de32fe6522e122787a42c5991091cbd1f0459f2bddac48601762324570dc41d253
+EBUILD librsync-0.9.7-r3.ebuild 881 BLAKE2B 11af3ef5b50b1dad9af3bb45a872ae742533a09e9f83266df6b4a147789ad961a17d6127bee4aa2352f0d40438b790e32575f6b90591ef8efac467c8c3708678 SHA512 02013be43aba6b59445fad391eea345895f15affc4d6e3c453dde234e67f991b6449514d3890bebe100bc12a0dfb571c7a5f3db9d5723aec757fe47a94bddc83
+EBUILD librsync-2.0.1-r1.ebuild 671 BLAKE2B 973af7eecced2021f174c59cdaf2cb5cf9b50abc2a3bc2431ceb07f9fefe9b0d758846915f86da16a74db8433ec717033320eed6f065cbbe42f23adb44668236 SHA512 7eada9926d47b5c1687cb358dbd180ae6acba8de72c8ea1b45a155457dee2528d553214b7d693150af6c19051284e82f879db6288e2bf0957f55ed76fa614038
 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
diff --git a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
index 9c75b6826a29..0bbfafffd64c 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 sh 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 c79a64554adb..f163fa486f77 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 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index dfe28cf816d0..000a51994670 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 970 BLAKE2B 49174aa06ca0c7b3b40bb06e8a3cfe09c1a3efed67e5dca8a31beae6f7f2b4e43f03a9ff715d714d35757b7ce22eda0058bc05f55c9177c2cbd243dc9d876699 SHA512 5f311cc7ff7778538dc21f091e76f5d8c5e4be70dceb3d4662297a3c41f61b3a60d269929e1299c33c20c75fef40a0bc3af905e65b73bf866d85b906e7ed89b6
+EBUILD libsmi-0.4.8-r1.ebuild 971 BLAKE2B 41e2f22fc7fffc35f9ecf21bde1c7287c27779495aa22cf3a5a6f6ef236bb41626a5d4e994133a6058e101e3a16de319fb38d044864a27cb1890edbdf68d5b42 SHA512 a66ca9f9d6a751749c6e73665bf0a2d900629fbb78f2804a2bb89021214178600ee393e359fb6ad7cb968a1ccb94dcb9420f2652c1dd993bb3cdf24d79742ed1
 EBUILD libsmi-0.5.0.ebuild 890 BLAKE2B 579b65fc089a10607f391568c809a3912df14138cd0c8ca1e65f6f48cb6352881df7aab7d5b650d6630fb7b156d8da37498de4336f1d18e637a2daadc115c12c SHA512 bbfe00c2fbe8fe284c2bc2cd068dd6676cab55020cdfd26b09c431ad7dfdadecdd35ecf2790f51c86da246148d3adf2ec61c9fe4c3e18b30659fc5e451e72476
 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 ea0bf896ff10..3e6d18363e0e 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 sh sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index dfb28cb8f1ed..466336c6f7ae 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -5,7 +5,7 @@ AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 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.58.2.ebuild 3012 BLAKE2B 3bb017da566ef31d77e6c1cb325f293ead24763a0fe63c21a14a679a89502a9cff0fd40f785d3eedcb82c02f5444efe2c7dbda6ee36952b51566e5631c070d97 SHA512 e7b7482cbeedac185f3dd30700adef28d80c510ffff6966e872d8314d59d148644b5b94aa002ea93e9288172ecdbe652199571500336b58595b5602b227f1d48
+EBUILD libsoup-2.58.2.ebuild 3013 BLAKE2B 1450b2256aa632d07f1e4e9ee0e9ea2e05e4e2762b0e56a90400d35f1ee8ae5008943ec9207ebb48e04519e81b561e6d8950a6aa0a9da0d9fcc8a14997f0a12d SHA512 9bb7ae42f9f740c1e50364a95d64ac90dd3055e0fc4ab48448c05af1b09cb154dc3c2f75c3792860921d05635e0878bc52e5f2edf3d49ee71a1f205dffe9757c
 EBUILD libsoup-2.62.3.ebuild 2921 BLAKE2B 6a14f5d15e79b4da02d367256edcb39f1a67c1924776fa7fecca2cfbcfaace3c432930b06836a161c899bf481ea603e78c3ae9443fe22bfe707ed855d53bf6e9 SHA512 2b759c494e6ca3b008156dbc790f4b46c9f363e107adc8873725a7dc046a748a7659fa952e82f2ce6baadee595d4ae8907d490accfa57ec943231c4d015d8e5b
-EBUILD libsoup-2.66.4.ebuild 2774 BLAKE2B 5b82d42cca5f740935d948605441a5797774df3bf582fce27eea2d9fbdc6b75ec7bb9760a95fce7e28dc374c850f89ddd1abcd90c92d797413e9482ee8128969 SHA512 539b2256d4ccec37d2f1f061009b4c913f93bd90423b8d26943dc8f8646248cf480303cf58d1e418c4b34555c48b072e2f97bda38ebce0e9cc9463b27618c029
+EBUILD libsoup-2.66.4.ebuild 2775 BLAKE2B 7d25d6419d78a71984c815998f0f04c4518e41845e89a7dd8c068d16df9d1be48913f2857920c2a1717b3f27f373ca714b01cd90dab626cd5fd503181b7d4d35 SHA512 fd37118f4aaf39e4ce0bea567332239676d1369f458e8b5e2ef5c06de57dce85182fd150832bd6ef5d0b069bfe3f1835a6f31065179a55c9098b5b89a075fc12
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index 7e693939d69a..9226739e9650 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.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 ~sh 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 c6e41462f357..04739eadca57 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/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 5f668f33f17e..99e4b6243b89 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -2,10 +2,11 @@ AUX libsrtp-1.6.0-openssl-1.1.patch 11603 BLAKE2B 1d5addff655f04bef9cebc79690a97
 AUX libsrtp-1.6.0-openssl-aem_gcm-key.patch 2704 BLAKE2B 686530bce1ba56f96fa6df4606e7133aa38df0f68e3636c7c599da54371383bc64dcb63baf7404b9744ec3bcf3f3548a4877edee1ab4be699f40ad37f10468af SHA512 f0b6156494c2c8f0c3dd78142203bc15ec52f3176e01dbed74cad5302b49dc3e146cd75a4fdaff30a83ea3b8498c1e147f0c820533f362af0a2b8599087ff837
 AUX libsrtp-1.6.0-openssl-aem_icm-key.patch 3870 BLAKE2B 47dd3f9def13b48cc19657bcaf8a8c4ed77e2a4f738f72119f64825865c8820adb8ea2675695d8ce1b021dc61cdd6f478ec76fc97d9c9942178e63c1d578dc80 SHA512 561ce042f2216cdee8926f3931407116294aeed170297bf325fde02cda86a43d71aab538f2b54b2b7727a02629903c9aaf36cfe84dc6a2e4cda9388047519842
 AUX libsrtp-1.6.0-openssl-hmac.patch 7673 BLAKE2B 92d4aa2699b324b81540f2e2fb360e1a4864b2626062c96265dade3581ad3af7119e0f6ebd8b1bdcd3591bcde29bffa2b516ed9ee0bdd4c578a5274805c1a7cd SHA512 c187d0249243e26d6cdae4a24b593651fb006b473d0a72b6c4c9b6ad2025893a37e33b163adbee728aa702223397b98fbc38ac2856b737dd03fd067b4dc4baf0
+AUX libsrtp-2.2.0-gcc-10.patch 724 BLAKE2B 559079dd02413b25fa03b90bdbf709d2b16ccc5b0f0db97fb2558ab21773648d3e0fbded74b8bee2fe6d94c68da746f156b9d7b3b3b682d809715929f4e597a5 SHA512 3a1c51620af703e9dd061101e29288458452f9d0f2758dd29e9494689357d3adf408cdc7e2f60fe606680970364c0d55cc2bb4e7618b86b76384f6ab208352ed
 AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cdddb6a959dc59d0fcaa340faf5d04ad9b6803d676d626ce6cecdee1e097defc3c69df7e1216f012276e81c22fb043e6b0e633c4 SHA512 b3c80f5d05748eeb5d93f1c5fe2cc73b3380529a8de44315291fe2a9fbf32df861dec511038f551df65c2cb2592ce337d497c06c8855ce8dd1def9a67bae40ad
 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 2398 BLAKE2B 2173fb4622651c28f714c19e7eaf6848f9f6ca95264c3d4327d81e4a0d938c5683a8e5b2be09a67a96b665da326c2bd22a0f3c76a65162118c3281037c5f02c7 SHA512 4d863311f0b0fe068b261f58b1c72d8bfcc789d52a5e6c1f55b9be07a7cc9d13db4090e5a11b9fe1cc896d4e56e5f82463cc09be706bb02c8464157f23536584
-EBUILD libsrtp-2.2.0.ebuild 1863 BLAKE2B bd1dcd6369ba64b441a168a0364a6c1dd117fe8eb651515c87ec9f42c20eb189bb5ae4d11e288ab6e2be32c9da8ec1c832481fbfdce69c4d3d6b659ef3cfca16 SHA512 1fe796d21c84cedb16cf09397b57215164615386599f43f00d2aed08f1977c394e4799d7fc5ecfe48739cdd0bbac9ef2ce9939269ce95a298dec45e61e7dbafe
+EBUILD libsrtp-1.6.0-r1.ebuild 2399 BLAKE2B 207a6a0bc6e71c738ad27eedf4fdbb55b59d3aa7716a78651deb2bc9d87db8477e44012a459dbe0c9466188d172260c161f337f6723b04a0214817ca2c2d9e65 SHA512 323bb9318ba07ebf4f426ea91680981f95ccdf749ed5d73fb753deed79d87495c2c48d0bf3876e87ebc3ad93ece12ad82f2b1a34f876f9bfee41aa41830697d6
+EBUILD libsrtp-2.2.0.ebuild 1898 BLAKE2B 45632f9983d710f4faa9a4b71385f8cdf500acab47e3f4d5bbb266df4818934bed9be6d666fa7b38dc8a49c47de6f0c950ac38ba7065d60522e141a7dc56349c SHA512 554864d7db3374042f23eed8ca99a93a930dc50d3c133efe8d57958af97a6946301b7aa5bce234db3a4dc934ae37ffca1210f1f9d06d1ff4618a65d39704ef48
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch
new file mode 100644
index 000000000000..771ae0f51448
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch
@@ -0,0 +1,26 @@
+diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c
+index c0dfece..ec2fe6d 100644
+--- a/crypto/math/datatypes.c
++++ b/crypto/math/datatypes.c
+@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet)
+ 
+ /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */
+ 
+-char bit_string[MAX_PRINT_STRING_LEN];
++static char bit_string[MAX_PRINT_STRING_LEN];
+ 
+ uint8_t srtp_nibble_to_hex_char(uint8_t nibble)
+ {
+diff --git a/test/util.c b/test/util.c
+index eb203f4..04e149c 100644
+--- a/test/util.c
++++ b/test/util.c
+@@ -47,7 +47,7 @@
+ #include <string.h>
+ #include <stdint.h>
+ 
+-char bit_string[MAX_PRINT_STRING_LEN];
++static char bit_string[MAX_PRINT_STRING_LEN];
+ 
+ static inline int hex_char_to_nibble(uint8_t c)
+ {
diff --git a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
index efedd66ddf54..93b4e0249db5 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 a66f1cdb1db5..1ee4065fcb39 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.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=6
@@ -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 )"
 
@@ -25,7 +25,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES )
 
-PATCHES=( "${FILESDIR}/${P}-pcap-automagic-r0.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-pcap-automagic-r0.patch"
+	"${FILESDIR}/${P}-gcc-10.patch"
+)
 
 src_prepare() {
 	default
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 7c42a74e06e2..ea86f1337469 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,8 +1,5 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
-AUX libssh-0.9.0-libressl.patch 923 BLAKE2B 997f909b6576e52a9104cf9dd821a42e7a00fb0c934b35d9f6775080db84e3d6a52ccb973c07d94b37f0182caeb8e0ca47330d042ec286692a59014b731fc006 SHA512 d7fdfb19bbf552de9d17bdd09ee28e8f4dcfb1bc94415249fafca52ea0dba9075fd36fef063a1e3be2ec165baae35c0c224c4a30799c7b30a9f749e0639ce91b
-DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
 DIST libssh-0.9.3.tar.xz 500068 BLAKE2B 9532db5f0fd9a6f4167f57dc25a1131f7483aff2f0fa659d967b21a7eff8507843c09dae1fe8161c9b41aed1bb1dae6d619a35122812d3d9b4c71f78ff1817e2 SHA512 6e59718565daeca6d224426cc1095a112deff9af8e0b021917e04f08bb7409263c35724de95f591f38e26f0fb3bbbbc69b679b6775edc21dec158d241b076c6f
-EBUILD libssh-0.9.0.ebuild 3193 BLAKE2B 4ea062ff425b559bba985433021519040d72616e9931fcd648bb8b9525d772f3ed1c1b3e26433c00d50b95e5ef6bcc49cbcdab362ebf5045d5664399728b4ce4 SHA512 e0f16a42922d386b525e9cbfc78712ecf297a030e83d7f9a6e784414d0e4683aca6190bf4271741f2d5b9424a8e7d8870cf38d70c16309cff7f0f7ff7354c7e3
 EBUILD libssh-0.9.3.ebuild 3187 BLAKE2B c0a9582f41c08e46ea83495229ddd7c72bbe206b450f183a1d2d97b09f9bca0bc7e1d30f5f07665a07fb9fa4810e0be9a771c861176b22675003bf4b26232922 SHA512 dbdb6eca437b738d0a2cb68306c568913c2f62c00921eb2de85dda9f70a22c51791f3f4ffc1d64014ffdd0577a6506641ea2358a52d2e94386aeff9c6950c120
 EBUILD libssh-9999.ebuild 3196 BLAKE2B 4234affee1dc97b83d04eb02d7314abb12f7888c3b61a9549397c60e8bde496fe30c9b87ca0ea8f4dd810ef1a11820e452edcd141167759c5c146632d8bd8035 SHA512 80088d91442782770866421e7d7f069dc8e1fff21a24529a38fe5d2c82564c89df89aea84a5b0ef447cc1d58b7f17a1af222929a0f9cb13987637524bc651046
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/files/libssh-0.9.0-libressl.patch b/net-libs/libssh/files/libssh-0.9.0-libressl.patch
deleted file mode 100644
index 355e832308e2..000000000000
--- a/net-libs/libssh/files/libssh-0.9.0-libressl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 08bdd5b26388f92867ab03e36d73e32481faed88 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Mon, 1 Jul 2019 13:35:09 +0300
-Subject: [PATCH] libcrypto: fix compilation with LibreSSL
-
-LibreSSL does not support FIPS, so do not check it.
-
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
-Upstream-Status: Submitted
-[https://www.libssh.org/archive/libssh/2019-07/0000000.html]
----
- include/libssh/libcrypto.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/libssh/libcrypto.h b/include/libssh/libcrypto.h
-index 541912b5..1a1df635 100644
---- a/include/libssh/libcrypto.h
-+++ b/include/libssh/libcrypto.h
-@@ -112,7 +112,11 @@ typedef BN_CTX* bignum_CTX;
- 
- 
- /* Returns true if the OpenSSL is operating in FIPS mode */
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define ssh_fips_mode() (FIPS_mode() != 0)
-+#else
-+#define ssh_fips_mode() false
-+#endif
- 
- #endif /* HAVE_LIBCRYPTO */
- 
--- 
-2.22.0
-
diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
deleted file mode 100644
index 759da6a2fc09..000000000000
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-RESTRICT="!test? ( test )"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.0-tests.patch"
-	"${FILESDIR}/${PN}-0.9.0-libressl.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -e "/torture_keyfiles/d" \
-		-i tests/unittests/CMakeLists.txt || die
-
-	# disable tests that take too long (bug #677006)
-	if use sparc; then
-		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
-			-i tests/unittests/CMakeLists.txt || die
-	fi
-
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_NACL=OFF
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_install() {
-	cmake_src_install
-	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 64d85d5b4cfe..947bbb65b589 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 1520 BLAKE2B f37b7a9c8e0712f0b8a4573265814b29a4ba23771f02aa915ad93cb9a35046107cd4fb1903145a6f06e076a93c77e0ef1c26564be7befb30e1f71678a0f20719 SHA512 1ee3c6eb7293b1aaf130631e89fe46971f812296254e8a7f75ebe5ebc853724d17e6407fd89ef4de47b1fd5276439adebec155da30c5e7830e910c42d9a7773e
+EBUILD libssh2-1.9.0_p20190913.ebuild 1521 BLAKE2B 3b8d16b9f986fb6dc3dc91d91d42206d6ddf6784f025ccaf86d86f231b7eb25adba498e92996c13c74dec8cdcbb5652d2f8dccc3e2e783f8160fedfa78a6c2ad SHA512 ec02a016f247768efc7861d9b04dffc47664c094e243b3be28b06e45806c37f95337ca9598f0b12594222f11c68f279b796a7baf4da9be125ee4029949c0a4a9
 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 5ba34d956653..18af37133964 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 sh 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 bfc1b2b5a63e..f39e78f33fb5 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -3,6 +3,6 @@ AUX libtirpc-1.2.5-avoid-multiple-definition.patch 1041 BLAKE2B 2fd918dad5c759b4
 DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
 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 1554 BLAKE2B cd9c64b7e550affa9814e8a5e4b9b8c9d5627640debe472cddc16ea36300841b843eb2fd0dca7e3d5eb339c74b2a063a408246ebdd0c7fed086ff6ce31dd60f6 SHA512 c767bac49fb1fb2a22862ee273f94348e176ce229293ade3d81c4c65fb818be7d49980f2bfb54cb443e1f165fa2ee6c0ae908308a89eeb24e2bfde513cd5c033
+EBUILD libtirpc-1.1.4.ebuild 1555 BLAKE2B eb598de8889eef28c0ca4f613129428a84b599ea242763aa53d690a36d1fe371a4c812c1f345a90d5c8832967464e911dfe2d5826d77cb8d164b9f081f458f4e SHA512 5673b8b05a190c12fa9f07e282cf3e453b0f4caf73f16fc79ec85e13ed9cff1ffabd47704afeda9ce468da9aaf1cd9bb0f5e50ccc948d652103d9d5c861c9364
 EBUILD libtirpc-1.2.5.ebuild 1596 BLAKE2B f560316f374438565bd7dbe35bc569a9882e5a71d9597de0a78f017977f1a3a0c84e6685b785a46325270d0cac7cd93ee8cafb2bfa769d8c3073a13d0125206e SHA512 cf97c65ce6b8cfe8c08db3e8ae85f68e4881f4d2e4b39ef64a6637ddce7a662268229f7cc9e93ba601a080927738ae31f13bb46e997e23194516f44084ecd451
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.1.4.ebuild b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
index 95379beed1c5..442c353e8de1 100644
--- a/net-libs/libtirpc/libtirpc-1.1.4.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+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}] )"
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index d0ca77110c1a..632402a03957 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -7,5 +7,5 @@ DIST libtrace-4.0.10_p1.tar.gz 1855110 BLAKE2B c2b59b52e65ed2227bf87517c1c439498
 DIST libtrace-4.0.9_p1.tar.gz 1853724 BLAKE2B 2c2c8f44c5dea7c5acb3c3035cf8f749f1f33b03dd20675062718176ed26cba16c91f67df39512fb369896798edbe3f48e5624c72229bd00fc845712f8faf3cb SHA512 aa9e15322e507e01d9b51f6945772deba7673816c62546de30539792d7353b31235ae97866637f84969582e7300b634d080ba29a8cb088f5304a438e79357e57
 EBUILD libtrace-4.0.10_p1.ebuild 1188 BLAKE2B 86e71cf293e917c642cd7cab5dc84d313d59523e4c39d4cf0dc631379425567d5a1a3473b5141e580c79fe9d2142d986d50f70b2d1f4a415cf5c2fe2f54363d4 SHA512 2306fcaf9c073c5fc1efd2ba65f53a9a1cff8422219ebdd4e7cac417f1f054a34012227a36c6276677855ef326435ced8010f681b10981f134b8b493a6bd62be
 EBUILD libtrace-4.0.9_p1-r1.ebuild 1236 BLAKE2B 9c3de6e6ed4995e5c6416a45aa736de57d1f59718e8f2a7b0a11b31ab78d603ab4724e8b20571bab824127dcf251a26aa3f1cce12e1cb8ae5bba601d51b26bf1 SHA512 dfa06db00e1f91edef9a85e7676c037909fe6284048960e6eb00b13a4b1e30e78044d3fe62c330b5dcd6ea9f26ac2dd6656a55f64a901289f0baa6904875fef4
-EBUILD libtrace-99999.ebuild 1137 BLAKE2B 5cac4a82cfce786feb793d812c6b2fea914059dc4b71e040d311a2179519997b92aa923cd59ffaaa7aa1e2b2fbb1ecd687a52a89c448da8811e08612a83d4300 SHA512 efc7190c30c9eecdea3efa4dbafcfcf0082a79d37aeae13f7e0b937c4ea8a48df821961c78dc871955712a129239c23149eae56acb9b7380a0cdf832eb87b9c8
+EBUILD libtrace-99999.ebuild 1182 BLAKE2B 7cd21d10ca7bca0a6b8127cd1f65aa9ff3707960f85c5ce458e58d0ee60000809a431bff1a20543e1ff63e3410e3ebd0d5e640e41bf1171c1781a39541f18a6c SHA512 142000611b9971a25fe6154e10eb68a03d226c0c0452f7d23855dbad93a92df59ac6cc58d188b6e73adaec25d3601833d81063733b8c4259e013accec044ccd7
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/libtrace-99999.ebuild b/net-libs/libtrace/libtrace-99999.ebuild
index f9a910c5b3a0..6f692e15713c 100644
--- a/net-libs/libtrace/libtrace-99999.ebuild
+++ b/net-libs/libtrace/libtrace-99999.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
@@ -16,8 +16,8 @@ IUSE="doc ncurses numa static-libs"
 RDEPEND="
 	>=net-libs/libpcap-0.8
 	dev-libs/openssl:0=
-	ncurses? ( sys-libs/ncurses:0= )
 	net-libs/wandio
+	ncurses? ( sys-libs/ncurses:0= )
 	numa? ( sys-process/numactl )
 "
 DEPEND="
@@ -40,6 +40,8 @@ src_prepare() {
 	default
 
 	eautoreconf
+
+	doxygen -u docs/libtrace.doxygen.in || die
 }
 
 src_configure() {
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 6ed3c1f387f3..164d7b891f2b 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,13 +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.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.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb
 DIST libupnp-1.8.6.tar.gz 784912 BLAKE2B 8b2ac2dbe6b2bae64677d4e47142f42ad6b3c5af61e03faa628a2859afe62a2cb7a16cbfcfa9a0a307db8210f3786e916d3ac12eba3deee68c3c944c98801bb2 SHA512 8224460fcd808ed44e46c1c5dfc9236521b34fd140469d6549f42468b3acce83f46cb20cde41de574f55a865067a5f30ebbda68b500784c19cef354265f5acb7
-EBUILD libupnp-1.12.0.ebuild 1060 BLAKE2B da6762f901283ac89b16ac07ce0e4671b7ac1f7f932ecfe6b02e9c2186f406eb0462875230825acb67122a2d5bede8cb9e68ea8a6215b1e110178dccc4e49392 SHA512 3d561a226cf889dac7f015b5153061378a3e0730c09de1cbc568c62e2a5f1e657f8f3d55e29e7754a1252eec4408f6639bd9e72804cca4fb950e81f993e4ded9
-EBUILD libupnp-1.6.21.ebuild 1036 BLAKE2B d3b4077358a8d14b25df794258251bf81ac29d4283714f7d5abb2a974a2265246168986e034d07923675996063db4ff86806fb623895e5c099cfed7a83af114a SHA512 bc71c740ae8b29159960aff843fa3281e1dc4baf93761be4026edaa83ced0195a965b4c58c43f84e16618045935fd1a8ee1f780a4c672535be9b6e36ebf5d108
+EBUILD libupnp-1.12.0-r1.ebuild 1097 BLAKE2B c437a71b47589620ba507ab7bd420eee94fabe02c765a30f047b7adb72009a39aaf34644215dd1660ce617a39d0da881b2c451767c26db3e34eb4094ac024564 SHA512 c3589bb68144b343acd48991a67a2ea51a98faf16e773f25ac606857c232354fe633446593c003ef879d54cc1225174af174ce322bf7c3cc654b45064a69aa3b
+EBUILD libupnp-1.6.21.ebuild 1037 BLAKE2B 7a84b30ca6474853102762473c8d90ae2387c9fd093582d7557253fde74640aaf1aac14309f4cf29706da1a46111f1ab7a794fbc055f42d87d7854820c54436d SHA512 6f7c71520db4796edd65dec42f2de38d0f075d836c25950e59f4c9597c1f09870ac8babc31b7d45a3cd9be1983e4fd539383797b3630e3221c3932e9023a4c03
 EBUILD libupnp-1.6.25.ebuild 1038 BLAKE2B 5ff0fa549ca82029feeb59b0c67edb10fa46a73c62476a751d1e89a070de94fb563a6bc38ebe604be429e54d66162069695f04df20e225dc22d6b0f8801ea549 SHA512 2d335e95edd391006d6f9cd9324702dbf3380c4e22b56895d919d812b6195f094fed0bb464e8b38ad6e55701c06385f1bc8af803ceef77b2453036c047961ff5
-EBUILD libupnp-1.8.4.ebuild 1651 BLAKE2B 5813f83885570663afe15bba333a50aefb2a89d0f3882a94f84e4eac3465cd11a4139a0066bd7dbd8ea11a455c3b696bf8a0fd2dc77cc3308ef5f496f0086026 SHA512 f4e889a07369dd63566f8904893327a9702455915808629394669c317cc55f28695d92b54ab4e8accd928d432f1238de1d1a6b1fff3391ce28d390da579bdc94
-EBUILD libupnp-1.8.6.ebuild 1651 BLAKE2B 2d327d553f8709955c68c2f366cfd4f97396e3b236113f749021df86192e168ed4370c1d5e17212a11286286629993686998543bd28866d9235bf97523f3a8c1 SHA512 dc102ff4d1828eca8d10440483edcbfd03a82aa904b1beb31260eac7f53cddd0244cecffd946756a91fdda579e8c19a54ea98e5c0bb86513543c6953d18e4f20
+EBUILD libupnp-1.8.6-r1.ebuild 1060 BLAKE2B da6762f901283ac89b16ac07ce0e4671b7ac1f7f932ecfe6b02e9c2186f406eb0462875230825acb67122a2d5bede8cb9e68ea8a6215b1e110178dccc4e49392 SHA512 3d561a226cf889dac7f015b5153061378a3e0730c09de1cbc568c62e2a5f1e657f8f3d55e29e7754a1252eec4408f6639bd9e72804cca4fb950e81f993e4ded9
 MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
diff --git a/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch b/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
new file mode 100644
index 000000000000..cbb844952be6
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
@@ -0,0 +1,33 @@
+From 5a8e93f1a57cce5cead5c8c566a75f7c7c294c97 Mon Sep 17 00:00:00 2001
+From: Ian Whyman <v00d00@v00d00.net>
+Date: Mon, 27 Jan 2020 21:46:47 +0000
+Subject: [PATCH] List: Add extern C for C++ users
+
+---
+ upnp/inc/list.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/upnp/inc/list.h b/upnp/inc/list.h
+index 214a53e5..0fbe7efc 100644
+--- a/upnp/inc/list.h
++++ b/upnp/inc/list.h
+@@ -40,6 +40,10 @@
+ 
+ #include "UpnpGlobal.h"
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ /** List anchor structure. This should be the *first* entry in list
+  *  member objects, except if you want to do member offset arithmetic
+  *  instead of simple casts (look up "containerof"). The list code itself 
+@@ -71,4 +75,8 @@ EXPORT_SPEC UpnpListIter UpnpListInsert(UpnpListHead *list, UpnpListIter pos,
+ /** Erase element at pos, return next one, or end()*/
+ EXPORT_SPEC UpnpListIter UpnpListErase(UpnpListHead *list, UpnpListIter pos);
+ 
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
+ #endif /* _UPNPLISTH_ */
diff --git a/net-libs/libupnp/libupnp-1.8.6.ebuild b/net-libs/libupnp/libupnp-1.12.0-r1.ebuild
index 2d629febf65e..70a82fc72df3 100644
--- a/net-libs/libupnp/libupnp-1.8.6.ebuild
+++ b/net-libs/libupnp/libupnp-1.12.0-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=6
@@ -10,14 +10,15 @@ HOMEPAGE="http://pupnp.sourceforge.net/"
 SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
 DOCS="ChangeLog"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
+	"${FILESDIR}"/${P}-cxx-compat.patch
 )
 
 src_prepare() {
@@ -44,27 +45,4 @@ src_install () {
 	default
 
 	use static-libs || prune_libtool_files
-
-	# Slot samples
-	if $(use samples); then
-		for bin in combo ctrlpt device ; do
-			newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}"
-		done
-	fi
-
-	# Slot includes
-	cd "${D}/usr/include" || die
-	mv upnp "upnp-${SLOT}" || die
-
-	# Slot pkgconfig
-	cd "${D}/usr/$(get_libdir)/pkgconfig" || die
-	mv libupnp.pc "libupnp-${SLOT}.pc" || die
-	sed -i -e "s#/upnp#/upnp-${SLOT}#" \
-		-e "s#lupnp#lupnp-${SLOT}#" \
-		-e "s#lixml#lixml-${SLOT}#" "libupnp-${SLOT}.pc" || die
-
-	# Slot symlinks
-	cd "${D}/usr/$(get_libdir)" || die
-	mv libupnp.so "libupnp-${SLOT}.so" || die
-	mv libixml.so "libixml-${SLOT}.so" || die
 }
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
index cf6b5e8cc2d7..196c72e608cd 100644
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="debug doc ipv6 static-libs"
 
 DOCS="NEWS README ChangeLog"
diff --git a/net-libs/libupnp/libupnp-1.8.4.ebuild b/net-libs/libupnp/libupnp-1.8.4.ebuild
deleted file mode 100644
index a1fc1c7d0280..000000000000
--- a/net-libs/libupnp/libupnp-1.8.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools vcs-snapshot
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://pupnp.sourceforge.net/"
-SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
-
-DOCS="ChangeLog"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	# fix tests
-	chmod +x ixml/test/test_document.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use x86-fbsd &&	append-flags -O1
-	# w/o docdir to avoid sandbox violations
-	econf $(use_enable debug) \
-		$(use_enable blocking-tcp blocking-tcp-connections) \
-		$(use_enable ipv6) \
-		$(use_enable reuseaddr) \
-		$(use_enable static-libs static) \
-		$(use_enable samples)
-}
-
-src_install () {
-	default
-
-	use static-libs || prune_libtool_files
-
-	# Slot samples
-	if $(use samples); then
-		for bin in combo ctrlpt device ; do
-			newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}"
-		done
-	fi
-
-	# Slot includes
-	cd "${D}/usr/include" || die
-	mv upnp "upnp-${SLOT}" || die
-
-	# Slot pkgconfig
-	cd "${D}/usr/$(get_libdir)/pkgconfig" || die
-	mv libupnp.pc "libupnp-${SLOT}.pc" || die
-	sed -i -e "s#/upnp#/upnp-${SLOT}#" \
-		-e "s#lupnp#lupnp-${SLOT}#" \
-		-e "s#lixml#lixml-${SLOT}#" "libupnp-${SLOT}.pc" || die
-
-	# Slot symlinks
-	cd "${D}/usr/$(get_libdir)" || die
-	mv libupnp.so "libupnp-${SLOT}.so" || die
-	mv libixml.so "libixml-${SLOT}.so" || die
-}
diff --git a/net-libs/libupnp/libupnp-1.12.0.ebuild b/net-libs/libupnp/libupnp-1.8.6-r1.ebuild
index 14fc805526fb..14fc805526fb 100644
--- a/net-libs/libupnp/libupnp-1.12.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.6-r1.ebuild
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index e610dae2388b..9881840c81e8 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -7,7 +7,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-r2.ebuild 2085 BLAKE2B b17dc70efebe80fcb8ede7cd5c949f741e79c90919af9063dacdb905f40d173e18c0bd7fc366781141f52a98eb09bf1fe3412842916e4a9c77828abb103e2ff5 SHA512 a82db697f80034c94e828e334f838f0bbc3a0e43b4edd68752cf72fe71f1cecf4b7bcd4ab4d27d81d7b11c48e69dda3a55c778f393e6abafd4296f4bbb523065
-EBUILD libvncserver-0.9.12-r3.ebuild 2260 BLAKE2B 5c844605a3f214e9c258f1097fcc6e17f936ff416ae08d7fba5141ef10c6ad5e968d58357bf19e37080da048719362d097c6970adac4750cd40c6b492bb039d4 SHA512 a301902c50f834a8a5a594ac109d87cf978d386d170292b44c986d43a2c6ec8c4dfec43e67950aa393d6f2dbf7692d8d006a0ccb54df782d5b89a531c100179a
 EBUILD libvncserver-0.9.12-r4.ebuild 2305 BLAKE2B 3aff4c3e96ab7ce35c113f1834a1dbef5f73e8d480b966c9b9c2408f8e81730d1fe004d29e87677d0aedb078ca89fb8fc585e4bfe9b4d04fc4953e138d183bc9 SHA512 9a7f6e4b88238005ad92c6d9c2b368360cd9c4588609dc742dd8d6f4276ca02af103c7d86ff48cd2ed0a56936990c1610c949350d35e4b5b77b65133171231a1
 MISC metadata.xml 994 BLAKE2B 3c12097d08f89fadac86ad92efccccbb533c1ac018cf426aae4a45bbea33ae227dfaec320a7710eabff7da96d22229997dee72b2c84b1aedc575e21e0a5decff SHA512 0ca13849ab948490b862838bf3c2b87cb97ce1739369d23426e518197a786cf24fc79967c01072b710d37c298c792c45e61a55e558d692087800e834f93003e2
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
deleted file mode 100644
index 373269e6e349..000000000000
--- a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P="LibVNCServer-${PV}"
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
-
-# libvncserver/tightvnc-filetransfer/*: GPL-2, but we don't build it
-# common/d3des.*: https://github.com/LibVNC/libvncserver/issues/88
-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"
-IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
-# https://bugs.gentoo.org/690202
-# https://bugs.gentoo.org/435326
-# https://bugs.gentoo.org/550916
-REQUIRED_USE="jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )"
-
-DEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= )
-	ssl? (
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.2:0= )
-			libressl? ( >=dev-libs/libressl-2.7.0:0= )
-		)
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= )
-	)
-	jpeg? ( >=virtual/jpeg-0-r2:0 )
-	lzo? ( dev-libs/lzo )
-	png? ( >=media-libs/libpng-1.6.10:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-	systemd? ( sys-apps/systemd:= )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-libdir.patch
-	"${FILESDIR}"/${P}-libgcrypt.patch
-	"${FILESDIR}"/${P}-sparc-unaligned.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_ZLIB=$(usex zlib ON OFF)
-		-DWITH_LZO=$(usex lzo ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_PNG=$(usex png ON OFF)
-		-DWITH_THREADS=$(usex threads ON OFF)
-		-DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF)
-		-DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF))
-		-DWITH_GCRYPT=$(usex gcrypt ON OFF)
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-		-DWITH_FFMPEG=OFF
-		-DWITH_24BPP=$(usex 24bpp ON OFF)
-		-DWITH_IPv6=$(usex ipv6 ON OFF)
-		-DWITH_SASL=$(usex sasl ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
deleted file mode 100644
index 9661224c2a15..000000000000
--- a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P="LibVNCServer-${PV}"
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
-
-# libvncserver/tightvnc-filetransfer/*: GPL-2, but we don't build it
-# common/d3des.*: https://github.com/LibVNC/libvncserver/issues/88
-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"
-IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
-# https://bugs.gentoo.org/690202
-# https://bugs.gentoo.org/435326
-# https://bugs.gentoo.org/550916
-REQUIRED_USE="jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )"
-
-DEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= )
-	ssl? (
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.2:0= )
-			libressl? ( >=dev-libs/libressl-2.7.0:0= )
-		)
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= )
-	)
-	jpeg? ( >=virtual/jpeg-0-r2:0 )
-	lzo? ( dev-libs/lzo )
-	png? ( >=media-libs/libpng-1.6.10:0= )
-	sasl? ( dev-libs/cyrus-sasl )
-	systemd? ( sys-apps/systemd:= )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-libdir.patch
-	"${FILESDIR}"/${P}-pkgconfig-libdir.patch
-	"${FILESDIR}"/${P}-libgcrypt.patch
-	"${FILESDIR}"/${P}-sparc-unaligned.patch
-	"${FILESDIR}"/${P}-CVE-2018-20750.patch
-	"${FILESDIR}"/${P}-CVE-2019-15681.patch
-	"${FILESDIR}"/${P}-fix-tight-raw-decoding.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_ZLIB=$(usex zlib ON OFF)
-		-DWITH_LZO=$(usex lzo ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_PNG=$(usex png ON OFF)
-		-DWITH_THREADS=$(usex threads ON OFF)
-		-DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF)
-		-DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF))
-		-DWITH_GCRYPT=$(usex gcrypt ON OFF)
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-		-DWITH_FFMPEG=OFF
-		-DWITH_24BPP=$(usex 24bpp ON OFF)
-		-DWITH_IPv6=$(usex ipv6 ON OFF)
-		-DWITH_SASL=$(usex sasl ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 6c01ae6b4b87..1966dd794809 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 1168 BLAKE2B aa65c54703ccc3d6d2d7d06f42e4de6749cdb60a3f5413c77a34b6367388fd4540f94d804a33b174eb65869d3f7c093540eebb2fca005fb322b1abbf797629f3 SHA512 032b522ef8d30d1b5b4d88d823fc1ee1427c8296670e8d645cb3d461a837c4cda0829848010f66daf0d940d0f1b2f1a6c4651450e213190c1b766a953c827b86
+EBUILD loudmouth-1.5.3-r1.ebuild 1169 BLAKE2B 40e535b2d7bab912645aadc61f298fa454106b3b485961d15bf5083d41f999afed7185a72a08165aaedf2fcb1194ea850bf27cb2c6f0948561544c3f9df40d5f SHA512 0d9841dc676871a9230db4e2f232eeb0041c271530dc47cd5a0e72f2a6989d40a58733655a12511575837dbc79975cd4e2d928c75e5a45968e063c6e14ac8ecf
 EBUILD loudmouth-1.5.3-r2.ebuild 1198 BLAKE2B c9937e44c3d032a6a68e4fce361a308609a6d287f498d45b69a870ae44ea7e84703ca761af65e610e065dc7ec41571b1b649fecb87a4bb45f1f6e13a9cc7bcbe SHA512 7598c1fe67f16f5bf37c30f00da4a2ba2eb42efb4826295a3980f72a0036783c3ac4ff4ce0963e06a28e0be28c9d25e36228edf2328515da96b890df7ea8e6cb
-EBUILD loudmouth-1.5.3-r3.ebuild 1072 BLAKE2B 0f21fa7378c614907a5186319fc10d24ba7d7fa8aceaff74854166469eaf0abc653a66decedbfd6d66e938a71de05e82731ca8830621a5223d06e2f66d5ac3f1 SHA512 b6e3242aa217dff252d9871940b8e08ea77418b34361901304b84e8bd2756101f53c3166501c2d3a1924d2a9089fa816e230c5a29a6e3a864c22ecdc361f2a44
+EBUILD loudmouth-1.5.3-r3.ebuild 1073 BLAKE2B fe47767d58e29f39b2e289f6315f6329e7e9934994f6c98713f245ddab142dbd7cbf9033c16dad0633085d0419422b4c588fb3bb6e554ac33dd0eae46938c4a7 SHA512 ac88fd810ec72bfc94e2fa703a9ad7793217270a7078cbd98bb9e46aa9b95da2b09a9f315b019cdbe274b5b3dd7f390500d03c8f2c82720afaddf505e1c58b6d
 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 e6aba4fe23e1..3ea97aa37655 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 f538e07a39cf..4228029d036d 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 8eeb8f4a1a9a..79243f75b523 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,4 +1,5 @@
 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
@@ -8,11 +9,11 @@ DIST mbedtls-2.16.4.tar.gz 2597922 BLAKE2B 787837903e1d9a5951e3b379b17e82bb68575
 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 2415 BLAKE2B 098c59ee882ce4faa38f1a2a35507cbbb6b99fc9e6460fa6fac8e17e89484caf1e1adb27bfe6e5136900fae27f451c9f036e20579af21cb66412f32c3630907e SHA512 ee2350b912246e028c9b18d7f875a45a4f7c5c56ce64185f2cf8c4267d26ee1dfadfe448285afc03d6b42e948075ab674fe9196463a7b5a6f13505a2ecf4cb90
-EBUILD mbedtls-2.12.0.ebuild 2443 BLAKE2B ba001cc31c56aadad9098f21521b3786644bf613d20b21024b52177e43d7d05c28f59cb423675aad2287104fa68233763876807297fa9a9bee4e00987c3d53cd SHA512 8f8b5d3eb27f70f962732c03e9496af5c513766cdbc68ead3f31720433eb0c28cd49cf809997fcbc46e390d98ee8c9aa11959cf2b679d798b99f313eb45585a7
+EBUILD mbedtls-2.10.0.ebuild 2416 BLAKE2B 626b1145edf90a7e1954d5a8cc8e35c01f5b809800d38eaad76f73d39f1256a64cd14db746d297618cc2d3a117ca0076aea5aef8de35c9fb53fe19ee15b31066 SHA512 5faa1d14668f99cd197e5b4f0b60f3402030a4946162fdfd252248dd7293dc5b64e23414eb0e27bc48f8afa7d60d5cb92407c1b5e37142b8285978f800c5dd94
+EBUILD mbedtls-2.12.0.ebuild 2444 BLAKE2B 0740c892c457e183584389396a44c6c027c10257e702acaab9c4f673b8a0d38ae90b4369e13b313c7629e44e801aef196df85aa56c452ebcc42efdb20cf912d9 SHA512 0d076a66dca5edc256b1361d76190779c61c3328aec0bf749b76cd3120d3021181849354329e353bc58f8790841a1a9a6f7e204ab22f913f5923b98f5473a2b4
 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-r1.ebuild 2745 BLAKE2B e8c2e67080ef379c73b76d62fba95d7b0cbaade20e9cd261396c11b7479f0694e49f908aff516cd8d630dec91e79c1a13e9dbca2031ecd08dff98b43285670d4 SHA512 f696f92ed934c3efde4db7f1b0cafd4a8b2a906b3f941c24613691c686529da5aa155c15b2c61ada2d53d93a8fa7e0d2b17218a65d0e017f6542b376382ff1fc
-EBUILD mbedtls-2.19.1-r1.ebuild 2743 BLAKE2B bb89e9cfc6c24c2cb5c0d7b2f0111909ae2b03e1dd1e35f3424f2207b9b417c07c34d212f226a6ea88f4ff36d7f8fe3e417347edaf6aa7a67ca13d630319b5d1 SHA512 a24d05f558eaef41dd2f83b8c3392455bd7759a7ae051a39162a541f27b8d16ee6a00edfd950c1dee31a7974366dc621e317e6999db7defc9f3a0039ac419c98
+EBUILD mbedtls-2.18.1-r2.ebuild 2800 BLAKE2B 8db411d90f17c45c25724daf1632c849f759b4aa7dffb5527eaa9d39f22a7d477a6a263bec9e18082d7df80f100864596015f4f8b34a59983be913cf12797d9f SHA512 fb6e726875ac330dc6fb54d587c39c43ca5da6bbe7e07dcab549b8cf1cfac83068f2acdc9cc1837180226842f27a69e5c1fb7880c355b7e9577fcddd42bb80d8
+EBUILD mbedtls-2.19.1-r2.ebuild 2798 BLAKE2B 970970a590d22c6df97b716c1820cd32b1e07e81d45832125a6c811d8075f51912ffdbc36ed8a49ce0ee415da4d675377629fcbdc7d699e53597b58b4c11162c SHA512 66674721588a0fd3dea4b1c689398a9018ff5ebb30adc0025b51fc72ab7c734edd9aeacf5a8401bc49bbdd0a09f892c2c1e0f7a4505596ce60ae56bf850b984a
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch b/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch
new file mode 100644
index 000000000000..73e870fa1e4b
--- /dev/null
+++ b/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch
@@ -0,0 +1,50 @@
+Fix https://bugs.gentoo.org/705038
+
+Thanks Greg Turner <gmt@be-evil.net>
+
+diff -urpN mbedtls-mbedtls-2.19.1.orig/crypto/include/CMakeLists.txt mbedtls-mbedtls-2.19.1/crypto/include/CMakeLists.txt
+--- mbedtls-mbedtls-2.19.1.orig/crypto/include/CMakeLists.txt	2020-01-26 09:01:50.324231295 -0800
++++ mbedtls-mbedtls-2.19.1/crypto/include/CMakeLists.txt	2020-01-26 09:04:26.498880873 -0800
+@@ -5,6 +5,19 @@ if(INSTALL_MBEDTLS_HEADERS)
+     file(GLOB headers "mbedtls/*.h")
+     file(GLOB psa_headers "psa/*.h")
+ 
++    if(USE_CRYPTO_SUBMODULE)
++        # Don't overwrite mbedtls's header files!
++        # config.h is supposed to be automatically checked for compatibility
++        # in automatic builds, while the other files should not just be
++        # compatible, but also identical in theory.
++        # Practically, we don't check that in crypto but just assume that the
++        # submodule configuration is sane and trust tls's headers.
++        list(REMOVE_ITEM headers    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
++                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
++                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
++                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
++    endif(USE_CRYPTO_SUBMODULE)
++
+     install(FILES ${headers}
+         DESTINATION include/mbedtls
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+diff -urpN mbedtls-mbedtls-2.19.1.orig/include/CMakeLists.txt mbedtls-mbedtls-2.19.1/include/CMakeLists.txt
+--- mbedtls-mbedtls-2.19.1.orig/include/CMakeLists.txt	2020-01-26 09:01:50.320231227 -0800
++++ mbedtls-mbedtls-2.19.1/include/CMakeLists.txt	2020-01-26 09:03:45.761189288 -0800
+@@ -4,19 +4,6 @@ if(INSTALL_MBEDTLS_HEADERS)
+ 
+     file(GLOB headers "mbedtls/*.h")
+ 
+-    if(USE_CRYPTO_SUBMODULE)
+-        # Don't overwrite mbedtls's header files!
+-        # config.h is supposed to be automatically checked for compatibility
+-        # in automatic builds, while the other files should not just be
+-        # compatible, but also identical in theory.
+-        # Practically, we don't check that in crypto but just assume that the
+-        # submodule configuration is sane and trust tls's headers.
+-        list(REMOVE_ITEM headers    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
+-                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
+-                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
+-                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
+-    endif(USE_CRYPTO_SUBMODULE)
+-
+     install(FILES ${headers}
+         DESTINATION include/mbedtls
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
index ef4b6c80cbaf..2b2e0e4dae47 100644
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
@@ -12,7 +12,7 @@ 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"
+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 )"
 
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index ebf610255382..f13ebc89e9a4 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
@@ -12,7 +12,7 @@ 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"
+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 )"
 
diff --git a/net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild b/net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild
index b11f2794a352..dfb900ea4c69 100644
--- a/net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild
@@ -38,6 +38,7 @@ enable_mbedtls_option() {
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-dont-overwrite-headers.patch
+	"${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch
 )
 
 src_prepare() {
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
index 1a73d20f220e..a18fc8919884 100644
--- a/net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
@@ -38,6 +38,7 @@ enable_mbedtls_option() {
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-dont-overwrite-headers.patch
+	"${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch
 )
 
 src_prepare() {
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index e1171dc8c5d2..e8edafcb2aa3 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -1,5 +1,5 @@
 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 1045 BLAKE2B 62d7edc2bab5100881a00c3ca3b7536719f2a78013f94996d4403b193c18cf042e61a271b6bf98cfb71142190a30507d9fe14c17caefd4b8cdf4f4cc13f7fa0c SHA512 7d2e600a405a05ea15aebb0205017f11aeccedac44e8bb86a570e730e8ecd58bf4ecffc87c1a4e60498a6e1790c23cf108b0c3f127a9e0cc7d36ef1168574ae6
+EBUILD meanwhile-1.0.2-r1.ebuild 1046 BLAKE2B e8e7bc3383d15cbfa019f20af67e1e5ae3892ac0844eff9d5ebf2b34c84a29167c4084405ef23f36aceedecfc84284ae2e83499948c8bfe7766bc3c8ff1b356c SHA512 3c8a1896f09c52d931bbe1358b8417d048a55337ec5f57356384d86dfe1b271a54476b438f7ccc9801ba4fab0d9d84bec1d9a26ee82cb4345357ed2712990090
 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 7190a087afbb..7a2a8a624595 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"
 IUSE="doc debug"
 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"
 
 RDEPEND=">=dev-libs/glib-2:2"
 
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 95742d2d1a74..0573a068eeb3 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -9,4 +9,5 @@ EBUILD nDPI-2.0.ebuild 628 BLAKE2B 22d7c6797b085bd92a24e8fe85c4509c832857d10f615
 EBUILD nDPI-2.2.ebuild 1005 BLAKE2B 21c2bf8c4ecca6458b8023b2fd530193c2986cf6777db3d981a50b80cf22b002c3d041e70f092c917bfd4570b3bd2679a746f7f7d07c09ca406f1d9c905555c5 SHA512 97821a39be0ae0a1a58d8c9b275a674a1a2fba937588191292cfa7d8b281b3a755259e10845750ef22860d57b2d66016d56b1c680ef4741b72224ed83825227d
 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
 MISC metadata.xml 292 BLAKE2B 387a2816be3615c7a1430ca3888546eecd1b5c679805b87cf7975cf7d4b59a224c8edea34ca354b8bf4d793457531f6388816cdf86641fcc3f6df89432848b46 SHA512 488fc61860f278d9f7be4a6cd246eb45bac7efafe57e777f1c46984a07f132a76dcca6170b4876edea4d720f4696549b85989ae012749a00d234a0137b98ec6f
diff --git a/net-libs/nDPI/nDPI-3.0-r2.ebuild b/net-libs/nDPI/nDPI-3.0-r2.ebuild
new file mode 100644
index 000000000000..50396b2d9db3
--- /dev/null
+++ b/net-libs/nDPI/nDPI-3.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	dev-libs/json-c:=
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	# Taken from autogen.sh (bug #704074):
+	sed \
+		-e "s/@NDPI_MAJOR@/$(ver_cut 1)/g" \
+		-e "s/@NDPI_MINOR@/$(ver_cut 2)/g" \
+		-e "s/@NDPI_PATCH@/$(ver_cut 3)/g" \
+		-e "s/@NDPI_VERSION_SHORT@/${PV}/g" \
+		< "${S}/configure.seed" \
+		> "${S}/configure.ac" || die
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	default
+	eautoreconf
+
+	# Taken from autogen.sh (bug #704074):
+	sed -i \
+		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
+		-e "s/#define VERSION/#define NDPI_VERSION/g" \
+		configure || die
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+}
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 22be2f5efa0c..59de5c28e2ee 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,3 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-EBUILD neon-0.30.2.ebuild 3445 BLAKE2B 90f7d22b993069c635213cfe7f75cc82f3934e15e4b68cd3cabbf90f23c5142917c96447fc870b9472f9112a1f4842d48e9d4829563d898190f0dd84acbed0a0 SHA512 2fdddea57b50983eba7fb01a87734d1618a43f031c52c06381ad232080442284c1c2cea83632d811bf15b2d172691fdcaae96e55d748d3f6e9ef55d8b792e3af
+EBUILD neon-0.30.2.ebuild 3446 BLAKE2B 76e4fde2894b509162070dea207efd00cd8e4d3b1a7decaa6fbef5ee5af6791af84c42d1cb35e0c4cc3fb1c78c8d1e641b3cd3bbac22431c6815c4c6bedfbcfc SHA512 b80b895fb10478a42262e86dff71dec7548f6d9efb5a7d35fc8e98852e66b0eb5337615d1d4f936acb0fff5245a347de7412ec9942056b1f666f07cbee12a9b1
 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 f227074a1761..b92c1ea72a00 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 ~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"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 798ed4ed9e3e..72ee6d1d95a5 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,6 @@
 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 1971 BLAKE2B db617ce5770b9ff8d4b1d210f394f5e71f0188d9805e2f73c514bfdf29e1d9a56294a0c37c40f43cbab19887b6bff3fde68aed0b2dddc0d81f9ce6fe14f401ab SHA512 06d1567c2cafb4a6c17dc78887bb74c948cf0ebcc4261d023df63b464a18d3f882f1e89aa2d0aeddead99e9d9cb765c0e202412a6924153333a3de0571a2accb
+EBUILD nghttp2-1.39.2.ebuild 1972 BLAKE2B bb655a5b532a89a7186a8bad46c1cc0f439e0b2385369146beea6c3602bd4a8d5358ca6b1609dd76578e5610a98c80b2e350c61ac4579d8dc7ec22eb1b0fe51b SHA512 d9201b1428ee8cd8e44c6a7bfcdc0fc5386bf621ee4d468ca3e5b0fd89af5e5ccb62ac56114dcb52d365e0f135b3ac0ed766fbd77805fd7be5053e0341b5dd9e
 EBUILD nghttp2-1.40.0.ebuild 1982 BLAKE2B a026ef4243c2ca3d79e2d3e43a6e45e3b45ea8ea21d599ddf5d832f03a31cd6a8446493089fabfc3be4576d8dcb53074f76deddceb25b4edc22bc5ebc358c014 SHA512 f13ffcceb60aaf9a1ec0b529a85659d4ed21d5b04eda9be9277ef6f3c4020dca6919c64a162a1750fa5a658086dcbd2b07052dadfa60c8b61f8b83cfb9f9b389
 EBUILD nghttp2-9999.ebuild 1982 BLAKE2B a026ef4243c2ca3d79e2d3e43a6e45e3b45ea8ea21d599ddf5d832f03a31cd6a8446493089fabfc3be4576d8dcb53074f76deddceb25b4edc22bc5ebc358c014 SHA512 f13ffcceb60aaf9a1ec0b529a85659d4ed21d5b04eda9be9277ef6f3c4020dca6919c64a162a1750fa5a658086dcbd2b07052dadfa60c8b61f8b83cfb9f9b389
 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
index bc28fd779dde..32e956331d65 100644
--- a/net-libs/nghttp2/nghttp2-1.39.2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index ffe94ab58e2c..3444e2cb8457 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 1854 BLAKE2B 94303862b295a8fe0e415ee5b89c840596ce696812e33cc5351e228f9294991258943e442bde48dcf01376b05db58d50c100cdede9a7a0791fdcf6dcbe1c2dfa SHA512 3a3b07f8c8ce6c953400fab35da8dcd9cc2e26cc48adc487dd7547b74cdc9c731bd04a0fac108b97c974ae0e13fd3f72e7ca1f78be9844726c0881a8ecf8a0ca
+EBUILD ortp-0.23.0-r1.ebuild 1855 BLAKE2B ef09606323f46df56bb0b6ba62516b61795dcdf96346a914f01c13aca147819730645a1ef354323f7e52757a8f14d151a428b4117066e52511aa04e62cc1c43d SHA512 f16a1f6f62f673374be7ab95bce6173d165941142da2023a3ae266948fd417f23193fd21a137d70d4ab6eb88a3a8c1384b0a4dfa871bb64ac97a10401fca73ad
 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 ac7c45d90aaa..573c552d6de8 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/phodav/Manifest b/net-libs/phodav/Manifest
index cf550bfc3f28..6c3ffd4adea9 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -1,5 +1,5 @@
 AUX 70-spice-webdavd.rules 159 BLAKE2B 712c2513f1322e4144229e31c4df83cec6780a57590c26cca76d5a1d2844a7ea6bd0696906abba5441023b44985e26cee578a4c21ec00b62b236fdc25de2a964 SHA512 f9a427f0d4f4db4aa3e0c7a4f77281b405ebde3e932bf591f018f39f6094fa47f16649534b2dc45434433367f60b98d58e32e49c5b03ba1333015319de5644cc
 AUX spice-webdavd.initd 344 BLAKE2B 6a7f36f4f698e5327455b3e95a71ae39df56f6d57e8dbb050d255cb87e1847f6672ab7121829d08c39ae0b028c2e7d8e375724a1b6e06e8e547291cf0188749b SHA512 df4e08bb5fec88bd7c0002e25c5ce348f538d49de9b74890c97a53516e8c3d0f60c87c77050c5357e73f5d33f1daaabb9007d7e35d4d34b15b105dc4ce273dfb
 DIST phodav-2.2.tar.xz 294216 BLAKE2B e7062f933f407dff339b050a8b735e733fa41634cc34b0a37556b283b941ff620ae59a2ed3b7bce41530195f33a9fb3113f89e37190bb046352d90d72a750468 SHA512 1d16716c1bda674a6695b651e9b1bcb4b7cfefd9b60291ed3f5691f4f6f45f68a970d99fc4820bed0484cf0a43c1bf32e4d208fcc239ac0c0b7a75bf779e8913
-EBUILD phodav-2.2.ebuild 1523 BLAKE2B eb55df310e2e56f943fb2948dba7702f43b6ca042cd7cf71194e52e377e0640467906de2ce268ee3564a3c41616de38322843d1d7e885564e6d19853bc00fb8c SHA512 aede1d74668243aa2097d532424f863e27af5bd02b15c47da267509dcc4019cc5ca43942ca52fe2b387fa8a62c24725b7dbe0182d8a7a11cc0c61cae42e72bb9
+EBUILD phodav-2.2.ebuild 1524 BLAKE2B c6fad17947d0f7d383e9bf23cc7d7755357c7492b157ba0262e433f842500912ca70ae3c10675752e968c57bfeb5717aab5c5050adb74592a40b1ff085f209a6 SHA512 afd299087ba58cdd1d386233e35e44446a72c9c44dfa3440497008541afa487cc87fe2dd7c29acebafbf46b49c5161905d3e369404f7b0cbb070435301304253
 MISC metadata.xml 466 BLAKE2B 81d7512b98e6c1e300131546f378edffde1f5206fde50b012cda0167df1ff4e16c7f64b5362b2dfa6797c2ebabfd8f89f88fe2bd01f5c0d3397ba1f0555b00ea SHA512 835e6f875a2540a0f6761373e568c6e24bb60ab437164638f69e238c5eba8413cd3752a19aab9ecdbbef4f1f0927d00ee11a51f8786c54feec401426ae76b6ec
diff --git a/net-libs/phodav/phodav-2.2.ebuild b/net-libs/phodav/phodav-2.2.ebuild
index 6a1f5bb08937..c09e6e6b6070 100644
--- a/net-libs/phodav/phodav-2.2.ebuild
+++ b/net-libs/phodav/phodav-2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/phodav"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="spice systemd zeroconf"
 
 # It included g_uuid_* symbols of its own from an unapplied patch to glib; now that they
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 6ea8b8737b79..3878da59a02d 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -178,7 +178,7 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 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 3987 BLAKE2B 62ae63b2c66ebddf1dd2b9e8181f8d45a7afa8dbe9afb9c22957a1efae593f7125447312c7555f1712dee0c40f4f0385f3025f34918b10a7bda9312fa3b7bd28 SHA512 a5a721db4b9364cd2ffb272b7e94986271c5db7dee39d3970aa750754a96696f44b0a2cb815712089e58a77dbc8e8c53714a045af2db3aa2cbb46d92fcaab61d
+EBUILD quiche-0.1.0-r1.ebuild 3992 BLAKE2B 92aa43655db785e1ba45028eb8e56f7bdbd93566731cd3579ee03b92e5974f61a306d5a6796404c2234dff0fe935ff4f3ee05e2eeeb8a1efe4fcddfcaf9effd0 SHA512 fc34bf7f5dd90e4c09cdff848fe4c5b34f32a8e338e2fe38054cb688b05f572cb2ba933065ccf13eb40d8b45f4a9027bb59848a521e7b493b82026d05e70804a
 EBUILD quiche-0.1.0_alpha4_p20190912.ebuild 3776 BLAKE2B 78ea083d45b9426a5920160e1faafa0cc0057c7dd1e6f6af5a166be875419eb11b7f2fd5a7884823a42a6c0c7e62863301d71bc40074782ac31de8e9678f5e11 SHA512 b918a7ad17decc581f18944007827b88fb524ddb5848f0cd6dbfc9c74334cc276578ddf29cd504c6108429d27e49c12f45558bf5d169ec66528a92df7ed31bca
 EBUILD quiche-0.2.0.ebuild 4043 BLAKE2B cda6c553d2d371850e5dd6e5cabd7404e9cea7de39568482391b240bb3f1bcf643a6223400627e96434b8be8341f5ecfa07eb25f26d3090b8800adb54926f35d SHA512 63adf493f46663254cf678ce901b40f4b2e0fe290718b247a4055c3a5e819f765db9a5af48448bb9d6428f89c60d0acda912f0743214eb0cc3bb00de344db441
 EBUILD quiche-9999.ebuild 4043 BLAKE2B cda6c553d2d371850e5dd6e5cabd7404e9cea7de39568482391b240bb3f1bcf643a6223400627e96434b8be8341f5ecfa07eb25f26d3090b8800adb54926f35d SHA512 63adf493f46663254cf678ce901b40f4b2e0fe290718b247a4055c3a5e819f765db9a5af48448bb9d6428f89c60d0acda912f0743214eb0cc3bb00de344db441
diff --git a/net-libs/quiche/quiche-0.1.0-r1.ebuild b/net-libs/quiche/quiche-0.1.0-r1.ebuild
index 1caba1ec4de6..0e62832baa52 100644
--- a/net-libs/quiche/quiche-0.1.0-r1.ebuild
+++ b/net-libs/quiche/quiche-0.1.0-r1.ebuild
@@ -133,7 +133,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/rest/Manifest b/net-libs/rest/Manifest
index 81a4dc39bd69..9aab40f5fc82 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1531 BLAKE2B a5a70bd5987cd003f15614982db5e6d1af9327cf553d708ad6ce5d594317285dcaea3adb82268440f673e0b00e1cbbf2d7e9e7d77727ca897833c15cc85a4aff SHA512 3a493667f175bcf10b8c2fb292cae7d7e8e8c9aa6893bf1566adf695b4654958e85625c4c4dab7eca375a52bc774951ff1f9cc1946303451203bfbcc4fbbacae
+EBUILD rest-0.8.1.ebuild 1532 BLAKE2B f80fa0860316eb0352ca01daf10b544b963a5b7644cf4c14c7c94f16b7fb065ba27b872a2c3d079803287472977dcc34a61b3c64c6b653271be28dac05e81e1d SHA512 74e01aec4b7335fccc5a744ba3693b42c32578e5b128493bb4f88b73ceaf42d622f5304416c4fd136f31f0da2b14ed6789c82e30ef69b7481420712ecee749c4
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
index 68bfdf67b8b9..91da837445dc 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0.7"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
 
 # Coverage testing should not be enabled
 RDEPEND="
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index f4ee581e9279..ca3435377f6b 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,6 +1,6 @@
 AUX rpcsvc-proto-1.4-external-libintl.patch 1718 BLAKE2B 9484dd528679c3cac286ae0aaea7491bbb54f00df14bbc7891809684d48eda81441745bf1d822c96775f02519de0f4e98ffd9f99cac86954874420586fbe35bf SHA512 92c1d8048e28ced24bae24e0bb7001cf65e6c8274b67a3ed4a1015e094201a812aa85d75ed280fca40b94a1b5c61b657dbf0afd538d7c59219abdf51c5af3f29
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
-EBUILD rpcsvc-proto-0.ebuild 481 BLAKE2B 4e507a8892c32f17d0852603b2828ca6b69621fc2686db96016b81f1112d1fd38ef6b83798800710fea95cc2bed21b95957c72c83dbbc2397a724c9907891d6d SHA512 9ca5e01d4aeb44b676f958b895a5bdb754ba88b2db19f4c8522408e073e1c901297c135391e1fd94368e9b1c87671e84523715458c98567d60ff3b037eca4cc5
+EBUILD rpcsvc-proto-0.ebuild 482 BLAKE2B f16bf062b577fc0305e5c8a872421e913d76789c0667df7277dc291e62f3cec45fd1dc757bcfb08e915fa590fc5e3edb6b696c0cf5024139d2b062f02b4b436c SHA512 180c00eb85a3464f3d87e42b0c6a58c1d1714778f1b2adf1181cbcce7fda3f2845c7074286634913a1bbcbd9b8facfcf1b6a4f39d97294e9c52e3719f86e243d
 EBUILD rpcsvc-proto-1.4-r1.ebuild 803 BLAKE2B 802dd445f8a13d0030c0d82f31a40e812cef9157efd229c9f64ff3ab6ecd862075b6cd432d390bd04eed25121f908df372df0479185e5d9203f7c37991aa605b SHA512 4e77071aa69aed0d0227cba0bedeae38930c84ede43e67070a3509d99ed2201f82f3aa49cf2843fdb5846f4f04d07d27cc28de8d3eaaae8e1dcacde6b4cd9846
-EBUILD rpcsvc-proto-1.4.ebuild 636 BLAKE2B 7ab5930b37236fe1ea6a68e2388e8cb29537be09f27810213b185686ddd0dba9103cb846155d84fa3a26354ea30bfa302dd3aec98d5a8eb0d045f9696af41310 SHA512 9d14f4183f64d416cc68f8051ab76542330efdc076311eb6000f9382181c1ea888c28698914d7823f069b9eaeac21d2ea13441e4fe83ae1d7a51304466959d68
+EBUILD rpcsvc-proto-1.4.ebuild 637 BLAKE2B e38295aea762e183065218c8b26a0fd36ad766af1c6831572a3691602bb149c002dfcd2153f7867d0768f3a24df889731d73421d62b1b1c312645938b472b4b7 SHA512 57f8aaffb8b6fa7c144e7639b39e796b9b5b79d594a3a09a703939bd90112a2116e58fb87e6161d490a96099733b102caed2afa8a778479f5c36c46f3ea318f1
 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 e78fd8941b2e..ea2e4cd0f0ba 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 sh 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.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
index 131ef025b859..daf57de25bee 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.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 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="!<sys-libs/glibc-2.26"
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 64f7aaa631ae..7fddc7bf374f 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 2103 BLAKE2B c9c928af25deb62750762a126298839a43d3ebe1476448e068275fa74151975c47b077f6c2def47a452d1649a439f4feb71096b7460b9b38c5562874473ff168 SHA512 1d14932bae9d1cb24370838a6056e847c658ba33c129dae1cbc8168bca6ff7ffbb1ec8136ffdcab7eecf5afca63545d27dec0b757bdc64597c71a830470c2612
-EBUILD serf-1.3.8.ebuild 1490 BLAKE2B 5415619701d339b0eac2ff6c61c34e6a06dd02167f3f5b9ce217433f7d75ab1362ec2161bcdb7728a74b3334c4f265b228ee384d71b6fb719db0f1c0c7022e4d SHA512 d04cf838e7530417cbfc5cbf4ede46a9fa511d5057b7c4b0ccb303eb9ad0f37f02ad8b71950fce002ee9c45a83878d46595c99e4f517d40c874311ea3ddd0b97
+EBUILD serf-1.3.8-r1.ebuild 2104 BLAKE2B 6ef07af9afcec6cb36f21ed58c5e5eb670c76ff0177349e3434431093d9a310ca44a51911ce26a464298dac15df42d63a2ac5dbb94de7be16ec9058d2bb96204 SHA512 dffe2db04cfac8a81f8fc601baa9abe1d11fd4b60922f7d7984f97cbf2798349748e02ee5eaed8bb0bc73237573557c8279f29e9af02393ed18c8a8395c72c36
+EBUILD serf-1.3.8.ebuild 1491 BLAKE2B 15d38dbf31db74d20dddd67e7a16f89d5510e6b9a4364911b4b07ae7908483f4b2d642e38322e80e4c8cea7e045def88dc75adcd69c1258ac6f7d404a04ca845 SHA512 bfe68bf696d76e1d7e55952f32a2c0ac1d387c343211f80d8e6f619937dec8fec75def11772e274e346ca9651647fc0024f9139937ea199f37e26332df1cb45a
 EBUILD serf-1.3.9-r1.ebuild 2066 BLAKE2B a049b9aa26d7433a4634ed0cee0d44cab2ea21340509892234c950da7dd5f6046ba904f39ed73933d1e16c8cbfe778714c2eb769baed591bb6d22c7ad54c2181 SHA512 4f5f477cc4ff4375745d244f3c0aeef39201e5f2eb92bda77e5ecb94975733be3d1bd0dc15156c49609650c3e60ddd2e6ab98018918af2e508feab9f9a4945e9
-EBUILD serf-1.3.9.ebuild 2105 BLAKE2B a9ea4101ac14929db52d07c739bf5f4800cad86165134e8455855d90de791fac22830dc9c60ef12569a8dbfbcbaf54bb0537e54af6467dcc7b4f815a9dc776bc SHA512 f0d959741a6657632b55038417351d3f51e4c6d38cb1911d3eb3618ee01843e2627d6d03b7d6d80e8d97d89654826a3a312d34c3b9bf0cb703be7dfbe946be21
+EBUILD serf-1.3.9.ebuild 2106 BLAKE2B 5c9534d7224feb63b537b3f05f2ef9d0fc3007d63a4f8f2bb4e2c113061caed8a136187431c7fa45216bd3524fc9c66cea3664aa8d014a9b4887e0744a1a971f SHA512 3accedb51af71e9aef4fa58cd4b52741dc678d2b8688e826e821e23232c2e8a3d3dec3cffa76e066a5aa3283dc40d2ee0e6990e3ae7b97fbe670b31ea1462250
 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 80540344298f..9dee2eda8178 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 ~sh 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 1f89a3bdc64f..af406d024377 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 ~sh 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.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index 631439a23f7f..7c835d9ab3ff 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 ~sh 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/signond/Manifest b/net-libs/signond/Manifest
index c1ff5db255cd..19b4d90ae350 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,5 +1,5 @@
 AUX signond-8.60-buildsystem.patch 1306 BLAKE2B 5cf758cd974d54fa39e42291f6d4969f341d37970948d0e1bb6f74367a5a77e5b0be8c7a435af2f7474d9ff8ab6f8352a7ddd83e772b792bb8db97032db2b8ba SHA512 ec69a845da1019c7517ca1163bd09fab2cf1f4e1e8faf27c2baa1ae0da5c5b4689b7fadc4207f744224deff7b99eaada6d41af4c451962bc07c9920d1559ba1f
 AUX signond-8.60-consistent-paths.patch 10565 BLAKE2B 09024a3a877d965ad037f3e77add52589e230b2fdeb133960192b6f26d4272395230621625a78633d084f863fd3aa0c931011f47134587a44e1a27a20ca04e91 SHA512 e3731e360c208c75de3634e507c81be94da29df7592ae90c192a30ef727cdf1c86e939a6d27ddd5b227a7655630dc7320c7181f644721e8b59b37501dc34e2fb
 DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
-EBUILD signond-8.60-r1.ebuild 1615 BLAKE2B ff1092a2b26d4fcccf7ff008944c517eabef14452a3e054318cde00e1f2e6cbf18de1f7d57fe848d88a472de5f9a590e3e303822b471cef1f2ef7cf36856608f SHA512 ec0802242b49a5c6c688008a768f13303731dabf75a864b33fcc1384797d5dbf6c8a40355cf43d5147d78db2bb8bc0e225c3a228a9cb8f4363339df7debbe02b
+EBUILD signond-8.60-r1.ebuild 1622 BLAKE2B ed235128e02a9d93fde9848d2feff85e1ddfe29cc3b5cc97e63cc04630a898a34722750ead88faa5940bd6983fb193911b588a27fdf022ad1fb3fb88211d9570 SHA512 4b5cca985c36a579420153441d4d75e1ef879262b21145385079e9be8244d2442678b4c742d7b2fe9453d2cb97411190bd01ea03fcf6a96887bf09bc3bc575e0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signond/signond-8.60-r1.ebuild b/net-libs/signond/signond-8.60-r1.ebuild
index b703194fbfd3..e767142d6762 100644
--- a/net-libs/signond/signond-8.60-r1.ebuild
+++ b/net-libs/signond/signond-8.60-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
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VER
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index 5572890b8479..353f83e7e92e 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,11 +1,3 @@
-DIST socket_wrapper-1.1.6.tar.gz 54150 BLAKE2B c9d655d87e4462bf36289c7800e17fed9db24153fd82e11eaa1007a1507e3ec146d94beb6425c6e43941f904698eaddbf138707adda74735d7812845751176f8 SHA512 8d5868877cdc7b20efbb8073276574d65d61a8fea73df2924a3fa4581284d30d7a1f03351c470a473e0e2eb6ed1a1513a98559a620b3976741892bb807cfe7ea
-DIST socket_wrapper-1.1.7.tar.gz 54774 BLAKE2B 132b3875cc3434b2ae9c9e37c664737c7916fee9f1c0a6207b85e881c37c6222d17f8ca191519d8bafcbfad7700c7e24726fa807a5cd2ceb233ebf129a282e54 SHA512 3ddf7c1e0bf75268ed9bb44dfb02028d2d678a206ce6290ee1fc8da851ccf0cf97255c2cc498212abf65b96a9114563c4f922816d0109d379b096682a6bfe1f1
-DIST socket_wrapper-1.1.9.tar.gz 772252 BLAKE2B ab8031ddd5b22fc9534daf996dd137466d2592bb83dfac4f15fb1adc3f0369544ad74b5b8fdb8dd61a09b6264f445604571d1b6b886401b96720ccd0499219bc SHA512 62458c7881c0d4e0e7f1ef3ec8dc4277a0f886cd1e9c73f6a20f23ed4546bcc959169fbac909e193e60567985f196358f6567de68b89ac4d4d5ec8473c8afb64
-DIST socket_wrapper-1.2.1.tar.gz 67955 BLAKE2B 77091f0650ef4be31e581e32651920acd532c8a0018ff2775c0b273ddabdd4251a63b9cb2536f2dbda37b324e13ecf49422241fe7cdb92c8439e4b675f88af96 SHA512 2e905591bf7ff9cf06a1b5ce2c683996a32c6d08a416aeb07e4b6049849c915040b528171275a8b101a3ea549f05c9c7b2fc9ad6096089dc471e0278a4fc610d
 DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
-EBUILD socket_wrapper-1.1.6.ebuild 725 BLAKE2B 5cf1168b44fe35d96af100ce245a6c01ff33951f09aab0f06979aa9d488ff32e7c594d07d411e765f3a790afa602b7a090f2f2e29e82ac626eccd9bc885a8751 SHA512 dbc0a17667ae0ba75d22bfc4573218e59bc4439e55417b64710ae4d0a7ac55b0ca79a0d979ab5d09361a8cdb9f3753b2911b1600029dcc19b89075477c8dcf34
-EBUILD socket_wrapper-1.1.7.ebuild 731 BLAKE2B 7811c4271517ae5fb3faf99adc08576dd76d8f99981577458c0bb3ce97689ddbe4ba27e5efc86a256b1cff2d8e1f859979455792b13c63073f06817963c131f8 SHA512 223b55e8ddfc367fa948b2619c652c16fad67202e07406c9ceb373e93b34f814ed16e1ba64291af14cbb6c221065f98c963c905d188ac71ee858553346fb958d
-EBUILD socket_wrapper-1.1.9.ebuild 740 BLAKE2B 68d345bca842e396e131c095f8e805a308ebeb4328a109c90bf7c1a2980d3bbe4e18b86efe1a77c8809e4531146f5a1739cacec590a2c3d8f4c2001ec587fe45 SHA512 114e8d0b3b14634a894ce7228dccf0a7b1ad60bc597d2d5fd02cd6a020b6df19de1d5ce2235251cacf4785784c509541bcb4081a2e160bbc45605546912faba9
-EBUILD socket_wrapper-1.2.1.ebuild 485 BLAKE2B 85dd52805f1b4930db0d62097696ae09a3b0ea5f149bcd4c625a32dec57a0a4f33a0006516e1e78f3602953def3f9cda321900d9d042425a9632221a1093e82b SHA512 1bb53ecea125936652cbb67b4d11b6bf9d0c4dddcd35b79d8c3feed30ec734549d7253232737f67a01484b2a0666abfe748b452f4710ae6ac7425368561e7ed3
 EBUILD socket_wrapper-1.2.3.ebuild 477 BLAKE2B dd761aee1c472cd1dec987541ba73286ed7d9e68cb78a5cd12aa853b0885cb5b79a64ad33d389dfef5c446ba15a8bc2ea917f7f48de16d4a4b6acade80e0ecb9 SHA512 d4cc629e0a46299f29d5dee1ef49b787c32eb54e00d2b3a78b2b7e8fbb5c4d990f5042b5c266c1cd46d7b4ae67b0d2bc439f23712f9d423d610015d883b9a12b
 MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild
deleted file mode 100644
index b76345869562..000000000000
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A library passing all socket communications through unix sockets"
-HOMEPAGE="https://cwrap.org/socket_wrapper.html"
-SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
-# Because of this we cannot use cmake-multilib_src_configure() here.
-multilib_src_configure() {
-	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake-utils_src_configure
-}
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild
deleted file mode 100644
index 25f6bd01fee8..000000000000
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A library passing all socket communications through unix sockets"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
-# Because of this we cannot use cmake-multilib_src_configure() here.
-multilib_src_configure() {
-	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake-utils_src_configure
-}
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild
deleted file mode 100644
index 117f187291e4..000000000000
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A library passing all socket communications through unix sockets"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
-# Because of this we cannot use cmake-multilib_src_configure() here.
-multilib_src_configure() {
-	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake-utils_src_configure
-}
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.2.1.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.1.ebuild
deleted file mode 100644
index f7e809e6faf6..000000000000
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A library passing all socket communications through unix sockets"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index c66d27201fca..5fe76d24b43d 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 861 BLAKE2B 1a1b07d9c49ea9a960c29a8a9c4bcccdc56a435501012dc24f9bbb0af6b51fe4a5b341ac18b1ffdea6a2f563dfa31c8946738389f5f9903b39940226fa1d0ddd SHA512 aa4c31f618b79b664d887d93e9c1829c9d4d78746730edfdb874800e8aff0cfd75fa74f179bf7fe69f40dee91f38f6a2b0b4e573205b0d96ff87ff9e4eef7bdb
+EBUILD sofia-sip-1.12.11.ebuild 862 BLAKE2B 2c40f326263b5109677ebe0e9e3e939454383f597d0499a7c121a70896e4f78ec58deb2b79c99edae3b94579ec9f55deb459297947a7135b17178440ddd5f6cd SHA512 706bbdbb5d2d9c82879463bac3af47f9442af081808b6c6908eaa8c31c2f9c6345cf055b55f3ad265d887ace620299adb1c61e95180531c8551001a1d1374ca3
 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 2de4dec94174..0cef361a73d1 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 static-libs"
 
 RDEPEND="dev-libs/glib:2
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index d80ad8f45123..f34859546640 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,7 +1,7 @@
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 DIST srt-1.4.0.tar.gz 1293647 BLAKE2B 93edaa8b1d2b59776bc3efc851a5216e0acef3766b47100646306bb04e3054d4cdf612da07bc5d1124380abe595733393d7e47f1885282a75e24f34b688ddb1e SHA512 b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248
-EBUILD srt-1.3.2.ebuild 1247 BLAKE2B 675103c16054fbabfb3481a5dc9b205f9db7ac28080a52fdcfeda7d2a21ec6a5752ad0d6131b4b2736d29f8d9f2c989f506814a206f99fc7896641b1fb31a915 SHA512 35279b41b08407c2c55f15e5ac4d44d6a4b0065a63d8cb93ae1123f9f7ded7c4ef9f09a88495d996fb3fe0c721c672ca00023a7f5bba6ad996be5e6a144de78e
+EBUILD srt-1.3.2.ebuild 1248 BLAKE2B 05e0f6fdf1c5c90122498566ab676172a42c5ebf7fef6e025ee649c2fb36f5d4821dded731d216c925260fe68e86c203fb588e17b675db146dcc6c23264eb71f SHA512 df40db8d23d2612316b141df4034b1eb69bb3895ce038a9a7772cc1d3393f205a8831ce92f080b62cabe3a769415a721f945c4167983512f77603a09d6d80f66
 EBUILD srt-1.4.0.ebuild 1254 BLAKE2B 377d38e6480cd261ea5106b8a735f343850ca52b525ce685bff11a0a1d15462b534f0c12c7aeff804cad91ac3d8ddb4c26c8a08847c9d443638cf06cc145f3b9 SHA512 8cf2d9f7162b27435b6474b57196624c4dc948abfbc4fb06bdc9ad644f8c87b1180783bf464db93018134ab08f86402caaa6ef407c0961ca64c22ec015eb1801
 EBUILD srt-9999.ebuild 1348 BLAKE2B 211466b0989c4a1ba51cd329746bb80410bcc922a30c800333e7dcb34762bf0752ae16847949d6d6b7acc49364b333070becb4e8bdcf205d7d5761f1d2d80f5c SHA512 99b05466a3a7e6809c1a79c07486ba2dafad524cec4e01617f026f2c9f463f079ed2557822477dbb33cb9541e075e892045a1aff7b0ec24148b8f0eef41c8448
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index e1a8cecd0f14..e447f882a0ee 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/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 5ffbec5b15e9..db5dbf61b9bd 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 1493 BLAKE2B 99e042ebffe648c9a2ae08c9fa39b0ac96a502ecffe8116eb7765533ca9b162935b42a92225883d979d25414097c6e18e705de9398261e7d6d51ef7eaf857a36 SHA512 4acb890a1ad210babd8a8b54368496b31303f417966c87e30c522ea11e560f34a114d3c59ae6e7c24090d21655ccf705822277d98d8885edf92604d4a889e941
+EBUILD telepathy-glib-0.24.1-r1.ebuild 1494 BLAKE2B 206d77fdf48eeb46e4024c5ca6b46c8bbbe5ceb4f2201705ea36e0793f9d256a7e48ec66a619dd647aceba96a93b7e941bbd6938cf1af15720ff52cdc419c657 SHA512 30f3c4a0bb3b9109a739ee83a610c89c85193285ca7f850c610a05d04957f8ac40651b0ce787ad18b7481ed695f965426c0aac792532f43b82099b383443ca9d
 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 9fd97b463c6d..94d8c5de0d58 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/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index fd7382047769..75bf554f9c4d 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,3 +1,3 @@
 DIST uhttpmock-0.5.1.tar.xz 310976 BLAKE2B a7aa609d853a8593461aaaed0074532bc7df1d43638c720694a558cd4eefac14b140f79025cbf7ca9a93ad41cfecfa7728eb049e52d514edda7267389f4d8097 SHA512 99135c0983be78eaaf962e5b182eaaf921e1d6ed30f98691d8766e9d4a9e07188965ce3f546a13a8c32b148bad305083cc3cfdf48d9a8b91efffaec5a46d8006
-EBUILD uhttpmock-0.5.1.ebuild 913 BLAKE2B 65d0c2fa1db4aac5580e616283c8dd7ad3afb033b891c2a3ac9c7b1811baf881ad2aa2fe21adc5d808da5549767efe6f501096f5313f8cc9294a409f5130067c SHA512 b2e0633d067557eae2076c4ca04846502811fe50b423184144631d7232f72701ac5222b3782e099dd10dd2934e5463bf4dfed3bd16c269480df09b51a2cd263a
+EBUILD uhttpmock-0.5.1.ebuild 914 BLAKE2B d2467cd34b994cc47899b1419f1d03fc363df6c0793dc5da9c9b7d86dc7ff41e596618d75d24a72f47c64e4090c614f88b6e50e6e8507c842044701673d04ea0 SHA512 a52c26a5216cda25dd25a8dcb3cb12c691b696f9bea05581a728d1c1c086f7a3a49f9ee975b2aabb0424e442f6536a93339faa166cc3dc43b2b4b7be72c004ed
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
index 486fe307ce09..d2c4f91cfe88 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index cb6594600e9e..17d18bf83ff4 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,9 +1,11 @@
 AUX 2.26.2-fix-arm-non-unified-build.patch 982 BLAKE2B b2f4ab56030fffdf2504f213f2713117537095b66c6862377051687a4a798e0540dca95774275b5a7c1ac0fdd5a2927e07a6af8b7a992b8710d2edb05be272e2 SHA512 95ab575a4de13036b11691a4d9cb1b4338b118e5983352d66c4ad639104cce564c4a946349347ac461515bd5bef7359f8193a84d7b02f2d1345cba7969fcfcf6
-AUX 2.26.2-fix-noGL-build.patch 1491 BLAKE2B 1bdbffea8af3d2d7d8ddefe0b9a057e0dca2cdeead448a5b693f5ba14a74fdd0cc9bb9407c5a6fb9f0ed344bf438678910d746620b5038314b0f0477c6272bd7 SHA512 a1f8d968b1487b7172a2f66f47478c1fc85ea55c64da2fe45ded77463c8e3541bed3f14d16177db881dfeb2d68cd9bcf3a8b411242f5c51a1f302e2d99fd2a8a
+AUX 2.26.3-fix-gtk-doc.patch 1302 BLAKE2B 4a0b71a93dc137b5540df0aebc31186b510dfe68dd7b354f763f9a7a93e5df0ed24b12970d801a145eb9b36cde7711029c93c174146c91622a8264380cac08a8 SHA512 f3dbbff5ce65918bf3e889d3139bd7e7b3b7d17adf5f0c22b135abbbd0c8d7ebdf5bb8b126ec9ad2b345c4163da7e862ffe36e521b09eb4024330dbe67b0d7a4
+AUX 2.26.3-fix-noGL-wayland-build.patch 1920 BLAKE2B b064c31932ae3f7d0bee63d46da6c8df8ab442be722cf32f562a201c0acef7a25ca1b3201e6b38e79ffde1c6a007789b788cb88a0ddbb321854a3771ec1a60df SHA512 785b8118954cedb7949f35d12987f24010ff7094079d70c5c19228c7560b3423cafeb757ba62130b647b16803a3a8b4725756d22bf9be023ff905ee4625d0d26
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
 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.2.tar.xz 19330000 BLAKE2B c0142aa19572c96e3dff11251316a4527be0357cf101177e056dd40aa9b5346216a4dcc14071d9c1240c101bd03f2179559d0d2bd81308967aba8530208186e0 SHA512 98d47282fd8f766dbe4a74c1a3f618aaeeeed69bd0666ed4e8674ae562b634681b3bd18b0d428df6bfefbaa3e18eb4cfb2fb077f5be4fed34cbc81c8293ec33e
-EBUILD webkit-gtk-2.24.4.ebuild 8484 BLAKE2B e90d9d5215581ff7c8adb971b3a9f9a4baa77ba96aabe25315bc5af09ba37e130a95e4049b5769c6ff479420bdd9940acf03059e672f27090f961c3f2d5a0d0c SHA512 547a97fe6ae454c820610238aeca287d62e3d7b44feb3b53c0bf21f235bafc8e0e0fb07aa751a90b30ce43aca0648dbe7717516a9b1d9e1875ba1fbe6b9b7674
-EBUILD webkit-gtk-2.26.2.ebuild 8767 BLAKE2B 904b17fc552b38e593b349cf330c021106ee52d0b634d49f6e181b15209568ca8c15720375b6af78344e36d50170abef06833b8b7aaff0e3197005d87d7d9fdf SHA512 356702f01169f66e8b1ecd0401ef04dcd03e485cd86128cdb709cb9a666fc7d726cb1a47da83f27b647bf561b00ebdbf466853348c096379fc6be27d1313efc1
+DIST webkitgtk-2.26.3.tar.xz 19331900 BLAKE2B 14c31b0f640b0f859a3c1eeda542f176f6c7981270c5be3225556eb4a1027a2511039cf0f33682faa93846c4ca5ed64158574a9b8a662a4a200b97cad28d5ed0 SHA512 9575c86ab5752c09841878cf55134e7de9a87200e55017859cd02affb1cadd58031a7b6f67a580e87a1dfe4fc830fed9774ba289e7244d3ead9eb9328e76d7c9
+EBUILD webkit-gtk-2.24.4.ebuild 8454 BLAKE2B 10631c75c8b9029abf668d101072c072c99e13a91f6ca5f600f99d99cce28897e652d2f948c888854c36b9e137eadff1254821864ea68ee2f2a0ec008dad11e6 SHA512 57d65303beb76f6230843b38070b6fe12e70cbef59e796995ad76dc5546c48fe545fb5a56dbc987b02fe7610cb6f369dc2b18c3850068f358fd35882f75e29e2
+EBUILD webkit-gtk-2.26.3-r1.ebuild 8811 BLAKE2B f2724bb87055ce62a9e9a1852ddc9a1e374df031f660bc5d89745b08fec8444ef47a0cf9a03217bd95c37c0c07a776ebc01994b6859f78c23a9191098f12652b SHA512 15ceee38524291a9d50e2b5170bd77859cbfc307f2772c8e3decf729ddd0c3ef561dea71de08aae50635d36526c607cb149e100665c2171a109ccd706d829a40
+EBUILD webkit-gtk-2.26.3.ebuild 8809 BLAKE2B 9ce5737250e3ba643c31ef7fe597a9ad02de2940b7c882bf7b85e8ddae8b3e501b2f2ca959a93acccf6f7f05f7acfe187a0565ddc883ae16dd224ffbebfded53 SHA512 04d085b7f72f4510675a372f44451bb1fdefeea889242506de9b9597fac1b357756f5df3ae39bc2ae6eb90f382a16df7e869787f7d9afb84d0d2d41d57984b46
 MISC metadata.xml 837 BLAKE2B 58680ed3ff0941924b33c03aef91322437b90c88e46951bf780b99507b7dfd599d055c8109a45e8fde18a9d871c19b9e86d21550cd0a01bc3e02db2f075ccfda SHA512 6a8191200dd2e84ac2cfaedeecc753d8a9201d764acedd2b11c707e8ce21ba5b0e91e73c4342efb33c96a46a65c2a67736cb32599f07219acc9bdd38d453203d
diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
deleted file mode 100644
index 422c71a452f2..000000000000
--- a/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0fb66b8787a857c5c51b7efdc950a6ecf930b6ee Mon Sep 17 00:00:00 2001
-From: "ross.kirsling@sony.com"
- <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Fri, 4 Oct 2019 20:25:56 +0000
-Subject: [PATCH] Unreviewed WinCairo build fix for r250717.
-
-* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
-(WebKit::LayerTreeHost::invalidate): Deleted.
-
-
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250743 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 1 -
- 1 files changed, 0 insertions(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-index 980513647ff..d214532d852 100644
---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-@@ -212,7 +212,6 @@ inline void LayerTreeHost::scheduleLayerFlush() { }
- inline void LayerTreeHost::cancelPendingLayerFlush() { }
- inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { }
- inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
--inline void LayerTreeHost::invalidate() { }
- inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
- inline void LayerTreeHost::forceRepaint() { }
- inline bool LayerTreeHost::forceRepaintAsync(CallbackID) { return false; }
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
new file mode 100644
index 000000000000..85328be1a5ca
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
@@ -0,0 +1,27 @@
+Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix this,
+but it looks like it's not enough with older perl-based gtk-doc.
+Keep this extra patch only until we can't depend on a newer gtk-doc version, which
+should be retested whether this patch is unnecessary then.
+
+Upstream extra reference for the above reference commit:
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
+index 023b14c33f4..657b1febf5d 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
++++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
+@@ -1505,7 +1505,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
+      * WebKitSettings:enable-media:
+      *
+      * Enable or disable support for media playback on pages. This setting is enabled by
+-     * default. Disabling it means `<audio>`, `<track>` and `<video>` elements will have
++     * default. Disabling it means audio, track and video elements will have
+      * playback support disabled.
+      *
+      * Since: 2.26
+-- 
+2.20.1
+
diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch b/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch
new file mode 100644
index 000000000000..4549f1712e6c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch
@@ -0,0 +1,39 @@
+From 874dceeafc08edc979093509dff3ee6a8b25c432 Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Thu, 19 Sep 2019 02:34:49 +0000
+Subject: [PATCH] [GTK] Compilation errors when GL is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=200223
+
+Fix following compilation error when building with ENABLE_OPENGL=OFF
+../../Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:123:51: error: use of undeclared identifier 'WaylandCompositor'
+parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
+                                          ^
+Patch by Yury Semikhatsky <yurys@chromium.org> on 2019-09-18
+Reviewed by Philippe Normand.
+
+* UIProcess/glib/WebProcessPoolGLib.cpp:
+(WebKit::WebProcessPool::platformInitializeWebProcess): only make a call when using EGL, this matches
+guards in WaylandCompositor.h. The condition was changed in r245807.
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250077 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
+index 37ece2f4576..a380a25fa4b 100644
+--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
++++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
+@@ -119,7 +119,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
+             parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
+             parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
+         }
+-#else
++#elif USE(EGL)
+         parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
+ #endif
+     }
+-- 
+2.20.1
+
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 0388d9311798..3300742c1964 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 amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~arm arm64 ~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.3-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
new file mode 100644
index 000000000000..bc2267a80b9a
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~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"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.3.0:1.0
+	>=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
+	eapply "${FILESDIR}"/${PV}-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
+	eapply "${FILESDIR}"/${PV}-fix-noGL-wayland-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake-utils_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
index 455b181a4dde..d3c8a17109f7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
@@ -16,9 +16,9 @@ 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 x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
 
-IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
 # gstreamer with opengl/gles2 needs egl
 REQUIRED_USE="
@@ -105,7 +105,6 @@ DEPEND="${RDEPEND}
 	${RUBY_DEPS}
 	>=app-accessibility/at-spi2-core-2.5.3
 	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
 	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3
 	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
@@ -117,7 +116,7 @@ DEPEND="${RDEPEND}
 	virtual/perl-Carp
 	virtual/perl-JSON-PP
 
-	doc? ( >=dev-util/gtk-doc-1.10 )
+	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
 	geolocation? ( dev-util/gdbus-codegen )
 "
 #	test? (
@@ -164,10 +163,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-icu-65.patch" # bug 698596
 	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch # bug 704236
-	eapply "${FILESDIR}"/${PV}-fix-arm-non-unified-build.patch # bug 704194
+	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
+	eapply "${FILESDIR}"/${PV}-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
+	eapply "${FILESDIR}"/${PV}-fix-noGL-wayland-build.patch
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }
@@ -230,7 +229,7 @@ src_configure() {
 		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
 		-DENABLE_QUARTZ_TARGET=$(usex aqua)
 		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
 		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
 		$(cmake-utils_use_find_package gles2-only OpenGLES2)
 		-DENABLE_GLES2=$(usex gles2-only)
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 9d9482798526..8bf2ded7ef9d 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -7,6 +7,6 @@ AUX wvstreams-99999-openssl-ldflags.patch 349 BLAKE2B d8df661e5219b7890e338ed21a
 AUX wvstreams-99999-soname.patch 273 BLAKE2B ef364e25848b4727a0e8b75f155ac2807f1d8cc976ea72af3191ca25a0dbb5d4345030812fad7af839e1c126db185b6ce48fb50d2211e810954f2f714717854e SHA512 c8388a5ac1e0bbbf1574c97004ae7381a466a7182614cc7345cc3f9639771e6696ce32ce03b98604a05618be03c30cb95079085e7c1c935c42dcfe5e9453f886
 DIST wvstreams_4.6.1-14.debian.tar.xz 21124 BLAKE2B 2af6ec180c3130dd7def733e5ea569fd0a81cd2c2411daca25e6042dcbe78792bafc4b13f1c1fffddb6cd66273f11c62f54b415c975cbea0af052b18ff0955d1 SHA512 93ea7c4fbab542bd552d6e91ae0c49a27ad8aded177ae6474943acb08d204ab31eac49b3f416b4d90a38ea697f3641c09651a64f9c40d12543d454aadf2ad9e4
 DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
-EBUILD wvstreams-4.6.1_p14-r1.ebuild 2187 BLAKE2B 7622c4df5392cd805c08a0e7ce256a2ff2a281f3c4d1ec1c2c538bf94572f72f7021095efa81f4a8541387362ae91e3bb84b728c32a3be883697e1f91c8de40d SHA512 211932968546be0ba58571d3cc86cf01983cba85972da6a9431bc275c00bbbe43f96cc64c7c36e6df64eac0f0a08991477323b4063fdd3938560f43b37303cc4
+EBUILD wvstreams-4.6.1_p14-r1.ebuild 2188 BLAKE2B 1e1fe7273f55804a1177a9a8a92e0dfb351081e47e870c6feb744117bd8be8d40b4a151377316613538bc27c9b18985423e1857a826c913928389d730d10c7a9 SHA512 1b1cabd74e21c1f5633dac5643a3ff3caebcf7ad0633aedf78e160c2749f1529de7df437233291b0c60e22c3268f1f5a0235e589b369adac15fab5d4c03e6129
 EBUILD wvstreams-99999.ebuild 1994 BLAKE2B 4b2ec6ec4b00ef7489e7686ba4e5e1246f764184b6fe0a9bc858ce13c2978dc09c5c008375fa0b9cec037259a1b9092623b26bde9b3d833c1a175350dc3e3a6d SHA512 a6dfa70fa397c14af6721ba461b271e09208ecb12f5f5253e4bdbfdc1edc768aca14652d95fcc6610baab044bf7cf76d71a392bf42c76573db40e126b2ea2ad8
 MISC metadata.xml 567 BLAKE2B 75e97c66b9091dd12ae8cabfc3f1f80b772e7cc835d5fe6fc4399dc837ca0576d567af45186bfdaeaefb862938f82d0b75c339ec73fcb0a5f6abe2b81ce8ed83 SHA512 11ce01ce8844fa3c43e8175c36a0f76266ce43acc9d6ed86156bfddc0b8e5f5ede6ecac9518e329c48fa46a448e57021496e46f9282d6d0cc81133ac9488c437
diff --git a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
index 85af66408cbb..4b37c0dc546d 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc sparc x86"
 IUSE="boost +dbus debug doc libressl pam"
 
 #Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /net-libs
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)