gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /net-libs
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
136 files changed, 177 insertions, 1080 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e5f4b21d190b..e3289e40f440 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 4e8c4c233dee..1755fa0af8db 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 4582 BLAKE2B f74f53e38c94037db0e69c5b14aea7aec4b9776e2363103006822b798d9d06fcd72ce3b2675a96ecd0e0aaccec335943d69beeae9fad8f32a659b5c7f03868b9 SHA512 98b894222401b46c31549ccba81cf93bbccb1b6498376d6689223a2159182406af67242d26add36f9323e1ffcfe7d87b932fa6758bd29c93d518c26aa0883b31
+EBUILD c-client-2007f-r6.ebuild 4583 BLAKE2B dac2c56b160076d3e7c465a3cbb79b9e18a93264a70022ac41dbf1907e9ff2187bb5a1e86e7c201ff4c1bde0e1b3e7cc844ce2f337cfbd28c530e1b8eae20b52 SHA512 3f77c3072f72eed9a236868e21e89c05b79d584e42208dbe0d27cbc26b24d03d30277888e3e1d2636c874d807435d6727ffc04484d2b84cc05a244f582dc1a97
 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 26f2a60b2686..56771f441299 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa"
 
 RDEPEND="
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 834b9ce59917..24b514b66d4c 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -1,4 +1,4 @@
 AUX version.sh 736 BLAKE2B 6f79aba490d6ac467b0f45ae1b3404692c24e897aece8b40f0ba4d6bcd31d980283c6e8f2307bec19d442d45687fad1ca126e50a6443d3eee2ce75b0d9f5c5a8 SHA512 e7c0c49477a7bc8e01bb84a133bef817a5942e8c13db3cbab05f8fd1a5abcbd821dab4016634363b077c869b93becce4ec1431b3e1d28fa969169cf0b9f6051a
 DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
-EBUILD czmq-4.2.0.ebuild 1186 BLAKE2B 6e116ec87c3df5fcf83af5acd1043f3d3e331235522e786db3558c68da63176a74f6249f6c66fad8d4900d92797c29fc266e4d172b946878c6994b126f0ffdce SHA512 d685be15cf56a07ab34674adec08bc0bbadfbb118b281a25593b06810938b350aac30e2eb7b654f5431115b636a73c7fb3f8ef300971fc7df5246535bac8faad
+EBUILD czmq-4.2.0.ebuild 1187 BLAKE2B 2749d42c3ea0226569bdc37d5ed81aa9c8aca13f48730720f5a7f34dc7b7b607ab0e7620a3e9249a9e397298bc6a749365f1ef9a802e05879a460f170eb23ad8 SHA512 00cf49ef271f3ae802e2231fc2c9212da97b1b45488299c9214f121bd4becee21121a40db43367a5e558aa4695d58ebb170df52469cd8bc1161c112a2c58fb07
 MISC metadata.xml 685 BLAKE2B df8cf761a5f66beb5270526eb6494146b13730418bcfed63cf9f1e8c63ff5442b1c8c0556678a737d153729258bb1b79dfd910ac7e42ebd2f3f3d52ac40279ef SHA512 5711249c075704615125fb9208883beb4907a6a0e4fef865ef948ad6925399aae34efe03aa61f68d30a561fa12ebfb2f14795ce281defd597a164629e62451fc
diff --git a/net-libs/czmq/czmq-4.2.0.ebuild b/net-libs/czmq/czmq-4.2.0.ebuild
index 9ae6087d185f..2eb22f2b402f 100644
--- a/net-libs/czmq/czmq-4.2.0.ebuild
+++ b/net-libs/czmq/czmq-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0/4"
-KEYWORDS="amd64 arm ~arm64 hppa x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa x86"
 IUSE="curl drafts http-client http-server lz4 static-libs systemd +uuid"
 
 BDEPEND="app-text/asciidoc
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index 570984668523..77e4b580c8cf 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -3,5 +3,5 @@ AUX daq-2.0.6-static-libs.patch 5093 BLAKE2B a374f1d8aa237f55a102dff62084ff3cf62
 DIST daq-2.0.6.tar.gz 518013 BLAKE2B 702ab20c776b9047230bb1ac36574068e461a850ed5d15959c314d62b0b828c792cf23d19cdb411ba8c067348ae74dd2f011376ccbe0376c44536ad58fa1bba9 SHA512 61dd5408c587e57999445b9549ac539ffc5bb16ddc179601de1065fc5e251c1893536d8aa2251096e34b54093529d3578e7b5d97e3514cb2bbf4de113639b08c
 DIST daq-2.0.7.tar.gz 520287 BLAKE2B 799a8e240c9e359a08ac74ef4fe0d92882d4635f270beaf5f5077bb20cc200d6cf8c55e2c68a59ecabac361ce00619d66ddeb4d7e9a25094b16b3a858673099f SHA512 9bedddbc2d952526ab4e1d65f4507eb914507f8b3b5702ecf7137f8a210c690703469162a117a76cb8376a5639db46bd767fc48789ba7294a0bad26d4cd0ede2
 EBUILD daq-2.0.6-r1.ebuild 2053 BLAKE2B d47824d0990ffbf3d91ab7af37b72716983bf491f465c48169b6cb87bd3ebcb4b08a25514262dc207b6bcc68586119c84ae63f9d1274d09d75197a9a521edf35 SHA512 2131265fcf2b167b6d8b2f51edcf614cae22090feda1e44bb42167ad3f5b5b6f81c8892a0d3dac7bcdb75c187caa156eab8e17232268c668c33c510f43b490ef
-EBUILD daq-2.0.7.ebuild 2055 BLAKE2B 0590830a5cb57f6c89cbda9d8de1cc239a2eb7b42d05c27ca03b640529659681d0e4f912649b49f5d681f6275e4e158cc2987bdb2e18c5083b8e14ee7a8b4f62 SHA512 8dbbd565bb209bad4cb947ae6534529a8212769420cd6a81d3cf06ca19d9db5aa36a78a75ad5cef7a7c08b082487b00b09fec1f51d45d537acdf666f0ccc1066
+EBUILD daq-2.0.7.ebuild 2061 BLAKE2B 9a2a134e1a2fe9ef276337409201ca374f993ed86622dab187da48874078d0f7435720e8115ddcd191060269f5769f2625dc3cd456fb5e7eaae57823ed64285a SHA512 b7e50c78361d590d85d02b05c1b66075f8060e57eca9a0f1dceeb1c34cc468fa40d71ba0471361efe140897bf53afb26ea6d9bcc82698033d7dc6ef1b0b13c5d
 MISC metadata.xml 1314 BLAKE2B 167ce20e3e0130835e68309dedcbaac8313455fe7bdf680b00975ebec436d554c4c9d44c71e5b42b4af4b0aa7f7ea5eb7a0d1993c0ee37a0cd1d5267107cc9e1 SHA512 8eddd30b83bd5f03280d208ce11df9e388adb7df2fdb9420bc7fadf6956b85012e0ed6a5fdbace36c5c5f65ff8e711a749da2eb17bf585c6223cfef95218831b
diff --git a/net-libs/daq/daq-2.0.7.ebuild b/net-libs/daq/daq-2.0.7.ebuild
index 9abd84733239..50a56e1d3756 100644
--- a/net-libs/daq/daq-2.0.7.ebuild
+++ b/net-libs/daq/daq-2.0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.snort.org/downloads/snort/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
 
 PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index a610667f0b90..0f7e2a8dbd24 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,7 +1,7 @@
 DIST glib-networking-2.62.4.tar.xz 186004 BLAKE2B 0fbf41cc916a76d23382eb6ae84316e5328c682c4e440f304a978be897f81778e96a201a19dfdc4bd912c144d4013b4cb6344a2a0031fc2898f4af31ef0b43fa SHA512 cd233eeed7ffb8458f4e0316a08927713899e64ce2654aa34f267ccf09d2516e7dee79012dd9e1488d3e8c0e1795c3525523bf8dc5f82a71c1b202942c38363a
 DIST glib-networking-2.64.3.tar.xz 189760 BLAKE2B 5f067aacd0d7724367eabf961d81fba9d77a7057cc60ffc7bada0f55a7eff0bcc2388e8298792636c77252b9494a6a7d36bcfd227bdfbbf66e5d45cf77dfc1bb SHA512 01251f7f95d1c331e883d5ee7857bad0c0d6308991e437ff54ed63e718bb30a12e872755e0611e2bf6ccb2a01c52ba865fe0d94ac69dbab37d74afe063a0590d
 DIST glib-networking-2.66.0.tar.xz 193920 BLAKE2B bba3c74a3676c15fbe3b9cb97aafb3c9320ebb6f7be1479a66cefd233aa5a548a605be74156445e6a54e8cdb307a09e2916f6d8736640ee38fce9ca289de195f SHA512 697798864746b40542873257a789290cacee425467e32c0eb096c87e124b37510753a990ef5d350f1db85c24da88e448bca9d8d8b4308123a74feac299176de5
-EBUILD glib-networking-2.62.4.ebuild 1740 BLAKE2B ac40d8d2c90eb77fda52322bdf85449b5329f65bbac4f87330e1370eceb03bc0418a810deb32b86b816d3c31f32dab1a09f1d9521edfa4c74202d9dc4ee19deb SHA512 a7f8feaf0c269a4f4093da2d51f866199aad8ec5487ce6eb4b340674d26f7aaaf2db737faa7635e343a2e253b2b22f63b641e2505d603c784d8780df3fab9d44
+EBUILD glib-networking-2.62.4.ebuild 1741 BLAKE2B bc733dbee92c479e3191f440201444b53585206f2df485f69bfa233350518f3c04aa90976c3ed37a396c391c3469591d64044f2eb68f5b4cc3bccbdbc5a32e41 SHA512 7b40fdbbf8a83261495a8c5b5ee284db0b65bc8ad204037083923d9d65f4d66ccb62f83b2d58fe462a20260a4fb64fa6f90e82a9b93063e54c98fbf35a01f2a7
 EBUILD glib-networking-2.64.3.ebuild 1741 BLAKE2B 82c520670b49c38edfad295baea8cf5fe613dfee17a71c1b0e1954dbd7f40219ea79b37efb41a0fd50bdafb7456bdc299ca41261ab78d9c26c36c005bad60c6d SHA512 1f9a6424f8869096d01148ea4145ac2fb0c31b22f03c6d076009f6dd5f16bf406676d9b83d35eb37637c07c8a28923892d98cb25e304e5e1b7a9d40bf58784c8
 EBUILD glib-networking-2.66.0.ebuild 1749 BLAKE2B 1d4bd3b903527d8e6037faa1f3d1bfdc9d2b7a03e0e5752e3c13edadb70399b02c5a4bd4d66cd737704a5fb3cce87f7e80fb05d16321879389f1266cf8b8e4eb SHA512 ff8885a83761acb80e6089af3c85b29b5dcdd5c9dca0b1e5a7c8c71d7298c6d67d3aa772ab80eeae4f3bb2b0a57a90aa892f367e9a215831c2e04a7ac751f649
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.62.4.ebuild b/net-libs/glib-networking/glib-networking-2.62.4.ebuild
index 3c7092bef4e7..53f8b9c7d146 100644
--- a/net-libs/glib-networking/glib-networking-2.62.4.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.62.4.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.60.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest
index 76da146f53d5..54fb2ff634eb 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 1987 BLAKE2B ef5d1439b6eea7e13be646c11619cbb4f4621922a9bb2632ba19cde05967cda1feee84e4cada1b629e1e2063369a78a88b83c9477c49637475351f6a0fd996cb SHA512 000042fb56fcad9b98bcbc64a2002b27edb393cacef0b53b5ffb23a7ced37060afdf3702f76b5f165ba1de314119dc753909468c28c2b925f42812de46adba14
+EBUILD gnet-2.0.8-r2.ebuild 1988 BLAKE2B bc079a068edcd2cd4bfd8d84470c104f9f94d7d6658bfbda40fbb9c25f8a82678dbedb381067d9ddb38d081ff0e068a2ed4caed8ed743211a711714595a7c938 SHA512 9dd5e6756c93f8ca42530a919b9ac63dd6f6d3d30430ffe8c26817275818be3eba43e340193c1774f82d37fdf87d37dbc4cada58b16ada23560cf6bcc9526a77
 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 f1c6822d9696..4ed80b5b4ed5 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/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index f949d162ba5b..b50d863e524f 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 1231 BLAKE2B 08c3d2943970504a0756df0b169dc006d2b7a908c871c7a02e6c867e985aaef460d92570f2599ba59117be3e929ec6f077f64a32afdb46bdb0b53a5d7078da06 SHA512 8485718fe4042c0431323c854af5bd0d6f70254a0b4703db7a5b404fb602413d1dcb52e81b26933a5aa89dadc10286ca5d78477506b8cb5dd3b5440a818ae678
+EBUILD libasyncns-0.8-r4.ebuild 1232 BLAKE2B 84d54abfa07f8d58d534aa617d1ce9cc10a2b5a1a614b5b36391de5ccbea68a55ec10605bdffe01e7bcec180591f5b2710eb4bd0aba9ad66dc4e7386d0c34c64 SHA512 1c7801714c1ff1e25379fbd3cae2c66ffa7a4959b06921f26db48ff380b536f3b65c28d17fa781bd7965ebf9593207817715f4a17db22673e1473b405cf39f28
 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 a3d878453d3a..a09e4fae9e19 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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc debug"
 
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 65f391f2347f..86d259933bcc 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -9,5 +9,5 @@ DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd1
 EBUILD libbitcoinconsensus-0.16.3.ebuild 2339 BLAKE2B 297cd6c0adafbb99a5b3da6f8a34171fc32b72de86800a4c0f1401906d25e62db6cf7d9f2446dfe2db7d18e7c776fa5fe738d95cc55f21ef1a12124e869dba4d SHA512 a412a06ed2725a8b86adb5b9c245c3b041a2e3fc38c8a4104c8f808aa7877c0343a9159efdb5f4021f13ecd6a923480332fc7150b7acd6b595353d40deb21b59
 EBUILD libbitcoinconsensus-0.19.1.ebuild 2388 BLAKE2B 58146351171676bddb3744b2cc1dda21d552a0302e8007dc8f828fe1ac89430d4eed2189c8d945acb5f8f85ff080da1e08af1b8798532221d46b9380473950ac SHA512 54804c8e95c92b3b057a817d681a24211196f2f2b18eafa8defe159aa41ca71140a430edcd4c400fccb0d6656b1661ca9c7fafa6169aaa9c4664f50d2aba3b6b
 EBUILD libbitcoinconsensus-0.20.0.ebuild 2431 BLAKE2B caa4cc6dd6fb317b2710f59076e7da0a72617a08aa7b0154372a169447e9f87e0e02dba6d610047a124e1d266fc51eac04baf09dbb927aa39f56d3dedc5229a8 SHA512 317c2502ab76b070e4afb9f4708c3da46f89cfd4b2a7e1b3de5e51d18127bae34b53693596d7f7e9642d22e5d5524d43efe37d126b0b2043273970e602f6541c
-EBUILD libbitcoinconsensus-0.20.1.ebuild 2340 BLAKE2B 8d05a7a1fb621f3b7085054285dbaad5b5d4209bd3294f1dc2da66706d29e8f14fd4d203b3364d03137e8c8866cecb98283f8173c7bf9e788533fe8807a79490 SHA512 caa37420515e044147769cb4005ef45c1b7f4b5a164cde8a30b6e2f0fa15d8007cc5cc3da0b398d16a9817a078f81cc819a56d769c707f0e4eb3400bf8ffbd29
+EBUILD libbitcoinconsensus-0.20.1.ebuild 2339 BLAKE2B 8b3601529c076fa0814f15cc3f92a23a941177329a8b851b041d02ff266daf818659d051f2fee58163ab87eeba576f3910ebaa8726e3b2db818975889abf8f51 SHA512 18d3e7d3813f7e8f78db60125f41f77f6f5b41f124ce78d9ab6bce3c6d9f660e5d472e8636e302fbb6a83a014b0b88e7bff45b026daa0fbc9757b9501b6f64f9
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
index a7db9996ea9b..357840529f50 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm knots"
 
 DEPEND="
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index d2199ed61db7..c6438c3c9a98 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,7 +1,7 @@
 DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
 DIST libdom-0.4.0-src.tar.gz 871499 BLAKE2B e0ab1a1cf14b532eec1bd68c3ee2557a720a984232ede2f9b0e1d4c68299cc8b39b3d83fa1ff77233d07b8148188ec3012dca64787cfe476b4eb6990f1c71629 SHA512 4d3acb6520619c6c28f20c9fef72b19a879070d0e65d896212c557ada44d35c1fcae4712b901db720ddeb3b1b90832005d63075dcafaddb5f4ba2088fa7a9eef
 DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22
-EBUILD libdom-0.3.3-r2.ebuild 1153 BLAKE2B 338308141873ed746da80039ef2d660440d5dd659b81ff3a749ad2332ec97500127d010e2c08dbb17518b08a2e87c967db3b9787185c761c5f7c63622168b339 SHA512 95fc72e00db9a7080847b3d5d9e56010756886c23ce4c0ece6dbeb33a35a94d261f3997913fb2ea9a4160ca6b8ad4070e2026baf4cbfdf1dc77a5e2d92bf31f9
-EBUILD libdom-0.4.0-r1.ebuild 1135 BLAKE2B d17f7e0a23a14782e2bd976b05b986ec1026461e9da8ab2130f186894daae94af3bada800ecbef521b5214a831348257681c41ef3f2e8626bfe369f2a089d086 SHA512 0a997f0b3dc5aa1e0880f9228be24db7fc502d51d2f7e9d375001e5c1e4c6eaa416f8694e11f59947bf95100b023dea8db77d07968b67ba25aad2e301cc8ef10
-EBUILD libdom-0.4.1-r1.ebuild 1135 BLAKE2B d17f7e0a23a14782e2bd976b05b986ec1026461e9da8ab2130f186894daae94af3bada800ecbef521b5214a831348257681c41ef3f2e8626bfe369f2a089d086 SHA512 0a997f0b3dc5aa1e0880f9228be24db7fc502d51d2f7e9d375001e5c1e4c6eaa416f8694e11f59947bf95100b023dea8db77d07968b67ba25aad2e301cc8ef10
+EBUILD libdom-0.3.3-r2.ebuild 1142 BLAKE2B 9159d3b56556d47b31ca06bc99af41478023eb1ac4d7da3f06889b1f90ff2261d798229ec87b7e1c8f92137b7a149319e6e72dbe84de4dac9de17b2448619ffc SHA512 eb2a10b58642fd745549b4c8ddc3bad46fcd578b97cfcb91bd800d59884be60b97396b90c0146e3261140ebfaf9eb57b0a904b9b28584bc3dc75985228641925
+EBUILD libdom-0.4.0-r1.ebuild 1124 BLAKE2B c3901e4d0444db08ee515a1270558f4153ae0479691a374c71a9a873127e8ea23ce43c16af6449dc43aa3e9a79dbd2859c30b26ec1149015d8c1af9f43334bf8 SHA512 c61e6c25c8afa07412148372dc8d36cf7942c3bd0f413abc1c6aed226bdfc9e8ea61694dd99c8031fa85c69d9750d70878954d9ab2ce4f6774c7ac625ac8bafb
+EBUILD libdom-0.4.1-r1.ebuild 1124 BLAKE2B c3901e4d0444db08ee515a1270558f4153ae0479691a374c71a9a873127e8ea23ce43c16af6449dc43aa3e9a79dbd2859c30b26ec1149015d8c1af9f43334bf8 SHA512 c61e6c25c8afa07412148372dc8d36cf7942c3bd0f413abc1c6aed226bdfc9e8ea61694dd99c8031fa85c69d9750d70878954d9ab2ce4f6774c7ac625ac8bafb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libdom/libdom-0.3.3-r2.ebuild b/net-libs/libdom/libdom-0.3.3-r2.ebuild
index b5e782a5b834..7198d7ecdb69 100644
--- a/net-libs/libdom/libdom-0.3.3-r2.ebuild
+++ b/net-libs/libdom/libdom-0.3.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="expat test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libdom/libdom-0.4.0-r1.ebuild b/net-libs/libdom/libdom-0.4.0-r1.ebuild
index d5902a58630c..19c4937b1fd3 100644
--- a/net-libs/libdom/libdom-0.4.0-r1.ebuild
+++ b/net-libs/libdom/libdom-0.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="expat test xml"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libdom/libdom-0.4.1-r1.ebuild b/net-libs/libdom/libdom-0.4.1-r1.ebuild
index d5902a58630c..19c4937b1fd3 100644
--- a/net-libs/libdom/libdom-0.4.1-r1.ebuild
+++ b/net-libs/libdom/libdom-0.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="expat test xml"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libecap/Manifest b/net-libs/libecap/Manifest
index c605361377d7..0c14070ef52f 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 620 BLAKE2B 2d0bea056b2b5e0674af8b0cffba6e00e70f46bef578e56484683af9b15e56be1dbe3f00ddae86a71fa66d5d288a4c858d53b126407c535886120ce30e051636 SHA512 5daed092628ba4c634f0cdc9432e2a828996e904e0aee873b677b4594f8b17248c6f5e5e558f5e5bce593587c951b5004de159f1045f2dbef5f46640a2753d29
+EBUILD libecap-1.0.0.ebuild 621 BLAKE2B d980d65e98ca2d69f0edebaac58e0eabf0cb92919bb29d4aff22abcf76b1d9ef9b9fb9db0803af8df7025d02251e2eddb5b4882fad0dc5ae5f6268b60144b1f0 SHA512 c53bf5b018f0f8525b194a6e99f41297a2ed9e987172ce5be3437b064e89668638027505692a763e3e52b4426ae018e78275ad0f9eeb0124ef377e7087fc801e
 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 1703ada24b90..9b5ee739941d 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 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~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 d80d092198a7..64be0d1308d4 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,5 +1,5 @@
 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 1045 BLAKE2B 3d7115c549a9303bec593f21af7c681c8191d9f52da09c5859012393e8f8fa9ae414b7eb24902afd8500ba6ef8ff4703e7ef181b9a54ecaca856d80ca836e881 SHA512 4753d7258f1c11f1bef1ff87437a37bbf2037180a55f6bac502eb2e5e456c6f0523417e0793b7610da94fdd397e482e768aa73a3de2af059b1986808611d289a
+EBUILD libesmtp-1.0.6-r3.ebuild 1046 BLAKE2B b3a74f06c83701a0eb87b8e67cd223d63bc7da2f38184ef4353ee0dac34a3d6350a4bdbe5f8550ea2ff8ce32aed196d60286915c72f8e14fd7f6ef3527af6791 SHA512 c7729bcf660ead620523714dcfd6afa4b46c23773665cd47fac2794fbe22704afd9e142611613b4e6ca07cb869b244e963c2704eac46d37f025d107eeee8c214
 EBUILD libesmtp-9999.ebuild 1013 BLAKE2B b1026503f0cef6187d7205ce432d3012a93db30ac00db42a6d5596169037a716f76beaea9120bb7012dc034ad1eefda565f9b37b5260799c7e32cc09bd035c63 SHA512 25913d9e0a030d29e12e897212966556d8a73d4de17d6a8ced8a8f61be14f4df9155afc4e318a391521b2ece2186cc2ff20ef5a656862358c880052bcec9d171
 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 ee0e082b3557..5fe175554e46 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 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="debug libressl ntlm ssl static-libs threads"
 
 RDEPEND="
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index ff4dff03e3f6..1e9be9944bed 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -3,5 +3,5 @@ AUX libetpan-1.9.4-CVE-2020-15953.patch 2880 BLAKE2B a31fcc50b16d6644ce091aaf7f3
 AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
-EBUILD libetpan-1.9.4-r1.ebuild 2248 BLAKE2B c740188ec44619a153def6f10c0391d8a763d038fe2bf58dae2131fcb0b6d6768829afa26299bf3e12aafbd8533ee19c1805df2add1503985510683fbcc7e40e SHA512 132aa5c9ea5b0961b1b803cb8d843f56aa49979832fcfd287a63bc48de6d3965d8365431ea1128b40f3db85087919ed4a8c24fa6f4655c98a21c32dad18d79c9
+EBUILD libetpan-1.9.4-r1.ebuild 2249 BLAKE2B 145c2f8a491423f9c2ae39b2b3b994c525e63847c19342c81ceb4a34d77eb69bd332a4d5663b05550da3e6c5459e4df88b11a785cfd3b3cb8c7ec6733ade989e SHA512 3d82cddef365aac7910dc73bd934a275ba62d0514ede70849442b84b7697da8f8ebedf219dad963889ad3e3ab8be9f599f1df02a0c0db1c18716ace92f60f8be
 MISC metadata.xml 828 BLAKE2B c33cbf260d3d2f9529101c441cf49fcce001deec2b23c22a63715ff2ecc0e105c46a37e0aaf9641449d88e57b148d5fbca534a3b81475ffe795aeb07f5c1441f SHA512 5e13ad73cf38a8e4690506fc56f3482d72675622d3882c4cae335c5146c6cd9a942eca23834d1a010d3edb7deca8325d9f4ff576b59a3879b47966489fd28a65
diff --git a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
index bea0cf416ce8..67b14af07214 100644
--- a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~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/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index e7fd432d60ac..0cc54f41045d 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 894 BLAKE2B d7b3ffdf2e730ba31ce2546b644a6c3f03bd5b4e1b98b910637aee7675ad52cc4542796919949d7f7a3a580a353103ce36b717fcb7e48979294d25f551e534c7 SHA512 7a19678ef903a98253537807e011900944aaf844a4cf0e115fe7a0987a9aff995c102b61bb97a1097157286fe47be6a6090fa708479183a705ab2428253071be
+EBUILD libgssglue-0.4-r1.ebuild 895 BLAKE2B 8af761c2e9a8334c01da8963d673786e3780c72f9dcaa5abcad7a9507e94328e77cf83873ed5e3df062991dac35d1b6372c10297f32eca4f84a75c77e4e05da7 SHA512 b2a59cab55d7078959f57c6dc94fa52bd4c264ec36c3b52f652b4fce85adb34f2cbbf470bc30ee067a9e8bc64b3e9c9855601156752b88e5bf332f8cf32db9bc
 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 ff1cea99dcb6..c83a1554679b 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="!app-crypt/libgssapi"
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index fc68ddacafdc..a97aca911bbc 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,7 +1,7 @@
 AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047dada87e6721e50309c0d81ee411dadd3840bce2c72dc019aa1c7804801eafa387aead11b820b203de901f1dd4253e SHA512 ecd28b596cbdd01029b299d0f378e85f854205abd7bfb592061576dde35195dcc84b37f7aafe5127f76fb22b633f9f4ba13ef7158c58a021067cb7502effbc14
 DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
 DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1
-EBUILD libhubbub-0.3.6-r2.ebuild 1222 BLAKE2B 44cab1f6dd0d4f8f0dd2146aa39556ce95237ed89059616e7f5e7593941df515daed7f4e0f0f9b9ca9cd32b85cc547b2bd47108a10f90e438a12ca069a5c415e SHA512 2d8fb1530149475142b1f256a4b191b7407609cd107a0aa19c33cf06e7d086e84d17c1d569ad8d4b9dd047eb237d2254c906dbbde62cb44dbf44e0f721d9ee0e
-EBUILD libhubbub-0.3.6.ebuild 1182 BLAKE2B fec4a8d8b4eebb8f2c9445f481b6a0f636facb5ebc36ec5f2f7224edcccc567d5632440eac5291061293102f01fe49c2223bbd290c6023e607ffdcd1d61bd705 SHA512 bbb83263e9f43c52cd6d7036be91aa9440b781ac9569c9718e8369eb19e7820cc76dc540acf217be621ea118b8f9e39c95644feae832429a2ea1e6bbe82f7d70
-EBUILD libhubbub-0.3.7.ebuild 1222 BLAKE2B 44cab1f6dd0d4f8f0dd2146aa39556ce95237ed89059616e7f5e7593941df515daed7f4e0f0f9b9ca9cd32b85cc547b2bd47108a10f90e438a12ca069a5c415e SHA512 2d8fb1530149475142b1f256a4b191b7407609cd107a0aa19c33cf06e7d086e84d17c1d569ad8d4b9dd047eb237d2254c906dbbde62cb44dbf44e0f721d9ee0e
+EBUILD libhubbub-0.3.6-r2.ebuild 1211 BLAKE2B b91a089735f061c872faf590e871073a2f6f8f2f25d9e1f12a33b61028137f32a6061b57258de0aa1927f644fa30e248edc1dcadaafc2aac52e51c18bca9be37 SHA512 3c810114105825733ae3f7a7bcc653ab42ec47d76988c431fd2710e838514ccdf96c061d5c7d976fc049fe223e229b244542bee70ce6b0708613397332fccf7b
+EBUILD libhubbub-0.3.6.ebuild 1171 BLAKE2B 4a56c42796cd81760dfe6e8086ba2a1f565af9902a52eca1be7456fde5e720da53c70c4e454e724bba285deedc25d58237c3824b78c1bc44ca6e93fef433cab1 SHA512 07d33b4f90767e16a5342a9921d1f14cc23f903f36d72891a6ee2c6f8ceb5932f7f5e9ef2da02ddf78dc6d56c5a2857509bb8e95b108a76542928d87ba57e047
+EBUILD libhubbub-0.3.7.ebuild 1211 BLAKE2B b91a089735f061c872faf590e871073a2f6f8f2f25d9e1f12a33b61028137f32a6061b57258de0aa1927f644fa30e248edc1dcadaafc2aac52e51c18bca9be37 SHA512 3c810114105825733ae3f7a7bcc653ab42ec47d76988c431fd2710e838514ccdf96c061d5c7d976fc049fe223e229b244542bee70ce6b0708613397332fccf7b
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild b/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
index 37c534bcee47..7beafd98de26 100644
--- a/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libhubbub/libhubbub-0.3.6.ebuild b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
index 65061d064f25..d11754cb384d 100644
--- a/net-libs/libhubbub/libhubbub-0.3.6.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86 ~m68k-mint"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
index 37c534bcee47..7beafd98de26 100644
--- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 7b546ee5bf4e..6572f0eb600d 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,10 +1,6 @@
-DIST libisds-0.10.6.tar.xz 724120 BLAKE2B b6d3f42d4ff84c377c9425dfd84a14ae97ccc39ea4bb96169e3a8de21b99dd6e5ceda39a6d4a574ccb418561dbec2507f72afc8b6f185c34ff92202abcc49441 SHA512 602c4e7f047dedff131cda941d02ea41fca7b8ea80eb668ab8f7ab2626a013ddc1a86f1e2c7b5759adf266c7c22c515284e6d4fdd9fd594ad310bed1be6016f4
-DIST libisds-0.10.7.tar.xz 724840 BLAKE2B 73d93b518271cbd08787a38da454ceb8fa6c2d421b0291c61cded8f1438d44c5607d1e90d75714c3d76e0886ac723e38dc2a41d60284a58d567abdcba76becd4 SHA512 ba2ef11c2983cb3bc8f779e7af3fb8319d38a786911e68c6b53c25aff339b4630bdf78886825ea3da671e87f689cab376cd9e41398f3f74608af932abe7a0023
 DIST libisds-0.10.8.tar.xz 726040 BLAKE2B e3509202cb95e6e2bd0a6e7592c3d1d649ecb47806823265e5e12fa3a79a5daff9d249b2f0642d13aaebf1c64243690d06c9387fcb3a166f4b989c19f337c059 SHA512 648ba30c3156ece329d663d0d6e649319d8d104de97ca1946d94c24205c44189be08cb0c573df1f5a889fba487f2d088ac472c3f922a1920e172dda0c592b41e
-DIST libisds-0.11.tar.xz 741952 BLAKE2B 553613b7f1d8f5b3af1ecff2734584234f5d461c289c08acaf4353b724102ac87da5e60c2b5ffc2895a6441af2a51e0a381ab9df4494d7543edf356b989df891 SHA512 d30708cc6df92f0da9c4fac9acea3c1f3d97ae5ed1f17967e41c4887fe90f5b7375508df987b4b98cc5653a099a78c7a678f8fcb6897de863ff2f4538413f7dd
-EBUILD libisds-0.10.6.ebuild 1184 BLAKE2B 719e6c404063287a16186c52442ecbd0c2b12dfa915403e4dfd75fe8bab001796b5342dbe133de04836f3ec24b7e6d6070e3c67a2a8587130ae2ea050fb9ba92 SHA512 e8a4283e30245a6a6849a097c82ec32152b9894c11f5ce3287ec194b644f7d292c1e97b846a9461d364a3770ac21ea667970a15c86273cbd1c199de40a6b5a17
-EBUILD libisds-0.10.7.ebuild 1184 BLAKE2B 719e6c404063287a16186c52442ecbd0c2b12dfa915403e4dfd75fe8bab001796b5342dbe133de04836f3ec24b7e6d6070e3c67a2a8587130ae2ea050fb9ba92 SHA512 e8a4283e30245a6a6849a097c82ec32152b9894c11f5ce3287ec194b644f7d292c1e97b846a9461d364a3770ac21ea667970a15c86273cbd1c199de40a6b5a17
+DIST libisds-0.11.1.tar.xz 741992 BLAKE2B e1895450b1148c63a365a569fcdfa0d3cf3f2cdd011da6dbe92ea876aa1a9082470f3c7efc5757766df7e870559dd4ba62b59973e22d47401ef575e0fd412ec1 SHA512 8baf126ebf49c5eae6aa7b8f872ad90882a9a5088c8a33ffb415983eaf1ffc1df489f44ae6ba14a69a94bc4f79f455c7937276885afaa29e61c5c67408f7080a
 EBUILD libisds-0.10.8.ebuild 1183 BLAKE2B 609e17accfe1f3b0c149890cc81a38f5d03f9d63e826e64b8e0dd48842d17c1292acc27ba58f9f7a1158db292b2a27ee9f0e6165d2a5e0d254d9f9470d4903bb SHA512 4111123c6388132aa065df5c9c1dd4d73f44223086577ef0a3c9afaedf22052ef54f78b762b45e0b950aa41b96e9ee80cb2fc073698661b14e881fad035ee9fd
-EBUILD libisds-0.11.ebuild 1274 BLAKE2B eccde55c98bf443f36ba823fb8d3a723960bcd39dd6968af1b964a16e94cfe128f48a6926d15182cb1b22f19c32d1a32c5dd533ff5f438b66a54e95ee15a0b90 SHA512 5c2b1e00de587bee9dfdd3159c421ffc5be6b077f197520f757576a35d1e2b6b1ef5f2f97d87d0e48edc399f0686bb9536131569526c3f2e117e611dc932c7ca
-EBUILD libisds-9999.ebuild 1232 BLAKE2B b36387416664cf5273f17d6afcaa86157af7a381b9aad4ddff889fe79fc372d63f6db66e4b34d15070b274ac5b091529c57a15e21c60654b373c28cc32918285 SHA512 017031a837d18d026e48a2a87908a39992e3d134ab65eca2570afbc269f1287064ad672e5d0f77f651a190c56a6daad3dc94f2fb323978d963b7a751b709cb4b
+EBUILD libisds-0.11.1.ebuild 1127 BLAKE2B 7cee56d6661f5af830a1b1ab866fd0e422e01f5a51745a914727d0296fa8ee45fb6d666c2feb649a84e7e21e48891eb5e34e9fbae42ac040deb7c4ba411dcf34 SHA512 1a90290df87abcaf721e95fc4b8ba47b2db57e25f28c48f887ce2f74b6853e785d6d40bad093dedd9f003b26c246d83c171c49753048715f478577cf27199ddc
+EBUILD libisds-9999.ebuild 1154 BLAKE2B 0b944facaec152943b9cac24ffb6f9e6f46b2be459e16d38b327d3a76f566420ff759fb318406546a46af5a3f0e53e25f14314945d37bd33fbcffff188b70918 SHA512 33d0fd8dd98c0dca1e33a748ba9a8780913360cb49decc9b872ae143d6078f9fb6d4166221f9bc3478821ffd703070c40d71e3ffe3e8cba60b374215e10fc9ee
 MISC metadata.xml 728 BLAKE2B 624c69a771c5b48821a5f061f812c7255331bf6892ae51b9ac7f78744d6a8fa75084428d0607f7e7f562a26409ae31b6347b9bc8e15927f76badf78748255126 SHA512 e474e018a9161694202d372a8e40934a77662ff8fa8a50120ab69d4ff3db7098ef303b5d7c4db071a4ad12ff01f43db0a96c0d9474a1ebf87c294449a8331a0e
diff --git a/net-libs/libisds/libisds-0.10.6.ebuild b/net-libs/libisds/libisds-0.10.6.ebuild
deleted file mode 100644
index 9b1974819ffb..000000000000
--- a/net-libs/libisds/libisds-0.10.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Client library for accessing ISDS Soap services"
-HOMEPAGE="http://xpisar.wz.cz/libisds/"
-SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-KEYWORDS="~amd64 ~mips ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="+curl debug nls openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/libxml2
-	curl? ( net-misc/curl[ssl] )
-	openssl? ( dev-libs/openssl:= )
-	!openssl? (
-		app-crypt/gpgme
-		dev-libs/libgcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=net-libs/gnutls-2.12.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!openssl? ( >=app-crypt/gnupg-2 )
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-fatalwarnings
-		$(use_with curl libcurl)
-		$(use_enable curl curlreauthorizationbug)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable openssl openssl-backend)
-		$(use_enable static-libs static)
-		$(use_enable test)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/libisds/libisds-0.10.7.ebuild b/net-libs/libisds/libisds-0.10.7.ebuild
deleted file mode 100644
index 9b1974819ffb..000000000000
--- a/net-libs/libisds/libisds-0.10.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Client library for accessing ISDS Soap services"
-HOMEPAGE="http://xpisar.wz.cz/libisds/"
-SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-KEYWORDS="~amd64 ~mips ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="+curl debug nls openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/libxml2
-	curl? ( net-misc/curl[ssl] )
-	openssl? ( dev-libs/openssl:= )
-	!openssl? (
-		app-crypt/gpgme
-		dev-libs/libgcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=net-libs/gnutls-2.12.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!openssl? ( >=app-crypt/gnupg-2 )
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-fatalwarnings
-		$(use_with curl libcurl)
-		$(use_enable curl curlreauthorizationbug)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable openssl openssl-backend)
-		$(use_enable static-libs static)
-		$(use_enable test)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/libisds/libisds-0.11.ebuild b/net-libs/libisds/libisds-0.11.1.ebuild
index 959693ab47c5..d9a4859a617a 100644
--- a/net-libs/libisds/libisds-0.11.ebuild
+++ b/net-libs/libisds/libisds-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,10 +10,10 @@ KEYWORDS="~amd64 ~mips ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="+curl debug doc nls openssl static-libs test"
+IUSE="+curl debug doc nls openssl test"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/expat
 	dev-libs/libxml2
 	curl? ( net-misc/curl[ssl] )
@@ -23,31 +23,26 @@ COMMON_DEPEND="
 	)
 	openssl? ( dev-libs/openssl:= )
 	!openssl? (
+		app-crypt/gnupg
 		app-crypt/gpgme
 		dev-libs/libgcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
+	)"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls )"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=net-libs/gnutls-2.12.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!openssl? ( >=app-crypt/gnupg-2 )
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
+	nls? ( sys-devel/gettext )"
 
 src_configure() {
 	local myeconfargs=(
 		--disable-fatalwarnings
+		--disable-static
 		$(use_with curl libcurl)
 		$(use_enable curl curlreauthorizationbug)
 		$(use_enable doc)
 		$(use_enable debug)
 		$(use_enable nls)
 		$(use_enable openssl openssl-backend)
-		$(use_enable static-libs static)
 		$(use_enable test)
 	)
 	econf "${myeconfargs[@]}"
@@ -56,5 +51,5 @@ src_configure() {
 src_install() {
 	default
 
-	find "${ED}/" \( -name "*.a" -o -name "*.la" \) -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libisds/libisds-9999.ebuild b/net-libs/libisds/libisds-9999.ebuild
index 29b8477bdd67..eb24a312d360 100644
--- a/net-libs/libisds/libisds-9999.ebuild
+++ b/net-libs/libisds/libisds-9999.ebuild
@@ -1,54 +1,53 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-[[ ${PV} = 9999* ]] && inherit git-r3 autotools
+EAPI=7
 
+inherit autotools git-r3
 DESCRIPTION="Client library for accessing ISDS Soap services"
 HOMEPAGE="http://xpisar.wz.cz/libisds/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
-else
-	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~mips ~x86"
-fi
+EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="+curl debug nls static-libs test"
+IUSE="+curl debug doc nls openssl test"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
-	app-crypt/gpgme
+RDEPEND="
 	dev-libs/expat
-	dev-libs/libgcrypt:0=
 	dev-libs/libxml2
 	curl? ( net-misc/curl[ssl] )
-"
-DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+	openssl? ( dev-libs/openssl:= )
+	!openssl? (
+		app-crypt/gnupg
+		app-crypt/gpgme
+		dev-libs/libgcrypt:=
+	)"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls )"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-crypt/gnupg-2
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
+	nls? ( sys-devel/gettext )"
 
 src_prepare() {
 	default
-	[[ ${PV} = 9999* ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
 		--disable-fatalwarnings
+		--disable-static
 		$(use_with curl libcurl)
 		$(use_enable curl curlreauthorizationbug)
+		$(use_enable doc)
 		$(use_enable debug)
 		$(use_enable nls)
-		$(use_enable static-libs static)
+		$(use_enable openssl openssl-backend)
 		$(use_enable test)
 	)
 	econf "${myeconfargs[@]}"
@@ -57,5 +56,5 @@ src_configure() {
 src_install() {
 	default
 
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index e9f7b674e525..f07076f13d79 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -6,6 +6,6 @@ DIST libmicrohttpd-0.9.71.tar.gz 1894695 BLAKE2B 46bee477972a1bf791f9edaa7451790
 EBUILD libmicrohttpd-0.9.65.ebuild 1292 BLAKE2B d0be1dcbb538eda2814e853c153df3121e5c9ccd64e5f422754a636c0078e4a701b08ccbc69103c1780b76dd8839b20bbda79125e4029e30594ad4cda8166362 SHA512 fde791d2ac45759eb1f0170607ee84dcddb26230b3721f54a95c3adca12c65a0361446d95fd7e73e33479eefef6a9b4082e3b1041034f8db166aaa6c54c7faaf
 EBUILD libmicrohttpd-0.9.68.ebuild 1279 BLAKE2B 03e4684290e50bf89b3270c7916bdbc72da590b747aac3e7cf6e72f98331c2abeffa61de886b3a87dfc49e941f33ab165e77c24e186a1631d21ff0c3b51a77a4 SHA512 82ab3db6aae947b5aca12ce0c4fb5728f77d95db4bf5b04feab81b0ce89cc58840bb1bcd1c7f7459a8a3db9182442f92b777ba232e890ad0f7620cd022dd98c3
 EBUILD libmicrohttpd-0.9.69.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
-EBUILD libmicrohttpd-0.9.70.ebuild 1277 BLAKE2B 3f5f6a39d2e9208f923b58be1f834fd7eb295d3f94c03551a496f7314fd09443c5d3df131c957162e2c222f9e7ffab9cef54bb79a55edbb56b2af53e0602d251 SHA512 9ec04957a5b5cd23b26f2e345e8c9d1982e52ed3eb6a8d307d225f711bf02c471cd3d872814ba47cb18bfd876d2de5ca3f75833806c20f436f8d806a3a85655a
+EBUILD libmicrohttpd-0.9.70.ebuild 1278 BLAKE2B 0a361a0fddf1144fcf3b4f4afe0e3929f08ce313016d0fd1f91d1e9e05d826e92eb27210ee23a897ba58ee9f8c7ee3adf00c23a7e4bde8789cfb8397908ef647 SHA512 37c415ca81a4aa782a4d98fdaa9e0618f547de9779d68119ff9bc7aa3ef3c965d3a67349a9893079d5b6f87523b1a6a8c02bcb3fe777b09671b588fa3544b10f
 EBUILD libmicrohttpd-0.9.71.ebuild 1292 BLAKE2B 605b86e2828210a06c790870876dac23ff79f2b7bb6a721c037c66b75d5beb595b1376966be5a5430736187e42bdcab5ea97cd9ec9b1f00ebd9751d18555ed6d SHA512 0b3e74600e69099dd8955dba261f8b2997d5a12e3dd606640a1627ce7a266ea780d2b586fc0056994a6131da296f3d9acc5bce06c4ca2c5a591ff44934d7d96b
 MISC metadata.xml 458 BLAKE2B 3b4d5cbe9453997287bdd1ce08b3a23422076d27c5a0fa7d18c936a7a81651cfe109f7531386871cba45f756c6f09dbc98c4987c17f8ec7b151421bbb82ac146 SHA512 2e775d144e0469c6c7467674da543bc72966ee6641fcf4072703d990eeb6f4903c6a4c2368d299b96afa77a1328319f88848b9c12df8b889c3265128d49e3ea9
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
index 4268ba30d811..e131da4973db 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.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 257e460eee21..cf6b07add2b8 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 a995a82179da7bc3cbd24f39a7afbea5528d3e00d83288b1c05f2f887dac267f2f39a10ea545ba9de065121e9edb600dc7d496c2a50b2f9394e2dac7a8fdf7cf SHA512 7c60a0ceaad682fa1d047752ae2d10181ec540885a6874d22e7b7a3be482715e3c34b262b57957054c4eefc10d34c69f31c7dc3894f4aaf3ce7ef5d0543d56ee
-EBUILD libmnl-1.0.4.ebuild 781 BLAKE2B 1355365da2195e799a0a2c42e8795c1ffad286b2ffb25f4fcedc89ef6306bba6b4325a14208c3ea3e8b287b1e77b9afdda834c613276edc10ab4143b2ed387c8 SHA512 15824488dd41d504aa6eaa77b0c353c06e1ab42e6a66ddd7885bebddf37f9140a047a7c06e554f25fdaecfb2a8bef30b758ba408842b4b78811612eb5baaa3f6
+EBUILD libmnl-1.0.3-r1.ebuild 769 BLAKE2B 31624c9884c062aaafc44aea2cb7aec57fc5b3d546a527cfe1ef17566d13044642f847f8b99f14962e9cb7da4ae690e873f2e6c7c9aaaba584f57ac1bb7a06dc SHA512 d1cdd40e61d6cccb1386ea5232f8a5567d57c2d082b6f38649cdae3ee206ae8a83a002691b5f8622c2f4d7644500e2b999ea44f5ac30d0144ffd707f2e411cbe
+EBUILD libmnl-1.0.4.ebuild 782 BLAKE2B 68b0ea681670a21e5d342f7f65b519d1f0932493d854774c6f5d9da8bb3deef5d3e7d2dc461af641662667c4b267aee35e60e557c7eaf8eff9b85e9224309588 SHA512 4d544f20e5d37d4fb8ac55c91d01c32403c29aba5bfb03b6f32e72c8864217be2006bdf97e3e467630b5660eea6652996331adfbcd0a9e8dbf33f46f6d5e20cd
 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 85cfa4db0e48..4bf6ffdf05b4 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 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index 21669afa725a..cf35872a9050 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 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 35de4dddad5c..1ad46dca95d6 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -6,7 +6,7 @@ AUX libnet-1.0.2a-slot.patch 6244 BLAKE2B 61f4131eca23d9dc20922058e0382c38ebba48
 AUX libnet-1.0.2a-test.patch 1172 BLAKE2B 105a23a904da361216f370b005016d205ea971855a064d45b1282faabdb11878cbc2568ffe311074eb437677e03d604497727c58273711826af125a1cc3f11a6 SHA512 3ab6e667798362d605c2a1a5b8c172c80a99d2569d4418cb47b7bb8f69ea424e718b2947ea22b43d882c556f65470bec04451d9356070b8a4fe10f6505122bf7
 DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
-EBUILD libnet-1.0.2a-r7.ebuild 1353 BLAKE2B ffd2ad5abffaa27c1dc993d6b9dc0bff129eba5920d02a2168cc03a8742e87570e9e4c7e4f713db0773450aa3bdbba5854860832c60ab09ff23818c63a6f392a SHA512 8e2f33d3ec864118a6b00bb7f2a42a6fbd5220224289b3862191d76166b1025364d25e2f90be46531355eb10a8aca7613867c0c0ef1c035f85acd5a36502d6c4
+EBUILD libnet-1.0.2a-r7.ebuild 1354 BLAKE2B e9919ec73e3e5c225b288e4ff797a22bfd6aa2ab08e0a85241f2704324f0f2b3df05cb90ca5b5e6656b9ed10b670ed79f8a893249aa0a0f6472cdb83fcdae5b8 SHA512 001d1489152608f147c5055e2826e4634925dd37d5d64be0b57148bc794944624f2bd6deb177647555440f0b139a3ad3040cb64118e694082d973c4020b92dc1
 EBUILD libnet-1.2.9999.ebuild 682 BLAKE2B f4de78e01f11b24255ab6713c484ab9954ed6cd4be54d7da340c780ee5813291157ae2fe881141faeea2d0b2df67af71ab06a11949c57d8db4a5f3f28533cd30 SHA512 4d899c428e510ad9ed76eb0b573fcac4903f3d8782398890984c0eb85186bc0e84326c35c04ec04dfc78891f8f48d7a3b47c19d4715d695edb7facc573859d73
-EBUILD libnet-1.2.ebuild 734 BLAKE2B 50f4dc76e4dd2cf495e1b0638024e6c62d58b6eb8ee103dfe3051e42507913b30f66c336d4901a553c9f99463eda9032c4c41d0e69ce24bbabecaab43e45adf8 SHA512 878ddc28ec514784e474a1bd6a5d7e79212c06dc6fc641d3d8aba5cd2064b1f4ebcdabc80f19b1cd94f3300c1fe348ffcc15af516ad58aa442521787be215974
+EBUILD libnet-1.2.ebuild 735 BLAKE2B c6814509bb4241c713e4757ac1187db2da3627cef1ace195849a22e11bcce55487a795d650377ea12036601057f002a4c2c02e47daa26cd80a55b1d5271845ff SHA512 88cbcfbd8aa400eb469f8cb87ffdd683d3b74bfb3718c71baa452b46af9c4f5591074b0a0b488b5907d3cd09af1d546357a6ea9cbd579f722ac0374b36ffa4f3
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/libnet-1.0.2a-r7.ebuild b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
index d3eac2a745c1..dfef828f59d6 100644
--- a/net-libs/libnet/libnet-1.0.2a-r7.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index d7d7a00a98eb..269907687fd8 100644
--- a/net-libs/libnet/libnet-1.2.ebuild
+++ b/net-libs/libnet/libnet-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DOCS=(
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 4ef01914cfd9..4eeca63ebcc0 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -1,7 +1,7 @@
 DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579948b0d28e9ab88d39ebe08e97fe8be0eb3f10f64b36d0f85e9e35408019ab22404b3452e4c6d7b2812ea316031f3e0c4367c23019 SHA512 05b3b63928d46ed114048848c48094a762c6a7acc93fcdbe9473e82cc67851ef1a0d33b68b8fd388271b76b519c4d2ac93fd802043fa9a9da46cda5b262a1fc7
 DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b
 DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 965 BLAKE2B 39bc7b3a97f5c168c0a2cae3d0902574664e3efc336dcc1ffb13907bba694461fa1083591f0db167df8ba2c3989003fc948638ae55da77ef9ec9ba8e073a135b SHA512 2645afdb633fcc5d3d3b7e0204a24bf5eae0dfcf9eae4a145326d1e07468dfed04465dcfb8824b1729ada64cc4f9ecccabcfb3fc67cbadb0574f5579812a7d4d
-EBUILD libnetfilter_conntrack-1.0.7.ebuild 978 BLAKE2B 8412b207cbb247db8298720d4b92e55bc30af494932b3566fb69e0f2e02cdf55559500cc6c3c44a9a545b8916d60e9674eeb0e8a2368a21dbbd1ba6f55155ec4 SHA512 ecb63afe7bdb5e53678472912bd8edb0950b57827ee8544e326128ec7271cce6bee15f876fbca7c3c6e8effe5ab617591887cd9561ac2b722c46eeed4039a54e
+EBUILD libnetfilter_conntrack-1.0.6.ebuild 966 BLAKE2B d569562f6203d2ec131f7082063305e07a0c92807e81ae3641f1a8f61a9bdd0051803cd1b30eaa5a9bfd5f31ff06bc5b68831913c2526469c2393fbc4971f929 SHA512 77a66921f7aba5b1badc9739ff8de3356654be97f2ad1cd9af8313945d55e3de4df4b08830cad5d8110591713414eea340ee2b53567da11933dbccf26bb4605d
+EBUILD libnetfilter_conntrack-1.0.7.ebuild 979 BLAKE2B 74b223ce0740e21fe17db734888fc5fc77f9727cf618e315c8a207ffc7ddd782bf3d6d70d526b0eba92545069466a9d2f44ec175923c8fe20558032d7f9f8f80 SHA512 ebc1ec97a28cc7e8f3729e574a241c74c22ae260c8a9dcea61a0bf2f9a00197aae588931b5c99f354d4321c0b71a1ae222dc939b702d385d7934ce4943e75765
 EBUILD libnetfilter_conntrack-1.0.8.ebuild 981 BLAKE2B 998db28a854065c2084713fbb5263a249f878f77c6da7396ab4cd199fff1afc8e21ee68d5e2d7a4ca2bdc1ecdbe19919e8fa3eefb3b8f944e153e893be0226eb SHA512 2cc5d3cf9a016cc269e824b543c56e707253b2389b2e634d23a19003efb5f16ea1917d5d1e44205e5c459d2f9337723b130153d052701086d29a19477a21874d
 MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
index ae46400e1ebc..88e9f74dcc26 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
index fce41470c42f..73da27792f89 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 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index cc0677cb915c..c6c0a06d9f66 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 695 BLAKE2B c47651008e361686c63bb12defc3c5553c96e345907263a8e45873833ca8c4c32d23aa49a4c1c5c09dcd01574a6308d08ac9379a78a9b1f56fd9af66c24fd44e SHA512 95bf53496263da4e27594863acadaab5fae3d2538be65a23513a1d9b626673de0196ca9448e477a0386c1ddad8aceda730b004f0484e86e2c9c7fc19757d188e
+EBUILD libnetfilter_cthelper-1.0.0.ebuild 696 BLAKE2B 1cfd0e0de588a1df5d40102d5087f3bf6f5da1724fcdaba0ae214d01b59f5db3cb950980b1dd530cb03e81256461a07e0ab2cbca1cf9c129e67f1d05f920fc91 SHA512 3bc0b831094a1e697b2bfdd0e2a73bf56af180f08d8b26f869cfcc35a8378849d9e9d51b516ad85665c0941a43bfe2fe36b092abbd9d969899828b0055f4b358
 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 c86870bcbd28..eeae2bfe3377 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 8813356bf55c..9113390f96bd 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 695 BLAKE2B 8308ac38050a3183e28e419f74510752b4ea475a71186a4a2eee213559cef40b31f5cf45a3ebc6d6b0b4378f6b2e670f813659e3d994dddf0add22719292eae1 SHA512 46d50e4dc41f16f693a180ca177c8f0ca66cf929695432ade69a09b56a0ed3e39dfce553b5e3eb6f92379ac6727e9eb037e1925a18beb583dfba98b02e2a11b6
+EBUILD libnetfilter_cttimeout-1.0.0.ebuild 696 BLAKE2B 90a092baf8a420e25e1990efe907d6784a10fdb55ef8fc829d4ad6aee4e481836e54457b258b15dd4c59d3e06d4be8bf3fee5b78655a8f260832f9cf0869ad0c SHA512 692273ef5e2345fa751382d39e4f9d6e2b58d980fb1ccafc4882ae0e8883fa1af4c017ffb6a9dd91154da0b044eb55730269ac48a64400778261cf4dc4dc164e
 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 5e8392aebcfe..5543760e648b 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 b64521b492f4..c3e70f69cd74 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -1,7 +1,7 @@
 DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
 DIST libnetfilter_queue-1.0.4.tar.bz2 312699 BLAKE2B 29d553c36af551cbaa3b1b4382ad38d6ea7402efafa5ff4ae99c6f05d0ddd15d24b007a4ccdcbc21b8bd9cea28859668a27a6fae4e6534f68dea79d6d0a02789 SHA512 5d81d8e8190a80c9b42bc851a87cc4f749709803b8c9964508013bafb033f1b51b65222a244885f321a2be90517c6a636533ff72b653935a2b8d819560a51187
 DIST libnetfilter_queue-1.0.5.tar.bz2 313856 BLAKE2B 0d7806fd23961f6b80f6ef63faf0fe10307a34495337a7f6dd4f0eb76b5ba8a96292b86285e0740f83414417810e47f47b1400c7d83fb4d8fc6f58954f4bd9df SHA512 732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85
-EBUILD libnetfilter_queue-1.0.3.ebuild 724 BLAKE2B 4ef7a43fa54add5f2b3b664434927a160778721eee0e98949eebe08a6253f8eac08b42e6ebee68122a947fdd023abc0d6de8bf5fa3855f17d8e61a495590f63a SHA512 6604f86cd9bf16b5fbf347219dcb2613e1ad47c83939976abf29703783ca961f6daaa140ed772dcf076f9ceedf735c4ab5fa6ada96018a2807a38aea7570042f
+EBUILD libnetfilter_queue-1.0.3.ebuild 725 BLAKE2B 87fb0edadd41b0e81c38a0802032cb20548c4f6ae985f80b5126b4cb8a4352ffbf6c46d6ac515d153a42add00e06da24f3a7a8e4aea660b64210294ad947ca30 SHA512 c905e45093e9fd4218d497fb2a4e02cf7bf4c53559ed1e169d2825cd6d187a430d7b3b3c2996722f681074cdd988d5dafe93f975a1262b7d5b5cd575c1235f05
 EBUILD libnetfilter_queue-1.0.4.ebuild 895 BLAKE2B 2839c19ee5ebbe3dd18348ed49cd88843fab057bf878a5b860d5374d4bff43133ca94cbbcc9b4892471632716f46bf3484073ba6edd8211ab24ef280a696924c SHA512 b4bf7aca2998a878e8c71fa7f6cd3f8bd45f66735503f4dd523dabe937cd988ed56a6ac2a7ecbcef6b4f9918cc9872810bb2b60986ed464fc78005672176288a
 EBUILD libnetfilter_queue-1.0.5.ebuild 892 BLAKE2B 131ebfb7c570074c333edf31c8f6cb708bf543ed393eb8a8011722a3fadf33079758c5cd90c2f5ef5b3859de7ed534bf5f7c97f106db11aafde6791b19a35140 SHA512 e2ed77b7d7a0fec547b74f1119c00b3f073ac02454a1d06eb9aed142d1411ef89ab2b9ab60f31dd35391dba7cd18187146a8e884db5cadc7a70e1e6e40f3bac4
 MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
index 2d79ab927382..0d40ed627b8d 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.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 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index d097fd6145c1..e937306db3f7 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 1434 BLAKE2B 4db3b2ad7f66e59bbcc26ca2fe6a4537ce86e213d4302828ea872d6ef06c4a1a1b43d9ef868df9bcf2f9d760d3f42b644a386751efa829bd467908b3698fb52f SHA512 facb95e6c98e46028492c3dc30b013838a3b0748b33b8eb062f63272d80c0249269739cb410049629f962fb785e9988664b3273960c77d265cd7d76f1fde91c4
+EBUILD libnfnetlink-1.0.1.ebuild 1435 BLAKE2B 259e0e263a7b4d20cd3a1e7b0f3509b8ce8d23a321d682516073d67b7b796a7630f85a9716599d3a74594498336b00fcc3e9728bc9fe58a0469808ad60fb0d8b SHA512 8ec685455a36fcea0e2600ed6d4afd8d05a37a15ad81ca3684655755cf3e677c465f90bdeb5b582fc99182c64e49bc3c98c4d85c984a60a27bff6a498fa4c4eb
 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 cc2a2bae0666..bc3f07fa53d5 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 PATCHES=( "${DISTDIR}/${PATCH_FN}" )
 
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index e7346973f3b2..878796317dff 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,5 +1,5 @@
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.27.ebuild 1309 BLAKE2B 1749d8d20d0b0e536702ab897c3130b92fef4ff40d83b4f79b14274aaa2575f0585fcf07e8e96bfe80f757a6db024711ac63add7fcc78f4679939f888503c2aa SHA512 2672cf2028428a30de4632a2bd5108fbe031ea55d31f404bae642f448af754ab7c913be691419a8e0b018af26f86ce43cd8d3e27b98c5cb2358fce99190ec294
+EBUILD libnfsidmap-0.27.ebuild 1310 BLAKE2B 3170cdf362491732993df563b5b4a02df6cc18a0e655ef475edd16f01ec8f56b1df2a27bb25b4f420b1d28f65e8a14b0b69bf0e6d2e5a20575cd522180c9a96d SHA512 2500df4ebe811bf79c16334fdaa72465b644debfa2b70432408c100f5ed5039c408e474ea1e133ea07f01a040fa28f2bcffd100220e8b8571ce49dd315f0bd1a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
index 1f5d6cc7faac..b4fd1d02e3fc 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 6e420a4d03d0..1d60d4abfcbe 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -7,9 +7,9 @@ DIST libnftnl-1.1.7.tar.bz2 387829 BLAKE2B e21ca38edbc7c651a061fcd6db80278ba99b4
 DIST libnftnl-1.1.8.tar.bz2 389632 BLAKE2B 5668bc3839abb99b44d2eecfa4fe391d1669b31d5f653f859ef2ae80ed355252bff20bc74773ec68024e0bf9e93c8993765b84e8d562fc2b2b1f7e3f5d3fed91 SHA512 173d8a7b95eb964a9fbe7ffcb46541a6bae976b4d4f2a28fbf9b03bf3e50a29b1ea12faa49926d2d33bc088580a833fc6e15ff59a30bcfe67c91c524f00c778e
 EBUILD libnftnl-1.1.3.ebuild 1193 BLAKE2B de38ffd4dd0740b905ae7736201550806cac8671acca11f8999e1daef009799efdb673d234f9ace51409dd243bd50d4cbe7dac8869538a02441bfded17811916 SHA512 47a7b1b84dde93caf3fa1b2bc098ad62063584b185d96465140a8f661db5021e25e4a2109b91331faa186747991188ffd419768fd8b2139179a1656d229f2e27
 EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
-EBUILD libnftnl-1.1.5.ebuild 1255 BLAKE2B f0a32d76a4cc25ccb33e16c1f9b0544f4b94da741fb335f7978ecffcb7e3289a42917773b293dcf383b77a72840d5a65cb21f21b502bba0c4f846309600d346e SHA512 dd42cb3ea1475d8f39034a7365c90f7e976f3cbc6f11020ccc7915c0d8bd27fe04dd2f7d784c1d08a8abaab02045119c705d10a802f3ff9a736a098fa6d5d615
+EBUILD libnftnl-1.1.5.ebuild 1256 BLAKE2B dccd0085e1c108b4a377a5e14f252dad6429bc8907ab5415fdc70959d38569355f2e02110b36e4f67c641768c5520298b15dfe37b9699899ee4e48738189a000 SHA512 d7287b303119dcee21127ca3e253976bd986975f9e6ef5944ca50a2cdfd70f830f90ad49cc5524cb1fe040ac231e66717aa60e39a1b25e130928416e24b36e62
 EBUILD libnftnl-1.1.6.ebuild 1200 BLAKE2B af974af8061f7789020a3efc449416e43af663ff1b8b098f820e5aff395bb25f9d99228bf363b5da8b5a32b8d38275564374f59088c24d0f11ac213d98e32590 SHA512 c6ee6faec8cab4159745be8665ad7363addc99f07d7a70b1c2e23337041ab2e5ff2b3262d9f13f946abda41c092482632249968c91fd6a31a4dd4005c551518c
-EBUILD libnftnl-1.1.7.ebuild 1192 BLAKE2B 5ce9550c836a983841de0197da1579e3c8259462334c6df811dacb4f66ec26d5269bce714a671e560c2b5048d085672912db9e33a58678c0e2273b7c35f877c8 SHA512 4b0acb69ff0f60a69ba115c219ff5d55d932739a4b7ee278b2e97e80144113d8ca3dc14a66e7e623f993e5d554594e301398595a260977f754d55f241345253e
+EBUILD libnftnl-1.1.7.ebuild 1193 BLAKE2B 00516c30541f17a36a56687be25edc8a559d91f5d553073a5062fb2b19d8f91925dbb4c769f4000ac7b47bf735620123a7ecf49e5190469cee3a57c442e4a422 SHA512 d16a9cab86c9f84a7ed9463b2eae753e1f44de4e1f0bbafaa2b0a003d48a9b4cceef75e15958844232406c230a8e23a394a82efd11b233442b71a0f970f368bd
 EBUILD libnftnl-1.1.8.ebuild 1200 BLAKE2B 6d0bb8f977e3a2910288ab3a5a3e7576b18f523c2c94172fdab12dfc5e4ce7604374da769ed66077dddef9cbe616695163ddb24f5e0f403d0e7a070a019b7377 SHA512 416d4570ac5dcb1d147e9ad0d7fd2c75dfe38ad7a2841cd99199723cdbf896abc68c4e5f551f8dd1f6745a999ff68724c15570b96d1bdea2cab41463c7be2ec9
 EBUILD libnftnl-9999.ebuild 1379 BLAKE2B fb6bcbbefa618ef5175256ca380a636085c561f188d366597c7d9b3d4ae89102d2b56703732deb7cb5398dba880e0f48eea23b38f8d972e4249e5c93d74ffba2 SHA512 63d0e7972a2a3e3bb92fec82afbf2b72de4b68d622b5ae71f2dd948f2897f077ba76e9b96e45698120127b6da935c6a505a1b7fb32440a3f4fb3b41c19061ee5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.5.ebuild b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
index 8b55096564bb..f3d8044e0da7 100644
--- a/net-libs/libnftnl/libnftnl-1.1.5.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnftnl/libnftnl-1.1.7.ebuild b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
index 935d07ddbb44..0626a8e5c8ff 100644
--- a/net-libs/libnftnl/libnftnl-1.1.7.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="examples static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index eab523797691..a76aefac32b1 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,6 +1,3 @@
-DIST libnpupnp-4.0.13.tar.gz 537389 BLAKE2B 0085d9ea9cf1786bba8e8abb812b0c1279fc30c70a16cb2bf4cfad405ec1346180171dd39296a30f5747cd55ee06fc314bcb49fdb6537a4dfbcf048fb66fd7f5 SHA512 c0332552ab2ba8aea8e72858601f2415a08a68224f724454d230acddf612b2fdd873daf41aeeeb3e1b4d1694665245087b3c4f96c896d36e2e9c017ea95d13aa
 DIST libnpupnp-4.0.14.tar.gz 538629 BLAKE2B 3bcd1cf04126aa0d16056865e2f7c90bc479ae4ccea5094b2c44ee687be95fe346494a2d07ab7925963d88e614fff1a451341af7d41c2a16df1208aef728d515 SHA512 b224cadbcd92b8d66118da015db345b3ef5c4858a458ac681d550c1409e62f212d3b2a744a8368fa4149309f29de2edb8cb14c75ebcb14653ee351e0d24cba71
-EBUILD libnpupnp-4.0.13.ebuild 716 BLAKE2B 12c8be38c4513b2683678be91c322f7f9519839fd0925473f2f41e611a23e0509dda2565e9a201e5c855b011a4ed9a9c3b93f1d6e063918574d0b365609c9b00 SHA512 e030788b85dd8ef7d63348b8d984635b29a7e6ca76ffc37b25016c7f10f4dccd9d8cf356e01e93da94341b4ef5c9890128a85b5a88197785ceff12d20b6faade
-EBUILD libnpupnp-4.0.14-r1.ebuild 721 BLAKE2B 4736b9041ec36ce911adb2c21ae39bff774e0c1aa4ad5871c037196a0ba03af7988850f05e6f2fa5edacccdfa9b85c118188cb696cd37dc91ba210f8ee5bcf4a SHA512 2856fd4e7d5e062b00cc4be6228c6a557e0cdbc277e2b4731726b86f6dcc028b6489fd5929c108eb1c2ced5c18d3d1665461f317c0354911f9db918b7e69dac0
-EBUILD libnpupnp-4.0.14.ebuild 716 BLAKE2B 12c8be38c4513b2683678be91c322f7f9519839fd0925473f2f41e611a23e0509dda2565e9a201e5c855b011a4ed9a9c3b93f1d6e063918574d0b365609c9b00 SHA512 e030788b85dd8ef7d63348b8d984635b29a7e6ca76ffc37b25016c7f10f4dccd9d8cf356e01e93da94341b4ef5c9890128a85b5a88197785ceff12d20b6faade
+EBUILD libnpupnp-4.0.14-r1.ebuild 719 BLAKE2B 26210c2824c29e491bdddf8185c8a54057fc2adf1a21354b273bce5459f61aeb42ea3ff63561493445776954ee6897de4aa97453c38bff8f6bfee9f6b05c8f5e SHA512 2726d7f7f0e1bd3f300639a835904659e3ea8d752fdb384105db14484227177b646182103a88ee95d6dc1a35feb9d358b6470ad399ea9920d513afa3afad0f18
 MISC metadata.xml 535 BLAKE2B f106ebdadd8d1f09dfd088420c9c750858ed36a2eff5eac1bd256a31cb277b0dbfeceb3cc1d724b65a66b97243f32d618379a8c65a52cf341f78fb4f20a4ecef SHA512 99e4e4ea26cfc4eff4ea0e289d144ec21cbb3834f434a1071c99dd890a0c24dded48b66918d61c4840bb6ed469b3e945f5292d14c244be7acefad561de55962c
diff --git a/net-libs/libnpupnp/libnpupnp-4.0.13.ebuild b/net-libs/libnpupnp/libnpupnp-4.0.13.ebuild
deleted file mode 100644
index a00ee17059e3..000000000000
--- a/net-libs/libnpupnp/libnpupnp-4.0.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
-HOMEPAGE="https://framagit.org/medoc92/npupnp"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	net-libs/libmicrohttpd
-	net-misc/curl
-"
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--enable-debug \
-		--enable-device \
-		--enable-gena \
-		--enable-ipv6 \
-		--enable-optssdp \
-		--enable-reuseaddr \
-		--enable-soap \
-		--enable-ssdp \
-		--enable-tools \
-		--enable-webserver
-}
diff --git a/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild b/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild
index 733dfdc33817..da0ca8884524 100644
--- a/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://framagit.org/medoc92/npupnp"
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/net-libs/libnpupnp/libnpupnp-4.0.14.ebuild b/net-libs/libnpupnp/libnpupnp-4.0.14.ebuild
deleted file mode 100644
index a00ee17059e3..000000000000
--- a/net-libs/libnpupnp/libnpupnp-4.0.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
-HOMEPAGE="https://framagit.org/medoc92/npupnp"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	net-libs/libmicrohttpd
-	net-misc/curl
-"
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--enable-debug \
-		--enable-device \
-		--enable-gena \
-		--enable-ipv6 \
-		--enable-optssdp \
-		--enable-reuseaddr \
-		--enable-soap \
-		--enable-ssdp \
-		--enable-tools \
-		--enable-webserver
-}
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index 32f3d50df0f0..735de98ddde6 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,3 +1,3 @@
 DIST libntlm-1.6.tar.gz 688608 BLAKE2B 8e545619b1fb00d778bbebf6ab9748005928a2669dab8c3d9c6285127b551c1bf039e1748a710e5eb551e7cbcb1a8775b57c21b163ca2a0206a4b9948b11df8a SHA512 d68bc6b5cd7f5f70385ba78275a810fa46e60f761f0949f2262eef35ae052661739ef17ce3fc4ab75f7e8cfc788b1ccd7766d4ff0ee78db08ea4de3e224653f2
-EBUILD libntlm-1.6.ebuild 545 BLAKE2B 0193445155b7133abd68e64277c00d60b3949b03b034050aed32e2286c62f7fbb16f8ef849bca140ca59919cb53cc717895f37157819b606d6f7ffbfc4a2a804 SHA512 33f5e4f62a3b9c38de69e9eb69b59871036617f9241064c6062f31b924c7abed01a690b6cab6af85ca25d4806017889e8dacd8b6b976ced95ce43bedf4f83c81
+EBUILD libntlm-1.6.ebuild 546 BLAKE2B b88ee1341a628e1ae974650f73e709b1e5a951767b1b9731812e6ac54d481ab878a717b0e6699543db8dedefcc4b9e492c6069b8e526f5228519fb0ed2a10f56 SHA512 ff721f9d16a7f55078a795ff2dae04e03dde21ae674f7dc391470f3b6cb971f08988aa4c8d71dff3f9e4c957941c8e76be979824c2617c0dcf03cd1bc7965656
 MISC metadata.xml 561 BLAKE2B 400bca5cfe90103ba77808cdf4fbd777b3c19dfabff4336df9bde7e8529da948a4b48b06f1f5151e6f62aa45e5a4cad51b4af7dd2799c9aa8dea89f390936eab SHA512 60e06d45b1482e819824259dcc992d355961754d481700ab41f1e3050ec70893f9075c19bc846591f3aaba9a135de5610686cc82feff1b8119a1466865b08a94
diff --git a/net-libs/libntlm/libntlm-1.6.ebuild b/net-libs/libntlm/libntlm-1.6.ebuild
index 0c0220891886..3e6348ee0afc 100644
--- a/net-libs/libntlm/libntlm-1.6.ebuild
+++ b/net-libs/libntlm/libntlm-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index 22432f200cd6..88640a04520b 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 1576 BLAKE2B be572fbe7f3896c6a12f65c968ea2ad86404e408bc24f850fd2403db0984af5f927add6b3cec429f7ef71d2f484ee9a64e7c27d497a96439c8e955894577c012 SHA512 0c2e8ef9f31294c6f1ab4e3645447d3a7be796a13398b58b9b04eb40f0ea0f047adb305004ffaa05bca55b78d67a84efcaa4bcda8be620f1f7570f78e2221787
+EBUILD liboauth-1.0.3-r1.ebuild 1577 BLAKE2B c058dabc5298ca1f3ed3d730a0960ca1afad2e5a9459bdbc0e6b7eff2e846464fe0de726a1f8135f3bd069a4aed11002b4ac53e7f515cbc58cca1b5cd5b9cf61 SHA512 50e02c4a0fc4c799beda369c249e7a41766095a697a4b60f5ad2c46ddfcdb137b31d4a808903776dfc3819d19186cecf74f8daf55ccabd5d54560c91f1553bbd
 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 5752b46e6cdc..a68e3ff0f51c 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/libosmocore/Manifest b/net-libs/libosmocore/Manifest
index 6fbc63caf0a9..eaeb35f85697 100644
--- a/net-libs/libosmocore/Manifest
+++ b/net-libs/libosmocore/Manifest
@@ -1,7 +1,7 @@
 AUX libosmocore-0.6.0-automake-1.13.patch 245 BLAKE2B 776b88a297b1ad6edaaff357bfc52f5f219b1372c428cc095ea415d4e91b89bbd2d1dad83a893d3c46cfb4e9716f7ec4296bf06f07bc731f752e99d88cd1e4c5 SHA512 be6ad33f91009e6a38d02deafcb69e4e6d88e7436531ddee822b461d95263609b9a6983d7f523cc6d7f97fb8794f32b1b15f9afe1f784bee907ad48535091e1f
 DIST libosmocore-0.10.2.tar.bz2 646555 BLAKE2B 62dbabdbb8a397662b618863aade394ef4638dd266e059ef4c6fa54364aba60db29cce1fc6c2692af095f32b3ce186ee5b788598595fe2128f0d04caad9d83d2 SHA512 a42db3467faec9c814efe40ae8cf4a41e610b97cac04c1da30c211f116e1f7907117aaab89aca8af3dcd8aedc2be73c9e1c194b9062d33856de02feddf4bda22
 DIST libosmocore-0.8.0.tar.bz2 439320 BLAKE2B 2614ddb8a1f7a0a72bae888d601264d90836daf2067716f2a264f0632699929db9b0a3d3f353629c08aaaecc84f429d6fa2c36481c8bd27ecb078f4447c937c8 SHA512 4ffd5943807440f80f70e381e477631a592fef41a3485819d94e7ce9523785e20057759aec6cac7abe57ba21b7d48e38164b7272c5bcd89882a3a8e213d89361
-EBUILD libosmocore-0.10.2.ebuild 906 BLAKE2B 17533a7fba36cf814bde7fb4a6407e919b6f85773dd830013f3e7d11675db8d4d128448755357b2212dbf1db7143c638b1d3e98172b09189a22c6b2f9b44f42e SHA512 21fca38c83177653078fc20df1ae876ce6f91d2e6e3e7e726cd3cc68c5e3248fa9270a64ff9ed03a741f1d933448083b1a566877128ab9effb2b571b264b7ef3
+EBUILD libosmocore-0.10.2.ebuild 939 BLAKE2B 464dfea344a70b2ba74688e085ae78a39ed96ce48c5906db13bc0e702bd337dd136275e1ab2e2ae70a5bb331ef4f46f6be1a9ef5ae96cdbf88c7b08c313b13ff SHA512 0bace8fd796efadae15bb35ec154515d6c478d3295d603de84e36fa4ecf54d93221bf3660a09f924837a85712e8df7ccbec84ad1398a26be0c281029b7a66118
 EBUILD libosmocore-0.8.0.ebuild 1073 BLAKE2B da9541dff2ae947ca5846516239d2a35697b942b4d6aa790dcb8f306052d2526e3ecb3c4a0e51c2243d2e61b93a8da187bbc04ccdd2acc58a968373635f37df2 SHA512 366616aa4ac0e675f2f431236ee2fec3cfc11fdee4bd8c75118e4d5595e2c1f544b5b96b869a6dd317efe2fe7ff4659b18f729485949ff5a526e525f3d1cd9df
-EBUILD libosmocore-9999.ebuild 906 BLAKE2B 17533a7fba36cf814bde7fb4a6407e919b6f85773dd830013f3e7d11675db8d4d128448755357b2212dbf1db7143c638b1d3e98172b09189a22c6b2f9b44f42e SHA512 21fca38c83177653078fc20df1ae876ce6f91d2e6e3e7e726cd3cc68c5e3248fa9270a64ff9ed03a741f1d933448083b1a566877128ab9effb2b571b264b7ef3
+EBUILD libosmocore-9999.ebuild 939 BLAKE2B 464dfea344a70b2ba74688e085ae78a39ed96ce48c5906db13bc0e702bd337dd136275e1ab2e2ae70a5bb331ef4f46f6be1a9ef5ae96cdbf88c7b08c313b13ff SHA512 0bace8fd796efadae15bb35ec154515d6c478d3295d603de84e36fa4ecf54d93221bf3660a09f924837a85712e8df7ccbec84ad1398a26be0c281029b7a66118
 MISC metadata.xml 432 BLAKE2B 955701be1bdd728ec1ff6851f1bb84c281a65c63a28c47e4a4328794e26381ec709cbd9dbb2b99f3bdcaaf77793c849b5d30a232edfe5a7866b3b4b927860ddd SHA512 3b4c9d8e510a658b9e1d5ea30042a45aefcd128429d45665b152b238b216bdd8a245479c54ef0842fda7937830b38d33cef6e12b802b7ce525ced80d38951157
diff --git a/net-libs/libosmocore/libosmocore-0.10.2.ebuild b/net-libs/libosmocore/libosmocore-0.10.2.ebuild
index fbd3f9ee9b99..66b9ab242068 100644
--- a/net-libs/libosmocore/libosmocore-0.10.2.ebuild
+++ b/net-libs/libosmocore/libosmocore-0.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
 HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
@@ -41,6 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -fcommon
 	econf \
 		$(use_enable pcsc-lite pcsc)
 }
diff --git a/net-libs/libosmocore/libosmocore-9999.ebuild b/net-libs/libosmocore/libosmocore-9999.ebuild
index fbd3f9ee9b99..66b9ab242068 100644
--- a/net-libs/libosmocore/libosmocore-9999.ebuild
+++ b/net-libs/libosmocore/libosmocore-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
 HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
@@ -41,6 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -fcommon
 	econf \
 		$(use_enable pcsc-lite pcsc)
 }
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index 6a6ba156493c..b595fabfd524 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 696 BLAKE2B a558578d70721fa371252616b051cf2ef60f288ee2c6e49ce291bb299d240bb15d02f423a454a2b94f3428be1a6b2e92c77e602fdec4f38f82e5a8898794feeb SHA512 29071f71be25d8e1e8f1384c225f8753db39708bc5e7d0241aea52d9efda7b9d824cdd0655fec8db7d639aad6fe693a3553d67728dfe646112d016c49cfd09a8
+EBUILD libotr-4.1.1.ebuild 697 BLAKE2B a350a54d0cfe5480662f5671476648111b1d79afd2fb93c1af3f61d9daac1e8e6e6d04887ce04523ff286e372aae88334ba645aae625110005d67b452f6f6708 SHA512 cd785a135472c592d25b72c4f7cd2e11490a2bce2260888e86002469bb1e0f83123b37aa7e2838730bf2cf3a6a7e4fbf41758e92a4c8b07067b757046614dd8e
 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 0d4492fc6ff4..34814f82eb42 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~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 dca0df7a2f39..a3e75e934155 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -2,9 +2,9 @@ AUX libpcap-1.10.0-usbmon.patch 620 BLAKE2B 463f446051bd6df5afd679ee95c13792ab4c
 AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90
 AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174191e13d28658e380baa2d48f828736a0ff176de4b5fdaa7c0bf42c36509dfffd0c6d49cec45669d03201fad8efaf90c75 SHA512 57f51c1f2fc093bacf43a96c7156e82946a3f11025b3afe3c24c2704fb4a9a7750e0526d41a17d52d649f55b44d642d5daa3a76f0ae18aaca582591f20acd1c1
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
-DIST libpcap-1.10.0-bp.tar.gz 911001 BLAKE2B bbcb1f48c5cbe8bfc46003cbf7c691e0b3a2051e319aa3ec761de045ac11bbacafe1a06b52c4cd332eb85e598a0a1ff5403ae7c3a611cc0cdd2eeab859587487 SHA512 c3d6047192ab1521687d856f2a954a38bfd8d42aedb853559a698ed3c24bfe5698efb6f81c0280b696229165c1088a58471e8d62f071343fcb14b1464f65fe3f
+DIST libpcap-1.10.0.tar.gz 920263 BLAKE2B 40b9f3562161dbdd30065757ae045bc3b6447a954dd3019e932cdc9c794e0f47e8eb0480144bfd7765122a3efa750caa0c77abbb98ce29ad79a84ceaedcb9e3f SHA512 d77f05aff76aefbd280e5e24eb4a23b6f3b31c9aacff77d556259325273083f185c451b7ad40b57ac63c9114510e8f768fb99907b1ee54fa95b80f21d7d6500f
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
-EBUILD libpcap-1.10.0_pre.ebuild 1964 BLAKE2B 3bc100b209597d14e241590612975d9f90e51d9d4992fac6f4909183ec4d6e47ca493c17d644ed0b3d99919ec64d4ddbff18a0376244bf30e4bfc1e0ea06379a SHA512 2b71c759029a5d0e32c82cd2ae9e25c04870783ea880f00231a9e2cf84ca13417be6d72fade91ee6bc0d60314afa57b33254b2b8af36490b3d7c9cca4dc0758e
-EBUILD libpcap-1.9.1-r3.ebuild 1906 BLAKE2B 2c815523ec9e4ee7c67b751636ad1ae86ea99248346d8f12494cd9f7fe3223b284a5b8f89f5bba46f2f0945ca4aa2bbef2c8115b38f4e4764e5bf8b28d9fa7b9 SHA512 76be149d9b2826e56adf09f1a6857141950fc0238d7f64f9d629531819f503fb5a73e9445b34c032736e3351a65c18667902dbab17a12ce7318f1fa26e23f9c7
+EBUILD libpcap-1.10.0.ebuild 1960 BLAKE2B 7db96d35b0d7343e15e280b598f0ac058b3bb8d3370097fcf56917f35d6b6a5a7cefb8b39071910482f367bed797ea4fc7c8e0f3df8b87423c8643257875fa33 SHA512 6f7bc265bd26db25b4006347a2bf3884305060958bd9d65b9f59802ef21bd443403b874bf935e71bf8466e52c2926fcd938a04211c15121708d65cacafb8a3c7
+EBUILD libpcap-1.9.1-r3.ebuild 1907 BLAKE2B b7d857381bda32f90cd38510083092070d026c7d4ebfbba6096c3f192d7b3c49adf9ba277f33d2dbaedc2368f7e90aac673bc3af8ba526df795f5dbd47b92b2e SHA512 48103bb050048d3e8d58fcd3375368c0cc4b4b445fda4ef57538233012f0a4846cfeb3d5c959917997b9d51d71af5cf86fd98219b9a0b992334566530b2892b3
 EBUILD libpcap-9999.ebuild 1722 BLAKE2B 23bf6d429b4010ef74e9db6be8512a9ae5b7cd013836ceefcdf88ad6d680a8000a39953b0d259679a826e99bc2af7d04a1e87db06d30aa10d6c06e1c99fe8a8a SHA512 b3f929fc29f5d2f96fffe31554d65ecdee1523b7bf4fb8b4bc911999223816bdc376254a208cf142c1e8d9ba36177a4a19909c18e95ca7bb72b93652d0c96b3d
 MISC metadata.xml 918 BLAKE2B de742c2edb2a5fd038af02915ca47d8ff7596072eae68a9945a0d68acfe95fb01eb4c36659d5be1412323db841c7aa64f61eefa8e246e9b7376c72b374dbe025 SHA512 6e8e268de4c7c6280052cb4841e4d496a8ccd9b7c29f992d5afd5492cf84f3bf5a259d3036557015a1c6fe5445bb8f92a7b63d72412d52850aec02c59d8e62b7
diff --git a/net-libs/libpcap/libpcap-1.10.0_pre.ebuild b/net-libs/libpcap/libpcap-1.10.0.ebuild
index 3a80522a9f77..0764beef2a46 100644
--- a/net-libs/libpcap/libpcap-1.10.0_pre.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools multilib-minimal
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
@@ -9,9 +10,8 @@ HOMEPAGE="
 	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/libpcap
 "
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz
-"
+SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz"
+S="${WORKDIR}/${PN}-${P/_pre/-bp}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -25,17 +25,13 @@ RDEPEND="
 	rdma? ( sys-cluster/rdma-core )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/flex
 	virtual/yacc
 	dbus? ( virtual/pkgconfig )
 "
 
-S=${WORKDIR}/${PN}-${P/_pre/-bp}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
 	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index d4e1a7d59bc3..396b447b7fbb 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 6b73c4ef093a..0426de74e2d9 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,15 +1,10 @@
 AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb126a15fa2e6c2602bc270144236bb7279f9fda9a505a487f569fe7170733e8e6b7e78b8e1fa6892c0ff0be9b3937e9f96f7318bdbf SHA512 a0fa6520c60489675176ca7d5d750d0f54e020592743a3437c184939314b71be68803a7f1cb8cb584fb7ad6ee884c85bfb7905d4bb3e0536d535e990981e9ba9
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
 AUX libproxy-0.4.15-avoid-nm-build-dep.patch 3445 BLAKE2B b5094d1b5869321a1fe4d289f5834f70a0422d001a583aa79eb3a9b1e3e84c3060098908c096398dd6186e9b00e88bceed1464952daa1e782ae862e0fc636e55 SHA512 6f0945337b9fe5586cc38e902526a5473e354143eb26db5a05c02a911ecc9de650f22a3f7b68cbb9e90e737f8001adaa1a6d17fcded5f7cab0462b14cc196111
-AUX libproxy-0.4.15-gcc-11.patch 3850 BLAKE2B 365313af90b676d471bf7d5b2fe13358d3fdc902e6dc7da37a56b5f186d36b61fd730d5b15511e29aec8a332c1ab622c98e27237d29b31a2448909c308e6da82 SHA512 dc211ddd3e68ed62f505297ffab08ebd6733b1bb9fa1376b69e69e7db67a875067b802209334d7901994eac115b692eda30abc284dd2fc42f0ce9678fcbcc581
-AUX libproxy-0.4.15-mozjs-52-1.patch 3771 BLAKE2B c5b760979a0c8188ada05e2842d65fd108451d57255c12e971a99f42e373e77c1ac069506085c1d8d20f395551b140dac77a0d33b009b760632921c9452c5d34 SHA512 6572bd725662533aa5a2660461606bc101bb75edfe21021a73f2faa4d3f5d91fb83637ac43e448ad124abfc1c6e59c82f96ae9cd571289767ee6c193be552fbf
-AUX libproxy-0.4.15-mozjs-52-2.patch 847 BLAKE2B 0b6b408b6745c6b4bf277549a8682db67b4db426e0fe87830c0ca51f9da3c0fc6afc39ee22f13af5c4e3abcf587765b1de0bddc508530302dded86eb1e547b8f SHA512 e1f3fd54ea7fba12d019fe9388236eba1afb73a7e9978c4bbcf9309f9d3aa246747f15e1e62a1d86eba05147b62b2d97d45d1b4547f08a01e4ddef8a8b0746ad
-AUX libproxy-0.4.15-python-3.7.patch 774 BLAKE2B fedb3b9c1f003a24706a8b9b66d70f3abe01dd26bdd25eacf7685247d262e02ae0b406d0a2871f12d8d1b92df5abcdf207d940fec91c964fb33d38b454a91d82 SHA512 4330e9043ed767accea8f6f74b6999017633c51d615b229e7a43e9ed468630c630653c6917a4196e8f05d285df383de3bb269a79db127d902d1c960f29d39246
 AUX libproxy-0.4.16-avoid-nm-build-dep.patch 3507 BLAKE2B ed5cd354a5a8b0c5d17c43dbce2f494273b75b842d8952269ce95839a5798a05cc745d1cd800fc4cef5964bb8e14b3607846a23fdbcff0db01045ddc81f3af35 SHA512 30aae07b6c42c20cf76b095fccf4177d35c4f4c99dea82ae8f97cb680f29ceaadc4aa1393f83a3eaee8706670f94b544bdec3cd48c43f9ce28a2777a1dd9053b
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
-DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
 DIST libproxy-0.4.16.tar.gz 95534 BLAKE2B 163f4fa359758a2186802683005b7d2bbd68933d2512f2c4a284912b6d07e3aa288613e3b473d1bd8d9fe941033da634490c78367692a489da31184dd4dc3cb8 SHA512 28bca7c86e486d08ddc1699e562dd98366b569ec9a7a965f7d15d265ede508575e6eae43abde1778f46d55c3304d32218d891d01ba6a8c360820412748ed5ca1
-EBUILD libproxy-0.4.15-r1.ebuild 2708 BLAKE2B a2f4f66d4fb604cf4d3bbd2ab3f7cc336f36152f00ce82028a677e9d269755f75dc118976394e0ad0fbf594f1d1e9d3f2445eeafd3fb7b61854e4a4c5ce4573f SHA512 774fe0a0356d7975a010667270923726a645dd9cd803fcb112e600e0de069282a5cd625f00f196e7112ac24b68e914e62baab5e09c9a9521dac0f540932aecac
-EBUILD libproxy-0.4.15-r2.ebuild 2749 BLAKE2B 731c5c169fdb244d023fe13c3a527ff5bab3e3d1ad06ebf133f7cb735ccfff5af55627def215ef6bc2caf1d2d33fb4c3fc71086e9bc6b0705c19e1bb59de81da SHA512 1923237894e97d2ff10bfde1a281718489b1dbd90883b27b1a0b30066923ff558c9ad3cc4b5e83696f01d92b92656bc7356877187efc242b212eadb840cf7fdb
-EBUILD libproxy-0.4.16.ebuild 2566 BLAKE2B 37d861f9c4e4ecb1c270ec6b6f0ab416a383ae81bec4b6e0ff11a0b17cad46f5d141ff24c6369ced463bb13aa9ae4c03a12f53c6959b54db8537df4537127d56 SHA512 35e50fe449aae44bbf11ba027dd8cd36ab058bee01669284ad5de5c5a7dc19af5f7b54bccd9a879ed31292bec6a05ab30f2d0a6e49c593d8fcf1c2b51af13150
+DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126
+EBUILD libproxy-0.4.16-r1.ebuild 2558 BLAKE2B 587bcca985dc750440dcd04ab7f87e87566fafc7e51a4af986bf8b4c982da4c43533ef4dc8e0755e2f6c1d1d0ebe333a998c6703704b0cc9529a0c31d1160335 SHA512 42c24f639c9512ee3dc370289c8d5f104ce3c7a167321a3c9c17ffdba38564d4506285d98297b3af283b8e7a7760d37a4a8b8a9fa52557ffa76c72168c9d717c
+EBUILD libproxy-0.4.17.ebuild 2573 BLAKE2B e5c869a5a4fb44ca248eaf213526b6e91d0d0dcb46fcd6e18563356fb32f8a3e8074476afb1aec8efbf07a617ee81229ccd76db68f777e4725ca2443acb18c9a SHA512 d01e03fb21e1d3a273eb9b33628a193dc76c35c1ba7f0ad60f9323ef40520b8bd614f4ef9c007ec229cb539fb3a79c699184b5e02fbd35897e9191bb5b1dab6f
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch b/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch
deleted file mode 100644
index 2d40a6c1600d..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-https://bugs.gentoo.org/732700
-https://github.com/libproxy/libproxy/issues/127
-
---- a/libproxy/extension_config.hpp
-+++ b/libproxy/extension_config.hpp
-@@ -31,7 +31,7 @@ using namespace libmodman;
- class DLL_PUBLIC config_extension : public extension<config_extension> {
- public:
- 	// Abstract methods
--	virtual vector<url>      get_config(const url &dst) throw (runtime_error)=0;
-+	virtual vector<url>      get_config(const url &dst)=0;
- 
- 	// Virtual methods
- 	virtual string   get_ignore(const url &dst);
---- a/libproxy/extension_pacrunner.cpp
-+++ b/libproxy/extension_pacrunner.cpp
-@@ -30,7 +30,7 @@ pacrunner_extension::~pacrunner_extension() {
- 	if (this->pr) delete this->pr;
- }
- 
--pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) {
-+pacrunner* pacrunner_extension::get(string pac, const url& pacurl) {
- 	if (this->pr) {
- 		if (this->last == pac)
- 			return this->pr;
---- a/libproxy/extension_pacrunner.hpp
-+++ b/libproxy/extension_pacrunner.hpp
-@@ -26,7 +26,7 @@
- #define PX_PACRUNNER_MODULE_EZ(name, symb, smod) \
- 	class name ## _pacrunner_extension : public pacrunner_extension { \
- 	protected: \
--		virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc) { \
-+		virtual pacrunner* create(string pac, const url& pacurl) { \
- 			return new name ## _pacrunner(pac, pacurl); \
- 		} \
- 	}; \
-@@ -41,13 +41,13 @@ class DLL_PUBLIC pacrunner {
- public:
- 	pacrunner(string pac, const url& pacurl);
- 	virtual ~pacrunner() {};
--	virtual string run(const url& url) throw (bad_alloc)=0;
-+	virtual string run(const url& url)=0;
- };
- 
- class DLL_PUBLIC pacrunner_extension : public extension<pacrunner_extension, true> {
- public:
- 	// Virtual methods
--	virtual pacrunner* get(string pac, const url& pacurl) throw (bad_alloc);
-+	virtual pacrunner* get(string pac, const url& pacurl);
- 	virtual ~pacrunner_extension();
- 
- 	// Final methods
-@@ -55,7 +55,7 @@ public:
- 
- protected:
- 	// Abstract methods
--	virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc)=0;
-+	virtual pacrunner* create(string pac, const url& pacurl)=0;
- 
- private:
- 	pacrunner* pr;
---- a/libproxy/modules/config_envvar.cpp
-+++ b/libproxy/modules/config_envvar.cpp
-@@ -24,7 +24,7 @@ using namespace libproxy;
- 
- class envvar_config_extension : public config_extension {
- public:
--	vector<url> get_config(const url &dst) throw (runtime_error) {
-+	vector<url> get_config(const url &dst) {
- 		const char *proxy = NULL;
-                 vector<url> response;
- 
---- a/libproxy/modules/config_sysconfig.cpp
-+++ b/libproxy/modules/config_sysconfig.cpp
-@@ -124,7 +124,7 @@ public:
- 	~sysconfig_config_extension() {
- 	}
-    
--	vector<url> get_config(const url &dst) throw (runtime_error) {
-+	vector<url> get_config(const url &dst) {
- 		map<string,string>::const_iterator it = _data.find("PROXY_ENABLED");
- 		vector<url> response;
- 
---- a/libproxy/url.cpp
-+++ b/libproxy/url.cpp
-@@ -115,7 +115,7 @@ string url::encode(const string &data, const string &valid_reserved) {
- 	return encoded.str();
- }
- 
--url::url(const string &url) throw(parse_error)
-+url::url(const string &url)
- 	: m_orig(url), m_port(0), m_ips(NULL) {
- 	size_t idx = 0;
- 	size_t hier_part_start, hier_part_end;
-@@ -298,7 +298,7 @@ url& url::operator=(const url& url) {
- 	return *this;
- }
- 
--url& url::operator=(string strurl) throw (parse_error) {
-+url& url::operator=(string strurl) {
- 	url tmp(strurl);
- 	*this = tmp;
- 	return *this;
---- a/libproxy/url.hpp
-+++ b/libproxy/url.hpp
-@@ -50,10 +50,10 @@ public:
- 
- 	~url();
- 	url(const url& url);
--	url(const string& url) throw (parse_error);
-+	url(const string& url);
- 	bool operator==(const url& url) const;
- 	url& operator=(const url& url);
--	url& operator=(string url) throw (parse_error);
-+	url& operator=(string url);
- 
- 	string   get_host()     const;
- 	sockaddr const* const* get_ips(bool usedns);
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch
deleted file mode 100644
index c2d0257d437f..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-1.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From f594720280b2e40d81fa6e286a0ef8868687ef7e Mon Sep 17 00:00:00 2001
-From: Pierre Lejeune <superheron@gmail.com>
-Date: Sat, 30 Jun 2018 21:10:06 +0200
-Subject: [PATCH] Build with mozjs-52
-
-Fixes #71
----
- libproxy/cmake/modules/pacrunner_mozjs.cmk |  2 +-
- libproxy/modules/pacrunner_mozjs.cpp       | 19 +++++++------------
- 2 files changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
-index c2ae3db..20857fb 100644
---- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
-+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
-@@ -9,7 +9,7 @@ if(WIN32)
- elseif(NOT APPLE)
-   option(WITH_MOZJS "Search for MOZJS package" ON)
-   if (WITH_MOZJS)
--    pkg_search_module(MOZJS mozjs-38)
-+    pkg_search_module(MOZJS mozjs-52 mozjs-60)
-     if(MOZJS_FOUND)
-       include_directories(${MOZJS_INCLUDE_DIRS})
-       link_directories(${MOZJS_LIBRARY_DIRS})
-diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
-index a70b2e9..ed07c69 100644
---- a/libproxy/modules/pacrunner_mozjs.cpp
-+++ b/libproxy/modules/pacrunner_mozjs.cpp
-@@ -35,6 +35,7 @@ using namespace libproxy;
- #pragma GCC diagnostic ignored "-Winvalid-offsetof"
- #include <jsapi.h>
- #pragma GCC diagnostic error "-Winvalid-offsetof"
-+#include <js/Initialization.h>
- #include <js/CallArgs.h>
- 
- #include "pacutils.h"
-@@ -111,17 +112,14 @@ class mozjs_pacrunner : public pacrunner {
- 	mozjs_pacrunner(string pac, const url& pacurl) throw (bad_alloc) : pacrunner(pac, pacurl) {
- 
- 		// Set defaults
--		this->jsrun = nullptr;
- 		this->jsctx = nullptr;
- 		JS_Init();
- 
--		// Initialize Javascript runtime environment
--		if (!(this->jsrun = JS_NewRuntime(1024 * 1024)))                  goto error;
--		if (!(this->jsctx = JS_NewContext(this->jsrun, 1024 * 1024)))     goto error;
-+		// Initialize Javascript context
-+		if (!(this->jsctx = JS_NewContext(1024 * 1024)))     goto error;
- 		{
- 			JS::RootedValue  rval(this->jsctx);
- 			JS::CompartmentOptions compart_opts;
--			compart_opts.setVersion(JSVERSION_LATEST);
- 
- 			this->jsglb = new JS::Heap<JSObject*>(JS_NewGlobalObject(
- 								  this->jsctx, &cls,
-@@ -139,16 +137,15 @@ class mozjs_pacrunner : public pacrunner {
- 			JS::CompileOptions options(this->jsctx);
- 			options.setUTF8(true);
- 
--			JS::Evaluate(this->jsctx, global, options, JAVASCRIPT_ROUTINES,
--				     strlen(JAVASCRIPT_ROUTINES), &rval);
-+			JS::Evaluate(this->jsctx, options, JAVASCRIPT_ROUTINES,
-+				     strlen(JAVASCRIPT_ROUTINES), JS::MutableHandleValue(&rval));
- 
- 			// Add PAC to the environment
--			JS::Evaluate(this->jsctx, global, options, pac.c_str(), pac.length(), &rval);
-+			JS::Evaluate(this->jsctx, options, pac.c_str(), pac.length(), JS::MutableHandleValue(&rval));
- 			return;
- 		}
- 		error:
- 			if (this->jsctx) JS_DestroyContext(this->jsctx);
--			if (this->jsrun) JS_DestroyRuntime(this->jsrun);
- 			throw bad_alloc();
- 	}
- 
-@@ -156,7 +153,6 @@ class mozjs_pacrunner : public pacrunner {
- 		if (this->jsac) delete this->jsac;
- 		if (this->jsglb) delete this->jsglb;
- 		if (this->jsctx) JS_DestroyContext(this->jsctx);
--		if (this->jsrun) JS_DestroyRuntime(this->jsrun);
- 		JS_ShutDown();
- 	}
- 
-@@ -178,7 +174,7 @@ class mozjs_pacrunner : public pacrunner {
- 		JS::RootedObject global(this->jsctx,this->jsglb->get());
- 		bool result = JS_CallFunctionName(this->jsctx, global, "FindProxyForURL", args, &rval);
- 		if (!result) return "";
--		
-+
- 		char * tmpanswer = JS_EncodeString(this->jsctx, rval.toString());
- 		string answer = string(tmpanswer);
- 		JS_free(this->jsctx, tmpanswer);
-@@ -188,7 +184,6 @@ class mozjs_pacrunner : public pacrunner {
- 	}
- 
- private:
--	JSRuntime *jsrun;
- 	JSContext *jsctx;
- 	JS::Heap<JSObject*> *jsglb;
- 	JSAutoCompartment *jsac;
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch b/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch
deleted file mode 100644
index fc23ef2cf8e5..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.15-mozjs-52-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a9b052c6e30101fb0b702917f245a3e2a2f08366 Mon Sep 17 00:00:00 2001
-From: Laurent Bigonville <bigon@bigon.be>
-Date: Tue, 2 Oct 2018 10:22:56 +0200
-Subject: [PATCH] Add call to JS::InitSelfHostedCode()
-
-This is needed otherwise mozjs crashes
----
- libproxy/modules/pacrunner_mozjs.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
-index ed07c69..38e7d46 100644
---- a/libproxy/modules/pacrunner_mozjs.cpp
-+++ b/libproxy/modules/pacrunner_mozjs.cpp
-@@ -118,6 +118,8 @@ class mozjs_pacrunner : public pacrunner {
- 		// Initialize Javascript context
- 		if (!(this->jsctx = JS_NewContext(1024 * 1024)))     goto error;
- 		{
-+			if (!JS::InitSelfHostedCode(this->jsctx)) goto error;
-+
- 			JS::RootedValue  rval(this->jsctx);
- 			JS::CompartmentOptions compart_opts;
- 
diff --git a/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch b/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch
deleted file mode 100644
index 95e56c2fe25d..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.15-python-3.7.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 2d6da65598b90480b4a62c4633eda035ea51681f Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Wed, 27 Jun 2018 06:36:00 +0100
-Subject: [PATCH] python: support Python 3.7 and 3.8
-
-Add 3.7 and 3.8 to the list of accepted Python 3 versions.
----
- cmake/FindPython3Interp.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake
-index c6cbe3d..8e5e409 100644
---- a/cmake/FindPython3Interp.cmake
-+++ b/cmake/FindPython3Interp.cmake
-@@ -39,7 +39,7 @@
- 
- unset(_Python3_NAMES)
- 
--set(_Python3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+set(_Python3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- 
- if(Python3Interp_FIND_VERSION)
-     if(Python3Interp_FIND_VERSION_COUNT GREATER 1)
diff --git a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
deleted file mode 100644
index ea1e91bfaa25..000000000000
--- a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic mono-env
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="https://github.com/libproxy/libproxy"
-SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="gnome kde mono networkmanager spidermonkey test webkit"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	mono? ( dev-lang/mono )
-	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
-	spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= )
-	webkit? ( net-libs/webkit-gtk:4 )
-"
-RDEPEND="${DEPEND}
-	kde? ( kde-frameworks/kconfig:5 )
-"
-# avoid dependency loop, bug #467696
-PDEPEND="networkmanager? ( net-misc/networkmanager )"
-
-PATCHES=(
-	# get-pac-test freezes when run by the ebuild, succeeds when building
-	# manually; virtualx.eclass doesn't help :(
-	"${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
-
-	# https://github.com/libproxy/libproxy/issues/27
-	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
-
-	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
-	# https://github.com/libproxy/libproxy/issues/28
-	"${FILESDIR}/${P}-avoid-nm-build-dep.patch"
-
-	# backports from git master:
-	"${FILESDIR}"/${P}-python-3.7.patch # find python-3.7 and 3.8 as well
-	"${FILESDIR}"/${P}-mozjs-52-{1,2}.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS}"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DWITH_NATUS=OFF
-		-DWITH_PYTHON2=OFF
-		# WITH_VALA just copies the .vapi file over and needs no deps,
-		# hence always enable it unconditionally
-		-DWITH_VALA=ON
-		-DWITH_WEBKIT=OFF
-		$(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}"/usr/bin/mcs)
-		-DWITH_GNOME3=$(usex gnome)
-		-DWITH_KDE=$(usex kde)
-		-DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo OFF)
-		-DWITH_NM=$(usex networkmanager)
-		-DWITH_PERL=OFF # bug 705410, uses reserved target name "test"
-		-DWITH_PYTHON3=OFF # Major issue: https://github.com/libproxy/libproxy/issues/65
-		-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo OFF)
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo OFF)
-	)
-	cmake_src_configure
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_install_all() {
-	doman "${FILESDIR}"/proxy.1
-}
diff --git a/net-libs/libproxy/libproxy-0.4.16.ebuild b/net-libs/libproxy/libproxy-0.4.16-r1.ebuild
index 2b8c9c9cd3fe..fa06d11f7f91 100644
--- a/net-libs/libproxy/libproxy-0.4.16.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.16-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
 	mono? ( dev-lang/mono )
 	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
-	spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= )
+	spidermonkey? ( dev-lang/spidermonkey:68 )
 	webkit? ( net-libs/webkit-gtk:4 )
 "
 RDEPEND="${DEPEND}
diff --git a/net-libs/libproxy/libproxy-0.4.15-r2.ebuild b/net-libs/libproxy/libproxy-0.4.17.ebuild
index cbec1147443c..2597575d9eff 100644
--- a/net-libs/libproxy/libproxy-0.4.15-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.17.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
 	mono? ( dev-lang/mono )
 	networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
-	spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= )
+	spidermonkey? ( dev-lang/spidermonkey:68 )
 	webkit? ( net-libs/webkit-gtk:4 )
 "
 RDEPEND="${DEPEND}
@@ -43,12 +43,7 @@ PATCHES=(
 
 	# prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
 	# https://github.com/libproxy/libproxy/issues/28
-	"${FILESDIR}/${P}-avoid-nm-build-dep.patch"
-
-	# backports from git master:
-	"${FILESDIR}"/${P}-python-3.7.patch # find python-3.7 and 3.8 as well
-	"${FILESDIR}"/${P}-mozjs-52-{1,2}.patch
-	"${FILESDIR}"/${P}-gcc-11.patch
+	"${FILESDIR}/${PN}-0.4.16-avoid-nm-build-dep.patch"
 )
 
 multilib_src_configure() {
diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest
index 8a552e7d1fb4..465c729ee879 100644
--- a/net-libs/libsignal-protocol-c/Manifest
+++ b/net-libs/libsignal-protocol-c/Manifest
@@ -1,6 +1,6 @@
 DIST libsignal-protocol-c-2.3.2.tar.gz 271930 BLAKE2B 43e1e384f9f3a81f582445e5f1f10875948b33607aa7feaf98f4b6cc41f5fd30ca9fb7c8426ef66f93cd46a662eb4a57002f5937d68f6fd2fcf0b30b33c60997 SHA512 7c63c42b9a590ed1a60a6f0094668d9948aa04e5965d052c22ae22b176df7c5582b8ec5c0e6c01ad582dfe2b04067380b9734ad08c64785242e90abcdabdfb8d
 DIST libsignal-protocol-c-2.3.3.tar.gz 272073 BLAKE2B 86f31ed8a18bfc1ea80c45ffaf983611d353616d418f308711665aae287ff86697f7586f20f2c52ac028f9e5ad8b6d39c80876b263654c620a541812917b4f44 SHA512 19d892e13fac32022658de5eaf1db8cec3226f5f3f37a4c1c33bfa9653126ecbc6350a1ab5624025f909803c2277b86321dbea7f64e9932883cae57b65f58112
 EBUILD libsignal-protocol-c-2.3.2.ebuild 344 BLAKE2B e35cd34f3dcc70bd0d785614f3e90513983c1a84c3c06025a5e207f5a58a8ea8b560cf7bfec4a26b39d1a9a47cd8df6f769ef517c83ae8b6f0cbc6033b22d15d SHA512 34c3fff52a30eb6d6131088fbc2761543718a6cc57abeb75815e9f83ee119a51754eade44c78e1828749b98e3c0942dd17276963951ce72c31246c7902145662
-EBUILD libsignal-protocol-c-2.3.3.ebuild 347 BLAKE2B 0250233af0b592d0bce5c57c53fb5b450fc4a4f5322ed00883af48b6fdeb40a2ba0f55b6d623dafcb4dbe7a01b2ae1fa10832c975fc5417255a4fdd474dc679a SHA512 ee8549d9c21439e65b4a08458be166fac4893ca4be98cf1d77f2d483429f4d9c4ebac7da04a63a80ed11f2d301a944ae592c3d2311ec2d9ef867fb1904b32fff
+EBUILD libsignal-protocol-c-2.3.3.ebuild 346 BLAKE2B cfa3bb04e96f7fb558250e8c97da2dfcc5d066370aefd966e734303531e9527a8772365cfd593f904547f5d16ca98268f537fb14f45032fcf677f5fb4817dd3b SHA512 e1153a01732b51c103d8efc23ca49c2bc2292ed64d7d9fe04e8c65819a211a6f35f42e7b4ea971a503a5cc85c6803d45c2a828e266052ff6bbdc2df6d186c57a
 EBUILD libsignal-protocol-c-9999.ebuild 311 BLAKE2B 17b9baf64a60146c55a2b525493a265eb5070a20a31b4a0dffe24c86e8a720f60a47c06f09e4473dcb2585c0a6f612d2b4df4b47944e927afe84e8ce29ab668f SHA512 6443aef8035cdb162e1681e0547411a1a1e157fb994b89e3e06cc61ed8f01c62419e02a3108e38044688de604342ff48e59a779b3b163cd9984ce3bc3c594659
 MISC metadata.xml 740 BLAKE2B a55ff6046cc360d761f3df397be99bb31c8b8ce41f947cd1ed18c8d96e8474fe4aed9718bb0c7b2541cec2bad46e2caf0448585afea85ca8376b4cfd9053a01c SHA512 92abe5f5a1b810e92d06099d8f59d248ec69c44ea4ec8dfbec8e637a0f58e272d32b6f1024492c010418d796991232b561131cc50a6fbf46f39b55e4c7b6f32b
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
index 8d67dfca9e35..152bed279253 100644
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 DESCRIPTION="Signal Protocol C Library"
 HOMEPAGE="https://www.whispersystems.org/"
 SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index a99e2b16532f..06ad079be1cb 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,4 +1,4 @@
 AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c886328c5f0e167a68f38d68a170809a63b63439ca99b0e23e6f3b548cb99a518651e93236072de300001c453a5de6f23059709 SHA512 e4e1f8f0e598656785123241cc8aabc948058229cd955ecf651dcb49332e9e35fc4c9831a6336e949e557e18e2af58bd8aa8f31b25628f32b35ced3972fa184f
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.5.0-r1.ebuild 898 BLAKE2B 9432c628324fd5d57242339e0ce07fc6bfdfa2e8457053fab177a05c1edf8e357c15483d6d9686eedfe24c798c22ea31fd3abe08bae28b34a1dd5ec551b19b99 SHA512 3ce94933bf9f64ed12d1c740645cb2979386d86ef595a229062d196900d1e44effd30b7e16ef9f30e583f519afb67ec06d561e60b4486045ac2c9156854e31f2
+EBUILD libsmi-0.5.0-r1.ebuild 899 BLAKE2B f66a0085abb97bf1f087d0ed1cd3a5253d707d2ec13393da363a6ebd82e5024afa6bc2cf8d36915228855670a028248e5a5c941467227584a33f6f36f53ab811 SHA512 8a07b75a6023c47651b16dc97dc7df80c39387e54e19052d8c608a087825f0b0ddf62edacb666c922c9f6e6714208cc48e8e68ad3649eac7c049ad4da9d85c59
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index f36fbd9bb1e2..6b0294947d29 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 58923b9a4e74..c34940bf210d 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -12,6 +12,6 @@ DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f0
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
 DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461
 EBUILD libsrtp-1.6.0-r1.ebuild 2400 BLAKE2B 184f09d2d76d04e071f39e586f561f9513b95697a64433fc00ba66712e35355452f2ae8ef92ade71769fe8c40251cdd8144ba0fdb4e4148ac09c885aeeda660d SHA512 2e1ec0bb8d1cadb2f7709a9a6a63980f51585418f8cba4fabc044c98e849fa6352a754c1a5c4d2d4e811c3fa1c3526fd6f1c3b88db26fdafb1214f12a87b7c9d
-EBUILD libsrtp-2.2.0.ebuild 1899 BLAKE2B ef1b0dab4409a0da2811094516d413ca1709bde65dfac72b305e5247e9e6c6944de7e56e2c638b6c4f5c94e499652fba31debb580cddbb87028e14dc0cae1644 SHA512 c1cf00d2cfcfaed74251b989801482a606cca5e05d0a323ac055085d49f1dadcdfd3e2cbb3c440a73ff15dfe8c7dfc5f60561867559c9d00a888f9ca2ead86c7
+EBUILD libsrtp-2.2.0.ebuild 1900 BLAKE2B d3daa39704a857d7b202a91725efe85bb036cb976bafdd1c8eae583032583f28162787bde9459db18a93d941878fc831c569c4340ac05ab145ffc5aa6c6c2de3 SHA512 14f7a0e615ca0294f059b06fd6fd6c9b1c1ee9b8a56b36807404c09540d01698d19264822c1c538a3104fc60d2bd7304d6fa961af46010d46e9825de4ec40a13
 EBUILD libsrtp-2.3.0-r1.ebuild 2012 BLAKE2B e48af05709bf26b8d1cf20cd2fdeb31634bf03f81a9f25cf9346422e5882535ab75df5c2e3a1688fd29541fbb562e626a5ee8a269bbdcb50a03f3f0d75f3bd11 SHA512 6acbc170ce15f60dd7fb524933baaf76f0653206f351db2920a304167c2ee14aed6e3f06c604c6861b7c102a27f5883eb84cdc1f03348caf91d36b8c27f04e7f
 MISC metadata.xml 837 BLAKE2B f256f76392707dd326a4640809e9333d5ac89d2d7da768b3d630d6c78ed3f873ff8d9060463c07561d9da810088b7f6cc766038192ec995486de08c421e1dded SHA512 ba6fd1852b9b226f2a418670df78c75e0a8bb509b23a0a4cc9b806daa82f4f6f0af4624a13f2788931ec758635549df31a0b2c2d6588388695523a7d511fd055
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index ae17a22381c3..dbdd911cbd1a 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 08ab370ba46d..34e212ab9dcb 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,5 +1,5 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 DIST libssh-0.9.5.tar.xz 502876 BLAKE2B 8ea07bf25218563cbbdab31683e679f71298e2c7c9bb2430195e84892838cd55b9025ed292de65c4942ecec7d4037d5b92a414232fca6c8e41821776f4cf815c SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
-EBUILD libssh-0.9.5.ebuild 3190 BLAKE2B 1e427a29c63f83cc1e12d4042c612dba16601ac1e8b9608999ca155c3bd95ce26ec9a9d73736704659548b5b6f8a830a413968753d87c2bcc2853b16b519e117 SHA512 255b96b1a34adf672c7bc1ae27572b3aacb918b607ad7eedbb631c72bc3b2a16dcdd1f4b0761f9e49e65d112224dc4ca768cd4f03e31d585632d0820af29ae24
+EBUILD libssh-0.9.5.ebuild 3191 BLAKE2B 6c6786449200bbfd8f84a53c045d1deef8be6613593d9466d2b4946cfe75f6a31fef8d8a91c5aca9646c4bd992bbe7630bd76de46424d65c1c78c233ef64bcf7 SHA512 ba6e13ffbdcf343239ca9607bdb822367e2de28b0e32b1a63c8b02e117518345385ad12c8d83b25673fc1362b245a2bca76c383b6848edaf05baa542cbf6101d
 EBUILD libssh-9999.ebuild 3198 BLAKE2B 7c0c30d1201aa21acc97be9d08529232c9e9b075dbe861e37b987307f7cfacb7540b59f99682fe1582b6dde44fea98740c4547cdaeca81c1861ad33a9060c48c SHA512 b2ed19610d62456c42d38544aa58a7ffc48b60ebc6424b6006e1eb3b668d3ed98bf05228c23cea8806bdc92a9bac0f4821fca2a7eb7f182b9489d840a45bc81f
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.5.ebuild b/net-libs/libssh/libssh-0.9.5.ebuild
index 31c86bf94ce8..8b9314b6fd31 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 008ff3365efa..6fe9fcbe3606 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,8 +1,6 @@
 DIST libtorrent-1.2.10.tar.gz 3586008 BLAKE2B 71971124930462feb5f5083fed38ccadcfd1a2aed0d000a06cd7e0898b40a1451722cd79fdf0b1da3477047b26c7f7e3c1f74086a141770a7d143c916e96b6bb SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d
 DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
-DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
-EBUILD libtorrent-rasterbar-1.1.14.ebuild 2331 BLAKE2B a127a6db0a7266fc6f8ac0797693166aaf0104f2fa22b964d3630e1f09a0a2713e2e6b0bb089e8589033113432fdb0ec17e526e973bc224ee3c81b59984d88fe SHA512 dad2f1bfc68595be30c72a67eddc439e07bc394567144e6d81da407f5b3c115f0885815dcf5e4081264aa97a1161fb5c762285b3eee1e54ba8809adfc58ce6ac
 EBUILD libtorrent-rasterbar-1.2.10.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
 EBUILD libtorrent-rasterbar-1.2.6.ebuild 2499 BLAKE2B 6d231b994347cfec324e0d7ccd754af3855903d2cba91d131ec748ae600fed32208d0f2d0836e38232e85ea1bdad9c34e0d07e42236d9c5fc525f1ce3a88adf0 SHA512 7e324f71303f21b936fde171c3cbfbd1ec56dd4f53dd11eaffdd133e1fa2c0e07469a4d55cd1389e326caca358718a7d7b215a847a180d265c38eac66d0269ba
 EBUILD libtorrent-rasterbar-1.2.9.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.14.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.14.ebuild
deleted file mode 100644
index 917926fb1b40..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.14.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV=$(ver_rs 1-2 '_')
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	append-cxxflags -std=c++11 # bug 634506
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug disk-stats)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index c1e1f4d6c2e0..391f35c83bfe 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -6,8 +6,8 @@ DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1a
 DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
 DIST libupnp-1.8.7.tar.gz 786079 BLAKE2B 5f7764c1392f881f420f27e21084f5c98a6fce711f82a3e83dd21e22bf01f25348cbea377b2fae2d69133e4926ae3f8bffcd870e31c4f29b0fe20214842765d5 SHA512 c02b82e33e4c4d85257f0d282e3c4fc1b14a9f42eebdf12318ce6fb75e620bb0c103f9531e87be744fe70898aae9f67db4b5a187a23bcace33427a5fe7d3293d
 EBUILD libupnp-1.12.1.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
-EBUILD libupnp-1.14.0.ebuild 1081 BLAKE2B bee3c9b5418bf29e4c595073fe35c0d54339a961d1465a797eb2cc6365a7375ffef77fcb57cc33f304e4df6f1ceb86fed1b599c6807b68f64763d9478d80a7f1 SHA512 ee0bf108998fab201eacbddd16409447355c9d06b1c1566069f922c9ee2acbac93584fea87625f1425b879bd094e658c53eddae9ad720efd945c07da8ee6dd91
-EBUILD libupnp-1.6.21.ebuild 1044 BLAKE2B c83d4cf4eb687836b5f77b61aa7544f1fc1efb7b0ee751874801b0ec5ce0d521c7fca9f994d921e50d6d521017e0cce5dd90c39efc7facbed09b913bab2992f0 SHA512 c00b0d9075ef638590f7bd88a7fca1ddaeea7b551be515fd8795ef31075ae420fd07452c51712b0a4af7b1141d019a646ced3e67fb9badbebed6e35b0d215b4d
+EBUILD libupnp-1.14.0.ebuild 1082 BLAKE2B b0cb48b4ecc17ab31c3f81f7494e08dfe6d88131c7beda7af563f2121dbd668acc487ec44404889b7dbe528b0653625dc86618c93e9169ea1808a47b0b612781 SHA512 c60ace6978721467d52116c7d9d5ae23cef7ace0c48bc67b47d0a455f3dddcf05c207383105e7b241e76a6868f09f41564d00850e8ac933700ae67e0ff095b4e
+EBUILD libupnp-1.6.21.ebuild 1045 BLAKE2B c18ad1a6bd1921fd36231a872a3a6cb5f02cffd54eafd1a38578ad233679fd24220dfaa5cc71fe16a66a042b72c6e77189304465bb3e2f82d81bb19df4aafb46 SHA512 fb3556c66d4f250e6a84524457f97fcaccddf8a7f41cb1f98ab38cb9a6de78118482b9051d67aecc2d57bb9f034e12f5b265bdbd5f26ef309f692c7d37cdff4b
 EBUILD libupnp-1.6.25.ebuild 1045 BLAKE2B fec4de0cd91eb2621093f2e781c69a156a80c31cb84d625f2ff11cb9ae0ec7ae3f50d21e9a43d617c2ea9d89839feea1cc7b14559fbe87039f1d646793d3a144 SHA512 ed91708822c127df4d44ae12c48e7865cfee01baed2065ef86be50e3dce31c4a1ae83de0477f743a63c112139943a018b16a66f8c48d49765e78b2dc85a5ee18
 EBUILD libupnp-1.8.7.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
 MISC metadata.xml 703 BLAKE2B d58f26b13f9fbb325262d2e1321fd1fb9ad2d5a9197d513d6be56cbca8dbf4f0d62f035fa08122c581949bfc99efe6b40f309b7ab640c3be6e254958ce161077 SHA512 138228cb53146848897306aa3a398655dd0cf8a3d52b16379de4c5a9c7e302602533e1abe4fa111bb6c870a9e5758a2f3cbb5f45e4a9b5820c6e475a08dfb6cf
diff --git a/net-libs/libupnp/libupnp-1.14.0.ebuild b/net-libs/libupnp/libupnp-1.14.0.ebuild
index a59a58ebb3d8..263bfc91655a 100644
--- a/net-libs/libupnp/libupnp-1.14.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0/17"
-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="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
 # bug 733750
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
index c461be28e518..fd3799cd52f3 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/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index 813697c35b8f..b5b77b314731 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,10 +1,3 @@
-DIST libupnpp-0.17.0.tar.gz 475725 BLAKE2B 568ead87791db1a41a4e5f93280cc8560336516cf676e1b64c35d0835579501ba61b75ee41e1dd1e58024d771f6f077c3c85515929be1c059a51ca314756fbfb SHA512 da7ef2453a8fad1e226c6252a84d76bf874128d306d4f9ca53e77e64734d113f3ad6dcd79549b2fe2a3cfab22243b5dceb1b7bd1fffeb512ed996b8fc680667e
-DIST libupnpp-0.19.4.tar.gz 469296 BLAKE2B e1240446bdd48329138183015445778f89abc575ade64a15c8564d2d3a6992b73c8fe7d0e9e99370f37ea851e65fef0a6b52e0fd274d064a5cdbc65ab2129c2d SHA512 4fda8ef9046d18b39cde4c5c6cfca4284f1f6ad76689cdab5a0d584b9fae17adbfe225542b81b88c62e62b65584dab38211a0606ac02ffd0f12abd13246c040f
-DIST libupnpp-0.20.0.tar.gz 476361 BLAKE2B 23c319e506a073b769437a842db6cd03709d834cb91b9c7626fdd3ff0573c8a654b8de91f180d152885570e42c53fa58e7f1602f932511a89b532340958329b4 SHA512 18b3026e65b3f1ae0b8d61154325e7f89c808fe2281d7d514358298a29152a4b5903f5cad9d8bbe9db34c5f57efe98989efd9d99c0b512197eb4554b3a4ff3cc
 DIST libupnpp-0.20.1.tar.gz 476369 BLAKE2B 8ba72486524c28789564db46e64804289f12b4fa4f249fe4f54830488d80f04f519005ad2f5fd8c3a9626c602a4673d7655177a11586fb43b9bd81644cf7fb3b SHA512 17ad11b2898abbdc57ed96280c298a6c94943f3e79101163cf7cace06a4d36058c0d54f0eaeb5da9b9cbb40a23f0597a6a9658060aefeb714723c9c53404db80
-EBUILD libupnpp-0.17.0.ebuild 458 BLAKE2B 56faef6ac3d1faac63ff7aa4a9605e0e760c94b8b86c1b78976067d992bacc017acf79579631aa9a699ea714e5db1debb5fc884d5780b02033af0aa185844319 SHA512 498f497ab2ef02b4c6a69780d6b74a180b510948ec4ec5f9dbc4dab16a04b18c09667d09f093a4b1fc637f89f449ba7fc38f4d873d14c2f3e950740efd2c85ca
-EBUILD libupnpp-0.19.4.ebuild 453 BLAKE2B b752e9674976be636fb56a05d438c0eaf8540586a93b9e0b808e9eeac1af3ed7b6840d24e9ab1ed8241c5661f0ca61a7cb7215e45cc7945d04f5e3d9cee1a808 SHA512 68f364f11638b206dc7506397f1138a0e46fcad20f742d189b21dbe63c3a90489b9efaec465c4c8dd406647c81ede8afd3e8440a24307a982c58905e9ace1aaa
-EBUILD libupnpp-0.20.0-r1.ebuild 470 BLAKE2B b7e0b16eff0611bed40f78bd11b2a97af1c7744e8219b042bb17ea60e790fec786b4f9b9830bc2a0e1207e24da7642fd203962c52810c33a4ed64439280ab452 SHA512 77363de1d8cbd273db9fdcf67403eb991336854617019b80bdd29bf0c67896e754ae57088ab13594dadda3ba45c4135339a79d5347a6dc96a7da55b9f80c7f8e
-EBUILD libupnpp-0.20.0.ebuild 453 BLAKE2B b752e9674976be636fb56a05d438c0eaf8540586a93b9e0b808e9eeac1af3ed7b6840d24e9ab1ed8241c5661f0ca61a7cb7215e45cc7945d04f5e3d9cee1a808 SHA512 68f364f11638b206dc7506397f1138a0e46fcad20f742d189b21dbe63c3a90489b9efaec465c4c8dd406647c81ede8afd3e8440a24307a982c58905e9ace1aaa
-EBUILD libupnpp-0.20.1.ebuild 470 BLAKE2B b7e0b16eff0611bed40f78bd11b2a97af1c7744e8219b042bb17ea60e790fec786b4f9b9830bc2a0e1207e24da7642fd203962c52810c33a4ed64439280ab452 SHA512 77363de1d8cbd273db9fdcf67403eb991336854617019b80bdd29bf0c67896e754ae57088ab13594dadda3ba45c4135339a79d5347a6dc96a7da55b9f80c7f8e
+EBUILD libupnpp-0.20.1.ebuild 468 BLAKE2B b6bd8c63567a181d1e9ae87bb54d5f9fb6e5de954d0bb64b55e1caa285ef1695e665333c06eb66b36a240135fd78d73a695008b8206e2b0a8e6e7be5f1bb4735 SHA512 d718d37a22d695037529e84f9592e06be94978dceefc6b5ec0e9af4a9a9ec83607d5fae674c92bd0f6aae0789430190cb41508ed524654a1927e55e3ce78e8cb
 MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/net-libs/libupnpp/libupnpp-0.17.0.ebuild b/net-libs/libupnpp/libupnpp-0.17.0.ebuild
deleted file mode 100644
index f64ebade3e90..000000000000
--- a/net-libs/libupnpp/libupnpp-0.17.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	dev-libs/expat
-	<=net-libs/libupnp-1.7.0
-	net-misc/curl
-"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/libupnpp/libupnpp-0.19.4.ebuild b/net-libs/libupnpp/libupnpp-0.19.4.ebuild
deleted file mode 100644
index 638dc365a3e3..000000000000
--- a/net-libs/libupnpp/libupnpp-0.19.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-libs/expat
-	net-libs/libnpupnp
-	net-misc/curl
-"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/libupnpp/libupnpp-0.20.0-r1.ebuild b/net-libs/libupnpp/libupnpp-0.20.0-r1.ebuild
deleted file mode 100644
index 2ffca9d9e1bf..000000000000
--- a/net-libs/libupnpp/libupnpp-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/expat
-	>=net-libs/libnpupnp-4.0.14-r1
-	net-misc/curl
-"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/libupnpp/libupnpp-0.20.0.ebuild b/net-libs/libupnpp/libupnpp-0.20.0.ebuild
deleted file mode 100644
index 638dc365a3e3..000000000000
--- a/net-libs/libupnpp/libupnpp-0.20.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-libs/expat
-	net-libs/libnpupnp
-	net-misc/curl
-"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/libupnpp/libupnpp-0.20.1.ebuild b/net-libs/libupnpp/libupnpp-0.20.1.ebuild
index 2ffca9d9e1bf..8e126f564445 100644
--- a/net-libs/libupnpp/libupnpp-0.20.1.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.20.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-libs/expat
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index b3d7da65e4be..dd4559b65cb6 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,5 +1,5 @@
 AUX libvncserver-0.9.13-test-fix-includetest.patch 1626 BLAKE2B 1a2bab37cc2716a0c3912a2d1b76329c81bc8c3c6b9a881a0813ab035e05a06683a908cb0ca55af94d8682ef6e0153c25d93dd09381ef1079c93808a0f7d529c SHA512 7cb35e32245152e0fdc10fd6ca80221bfe1d5a75ed9407e9d69a3082bba24cbf8868db5dc36390943e09f0beeb3a366f994ecde62c6f9d7e7688ba749249bf3d
 AUX libvncserver-0.9.13-test-fix-tjunittest.patch 989 BLAKE2B 2ebe6a5bf1f04bdb188ed9a3ca965a697e995268f2e65fb7de37da663cef91672111ba0eaa1d25c4309e3f600240042e773d342996168b8b9f2dac808004b140 SHA512 6ccee0741778ae7d504acf250bffdc2231556dbc1357fd08bf54fd769e73159c3c27714c512775266f0e1cdd145a61e029645a6676b198dbc8aa6bf7ad0ca04d
 DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643
-EBUILD libvncserver-0.9.13.ebuild 2142 BLAKE2B f07c954ca65b929c33136c95e40bd5f5a545e7611c700c227317996088a023ef54d8a26a204cf2edc01a1cbf2b705c5ac8b1aedf24ce94d9d498e8795c1318db SHA512 0a63092ec09675eb0893e9f1e4d39a6a252913d0781b42cacff4fc302c86b08b916c87794e128aeb22481a3f207684d5cd3b6c148df40a39fd3c52fa3993c98c
+EBUILD libvncserver-0.9.13.ebuild 2143 BLAKE2B 00fa036ac6f7970c746584fabefcc6b3b2c99b30efcb8c9f559a6da2969422a4cb0b60fcef05727985d3d6824b199bb70b6030965630435b01ef92aee8d166f9 SHA512 feb1fa1c6400be6c0b3d90e456af396c18b0849d19c16002cbdfae7fb375b33c2022cf53de969f6c38e0dd0a87b0450d5144f13c6033efc5230603be7cde1388
 MISC metadata.xml 1047 BLAKE2B 28c16623c5e871d4099bc17de390cfce4b791c88884e0acdb22d31e6b05e164427d133dd22159778a50117cb41cf0008916c8dd899afa1aef03656b8adaf809e SHA512 3284ae298ac2262fd92d24aee84bee384d149ee7b6929738c0c5fab5ff41f9a1d72605bc26178339c2aec3b91b2aada2654f2daa5d495a158ea2d495d21d4927
diff --git a/net-libs/libvncserver/libvncserver-0.9.13.ebuild b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
index c513bda1f85d..319149c5bc12 100644
--- a/net-libs/libvncserver/libvncserver-0.9.13.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2 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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index cc6c5ce6fc97..a3bec6d984fa 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -2,5 +2,5 @@ AUX meanwhile-1.0.2-gentoo-fhs-samples.patch 588 BLAKE2B 1905d0d49a814157ae8f6c8
 AUX meanwhile-1.0.2-glib2.31.patch 6461 BLAKE2B 1d46f23d60776dd3f3743ca8c892828b966bc3bcf679d7e3f33739fb1d54fe999bf9ff605590c7458b3d4e12a374109903ba53bad1763e343c30224c506b89bf SHA512 b22a45ff231f33294808e65dd0e0461810be26078d94493c56e3e0303fa9d5606f7916f14edee7f94a2b78574300ba76df433b9e3c1ba0b5df3da0d07aa9ca70
 AUX meanwhile-1.0.2-presence.patch 1163 BLAKE2B ba471439dd6acaa5e4b3db78432b76379570c8bde5c760ce0ce388ef33b41527e43c001445c7bfad3e998590c8e80e13b6b12723d340bfac338e9394ed4b8e9a SHA512 f4caf5f727464b044ed533abcb3929227bc55cba4132b55587411ae5c78c320c916924c5b9228a34634af68f4a00d8103616c64b4b77f04e15f66d8ff62dbbd7
 DIST meanwhile-1.0.2.tar.gz 479325 BLAKE2B 70b032ab9b1fc6f556a16afceec5eac72b8efc686977734c84068fb34e49fed01c2c20743ba058cd99de155dd0172ea2132c8bdbfbbfcaa572f889c15da96e01 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6
-EBUILD meanwhile-1.0.2-r1.ebuild 964 BLAKE2B b645424fa220c1c176813b96cbcecf219f1505112b707f101e00b1a58d444eb55b6438854bb4884216dce13d4b2e74c94545f64ee36a29994efb7f4b729aa288 SHA512 46461a9fd8e760d9911e29a8baf920942823d05976b6926c8159c0aa83c59bd76d5fd246e1911952769b86083b772964f5d34c28f375eb7f79e9cd0932e65a6c
+EBUILD meanwhile-1.0.2-r1.ebuild 965 BLAKE2B 153cb5df52305410c7104607117f6f54981e9cbc1cf27f70e21ac36b34c40a3a2433c62db25f6b3aa61cf9dc3606716d99067a971e7f47e07d223b1a9affb18b SHA512 c3e8440ce476933dc4acda6a5f3253157d004bb61901052b7d2011ecdd945861bf4a97e0f3ba99867753a7aabf07e42cce10fd7bd361b805fb17ac75025ea370
 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 e2290db3cec8..ef7794fa912b 100644
--- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
+++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc debug"
 
 RDEPEND="dev-libs/glib:2"
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 948968bae0c7..c462aa1caab0 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -2,8 +2,8 @@ DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1e
 DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce3b5eca41ff1d76a47fd863139b8bf3e102c5e4e8d22d5cffcebc64cee9b8f746f8d6669f0cbccf124fed9cc SHA512 62c55e16609d657ac56bb4a2fd32a10ffa72d5694aa1369be533491a6683034ed42843d5f19ed06cf8c1b7b8ba11b74f9839cdfeef4afc3b2d7b11372ed85cd2
 DIST neon-0.31.1.tar.gz 867810 BLAKE2B 7b7d0c8ab635446c98f3db7072f1dabbb74ad9f579086f209bb3af5460363520be38886a299d22dc0f27a091f322c6d5972a00d4e6c612c710dca12e7620f850 SHA512 00d7297c102ee828d84eb28c9b6a57e66290904acf5327f8a6d3d1759ffacf88329bb2157dcef418c69e93d1370ccbd591829da06c01c3f44aea6c7b92462c13
 DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c6499413b523ff82e00d364d6d9c5ad96875795330e2fd9c42a42b073e3eea51b6cc0ee9e9a21850763f0cdd0b97e SHA512 1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c
-EBUILD neon-0.30.2.ebuild 3384 BLAKE2B 40efcf9e37b5d3ca1c7e1776e27539a0c234fff5893fb1d790e635c5641efdda825d4e3b5eac0ab97689b020df2bcad84b44146d0efc1bf8a6972b0afe605766 SHA512 a55b598f86bc68aecae3911ed788aa828b6cea7ab91ab584dc83bfb2ef4ebc5bd2a1f7e28fbf67012b5999641deba292dddbc8290ca0394a8570d6fcd7945a32
-EBUILD neon-0.31.0.ebuild 3393 BLAKE2B e242b67cea6c7c0991c296631e08b3ad40ed9a9c33a15a9493ea459538f68fef7bd64c2b880298d25b7ec7cccdf4a26e298cdf9362316ff88aff60374a2eee2c SHA512 f845fddbd642ea4db2000b3e0cb217488ee89c7861ce0e2057026ee89e7c4f76e8e5b15e8f7bde42f615849ba518da94c0f3cbdc88785b829341badccfa07ef1
-EBUILD neon-0.31.1.ebuild 3400 BLAKE2B c5684a22e53c3e1377508e40c916f8303a84087bfd9fbabec8c4fd72f0df2cc2e8df89609f97acc8961721f074653b88bd864c2ad1ba7ea6bdb20211343ce144 SHA512 4b322f0fe5e82cdeb50c06d75abe84c9206a69d779379ddbb3604bc46300019c986acb12e3c6d8f7b37bc2f9a1b119d3368d7dd6dff2c9b6bd00ff16c8663d9a
-EBUILD neon-0.31.2.ebuild 3400 BLAKE2B c5684a22e53c3e1377508e40c916f8303a84087bfd9fbabec8c4fd72f0df2cc2e8df89609f97acc8961721f074653b88bd864c2ad1ba7ea6bdb20211343ce144 SHA512 4b322f0fe5e82cdeb50c06d75abe84c9206a69d779379ddbb3604bc46300019c986acb12e3c6d8f7b37bc2f9a1b119d3368d7dd6dff2c9b6bd00ff16c8663d9a
+EBUILD neon-0.30.2.ebuild 3365 BLAKE2B 54533a357b8c40d42e63186169e8fa3ba7ca5f9f74b30dc922835570f599624db4e72326fd3642a3cd529c164d7415453a8f7682c434bebd57c8a7a8901f3aba SHA512 b3815f0f7b3b9732bc20bf59988cac10f6006d564173329508aeb97c95e6f888ea05a78c3a0ddb7ad27128cc26b0290920bafb0652928c8f9b3f94e98dae63ea
+EBUILD neon-0.31.0.ebuild 3373 BLAKE2B 051dcf66a8b7d1b6faa9fd838aa3d48e18e487c0dc922cde94893da5bd0ea64c56769d768668b39943700f118d588b8fcfe5421ff22efdd99053e42de260a425 SHA512 4650c8a78693e6a344ee6dbd9bed6817f5b6d10f44cd4405f9ebe61dd06469f06b8a790c25c2d4805edfa2d6ab736c533d825f0457062fe2c903cda747ea22c8
+EBUILD neon-0.31.1.ebuild 3380 BLAKE2B 0f01e7dde01894a50a8398bb482c2c6f08ec00072fcaeefeac0d10c30ada7cee713faa0e45720dccf4abb8b88dce345eb4ac81fc456e6716dab3ebf66a35a503 SHA512 035883c814b79d3fa3c7bca6eaf720b584884ed92ca75d0b412773ed8d2265ca5d33a8d67712dcb04b67377dabf3783bcb7577ba43aa53bf7190d0146306b7e8
+EBUILD neon-0.31.2.ebuild 3380 BLAKE2B 0f01e7dde01894a50a8398bb482c2c6f08ec00072fcaeefeac0d10c30ada7cee713faa0e45720dccf4abb8b88dce345eb4ac81fc456e6716dab3ebf66a35a503 SHA512 035883c814b79d3fa3c7bca6eaf720b584884ed92ca75d0b412773ed8d2265ca5d33a8d67712dcb04b67377dabf3783bcb7577ba43aa53bf7190d0146306b7e8
 MISC metadata.xml 1417 BLAKE2B 5feada9aceaed7ca6c5db29a993c24f049469f2d7d1ed57db5ddce3277e575a850ccc45700bd620ee503f3cb1abe7a9b333066b7be50bb7fd5f40f558dcfb0d1 SHA512 cef52cfe791a0b561a2c4472fb3d7ff5e878f8bc7fecf4095568b215724ce16edd866a6033d4be730d22b1297615119ae17bdeb09dfcc8555496a610270cfb97
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index fca4daa7349d..497a033922f8 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 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
index a13f5f590f94..26932a522067 100644
--- a/net-libs/neon/neon-0.31.0.ebuild
+++ b/net-libs/neon/neon-0.31.0.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 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild
index d3724b859dbb..091e0e2457a0 100644
--- a/net-libs/neon/neon-0.31.1.ebuild
+++ b/net-libs/neon/neon-0.31.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild
index d3724b859dbb..091e0e2457a0 100644
--- a/net-libs/neon/neon-0.31.2.ebuild
+++ b/net-libs/neon/neon-0.31.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index d7d241d3871e..155b519df39a 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,4 +1,4 @@
 AUX net6-1.3.14-gnutls-3.4.patch 943 BLAKE2B 47b21caeb130001c44a44d84bc9a6fc459f3e5fbd5c6e19762e41dfe0b8ce04cde049d0f596f4c05d767f0ff0fa76ce56c4881753542bae4ec215cb4b4769a62 SHA512 8fe45b816d21d5542aedcd88cde8013815a9035c51174c6f6f5ecd90eb75380a68c4d376d2c5f45280fab38f662bc0f7a97815e8bdcb335030cd0534c30c542f
 DIST net6-1.3.14.tar.gz 483549 BLAKE2B 171251fbd24eb76cf06999d64ad818817e92abb190b9df71a75c7f68e04a5012e555767b49d99cba8dcbb060e70830bbf47d8fd046381ffbd23c036258e56a7c SHA512 6a604d51da32b13d61a45d3927e937c2fc5dc83061ea4312df363a57ba1a9830215e0a1b794914790d4606411cc71211675ceca86609614718aaeb998598c5c0
-EBUILD net6-1.3.14-r2.ebuild 775 BLAKE2B 204d9d62e812cd2d80c0bf64e45910827ec1075db75ce9b7a2bd812542301ea7bd53e7b5108b82c203eab952147ca41df5602c22ca6995402268a6c9160bd932 SHA512 573f3f3327411f23c957b37112c404a0d73a121779d1ed72c869b36a43380d66a1885cff56b6498b302e0dbad7d66f23ed9eed17494f3fb96b4d83e2b0b36071
+EBUILD net6-1.3.14-r2.ebuild 776 BLAKE2B b590530ef451ef20db1db2490c12222fabd717ea126868cd40cdbc70f12a0a6d8339c6c54f8ca86db66d94a6d7f3f262eae27299728d231dd5c179b177137279 SHA512 73e4f9a140487e5f9d5471a59206251e4809c697cd3ee91e051e912787c13c6d46c9e00af0ee793468903cdfe7389e58894648762a4eebe95eab270973be71b5
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-libs/net6/net6-1.3.14-r2.ebuild b/net-libs/net6/net6-1.3.14-r2.ebuild
index d877f7fb83bf..7d269bc823c0 100644
--- a/net-libs/net6/net6-1.3.14-r2.ebuild
+++ b/net-libs/net6/net6-1.3.14-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="nls static-libs"
 
 RDEPEND="dev-libs/libsigc++:2
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 5ef7bd18eebb..41a3e4c90b6f 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,9 +1,5 @@
-DIST ntirpc-1.7.4.tar.gz 373897 BLAKE2B 7354c5d6114947c8d66dcbc4fb933ab38237dd70eeb318278a658946fa4ec354bcaf7e90ac210f39f76b6d8e60f865c0c63ecbf7cbd8ee1e8defa0d7622cfb51 SHA512 076d789edc3fdf0ddb75437196b72b1aef78780d579ae4db0bcc116a1a92ac861fc77e1611070f2d3df003bfec7883ab20653a3c2f2255c685aaed8e7c22ce0f
-DIST ntirpc-1.8.1.tar.gz 375019 BLAKE2B 3c774dbb762759f920e4159aaf5e4942c13837413bf72ab17298298a15278bc92332f8835701e0895f252596c21ba0d750c5f7f8afcf9104b8118745208fb1ec SHA512 a20749afb6d1f6216d6f5b6c9c29f6d988064d9cda8d3bfd855e62ba0ef88c7b47026d79c77be815c21eb91af0fcc6566af85df2401b5cef20c7ddfa5c5525b1
-DIST ntirpc-3.2.tar.gz 386961 BLAKE2B 920917b7ec08e2d4147785e1753596f035de684ffd92fb55fdf553bb4e19160e40fb829bd867d5a3a43f36568f731f71c31f135b6fe07fea2a6088f27ee3c6ff SHA512 8e9b5b3e607e28c4033c5986dbbc248d0edfeda6138b3ff51cc0760dccfb1cf4a14ff6bbec4330421b1175c3b1b04a34a43f314c97be2758fe0331b775f86021
 DIST ntirpc-3.3.tar.gz 387212 BLAKE2B ee656510cadaa041b4ea389710f667021e07697744dd60ce71f4e856ed91339cc5373bba771ba6bcc09d86e32502339bce7fb1c7e8ae411ec38ebade87cdb735 SHA512 c5586be51960c682f719dc0aae21846cb1af6bab10c1d3b946570508947d281f776595e2f0d12edddd9d0289e737fc2fb823ed5060dba6b6e5c6b01f28c84cde
-EBUILD ntirpc-1.7.4.ebuild 742 BLAKE2B 93c4145127a2f983cc2b191c6b44efa9e41341ba5302ee64c2677e5f890c55490e10f95b9b0e42b736d882519c934c2901b98eaceb7c717183167fdab0653fcf SHA512 3fa5703d9a040e0ac6d7a39238a883c78d571a8a13c0a6ced4bea0d680062300e3e65a3ee2d0d39ff49621c76dd8a70403a6da815b35ac0200c8cb957866b9d4
-EBUILD ntirpc-1.8.1.ebuild 729 BLAKE2B f6091c215b71993ce7bf0f2e98883b8ff46a6e2ff01b11a558cde8a969089d23160e4175029ba96621e3c6bbd9c0b40db1280d91ed4e1c0f591ee6ea6cb66d23 SHA512 a044725c4b0b359f304e3a6e27e9b8c4d228adee6da442384a4b79b6cb30b9d109b4925f819f44db2219d96a8fc4ccd48f715a6083cb324d4b4f2f72cbffbd73
-EBUILD ntirpc-3.2.ebuild 772 BLAKE2B 95943668a81b6c31748a2b31d28ef1519db8439b75deba668f79fd7c1a71f18cacfdbe99e675c4f5f1d5849b4f49b06acaed9cd65bbb90c55350798f5b839a4d SHA512 958676bc8a9cf9641aab4a51b7328aac659b92771e59bea9861b8769dc069de76b5f630c33aedc4acc14c3b82d5d9eedb9ac312b5dadf9b415562d84466d39cf
+DIST ntirpc-3.4.tar.gz 387376 BLAKE2B db4d0fd22f1ea46da6e40a613848f9fd396bd85cf01968f5ab976627ab787e8d1bc2a57a8bb87f2ffcaf63b8e59c6ea41145ed9ccafc66d4ba420a15c9a78901 SHA512 913bc9f3208ddb667a7fab6e06585ba15ac3dd1979a15846f49114f54a270c2174a00afc3009d6158851aed779046743dd1ea704227122079164c07b394c01ad
 EBUILD ntirpc-3.3.ebuild 735 BLAKE2B fda86f45c8b96b14197e772659e34b779b3c2813ad47468ff2b57eaf0608e9d7ef7bed29850cabf8abf378c84f77fe8e9b1bd8b0445d47f1158a5b2bd7fe9f56 SHA512 49d1d92954d8c4f6fafe04a55fdd680358b31fe5405951ac821348097f2c6ee6732f2dc301a1b78f8b00600c0406a7d09ce13cd2338590fd2d640261487bf491
+EBUILD ntirpc-3.4.ebuild 735 BLAKE2B fda86f45c8b96b14197e772659e34b779b3c2813ad47468ff2b57eaf0608e9d7ef7bed29850cabf8abf378c84f77fe8e9b1bd8b0445d47f1158a5b2bd7fe9f56 SHA512 49d1d92954d8c4f6fafe04a55fdd680358b31fe5405951ac821348097f2c6ee6732f2dc301a1b78f8b00600c0406a7d09ce13cd2338590fd2d640261487bf491
 MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c
diff --git a/net-libs/ntirpc/ntirpc-1.7.4.ebuild b/net-libs/ntirpc/ntirpc-1.7.4.ebuild
deleted file mode 100644
index bded25ea259b..000000000000
--- a/net-libs/ntirpc/ntirpc-1.7.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
-HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
-SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gssapi rdma"
-
-# Since the GSS option only controls some extra files to be enabled,
-# there's nothing to list in the depend string for it.
-RDEPEND="app-crypt/mit-krb5
-	net-libs/libnsl
-	rdma? ( sys-fabric/librdmacm )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_GSS="$(usex gssapi)"
-		-DUSE_RPC_RDMA="$(usex rdma)"
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/ntirpc/ntirpc-1.8.1.ebuild b/net-libs/ntirpc/ntirpc-1.8.1.ebuild
deleted file mode 100644
index 7ec7709e46d4..000000000000
--- a/net-libs/ntirpc/ntirpc-1.8.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
-HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
-SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gssapi rdma"
-
-# Since the GSS option only controls some extra files to be enabled,
-# there's nothing to list in the depend string for it.
-RDEPEND="dev-libs/userspace-rcu
-	rdma? ( sys-fabric/librdmacm )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_GSS="$(usex gssapi)"
-		-DUSE_RPC_RDMA="$(usex rdma)"
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/ntirpc/ntirpc-3.2.ebuild b/net-libs/ntirpc/ntirpc-3.4.ebuild
index 7027d1cf5ede..6e63e824706b 100644
--- a/net-libs/ntirpc/ntirpc-3.2.ebuild
+++ b/net-libs/ntirpc/ntirpc-3.4.ebuild
@@ -17,9 +17,7 @@ IUSE="gssapi rdma"
 # Since the GSS option only controls some extra files to be enabled,
 # there's nothing to list in the depend string for it.
 RDEPEND="
-	app-crypt/mit-krb5
 	dev-libs/userspace-rcu
-	net-libs/libnsl
 	rdma? ( sys-fabric/librdmacm )
 "
 DEPEND="
diff --git a/net-libs/openmq-cclient/Manifest b/net-libs/openmq-cclient/Manifest
index f77279a357cf..454408cb19c5 100644
--- a/net-libs/openmq-cclient/Manifest
+++ b/net-libs/openmq-cclient/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.in-4 1877 BLAKE2B cf373e35ecdc205b92864af496c30e464e24d59dbf175396b5edfd13b04943ff61d9271eee1e616eaec5c669fcb99809bbf665980207f7e4c270a7c20efd46d7 SHA512 ea4d441035f275df31c28a05100377b40e7ae282767f74e247bfba31739b7f6462d5e94938bfc4aac6c4f2d78c792a10d941e01e5b8e0c9cf412bf7d878dcf33
 AUX openmq-cclient-4.4.1-aix-gcc.patch 376 BLAKE2B 14f7a71079468da60aa30a422d79dce2be877928d63cf4c4e802639b94df10afa37d2f41c735f4987067a1a2e564c757016e40ae03cb9612b2a97263af690d7f SHA512 c7899238b90072a26a8bf1700940d30218d59629b8acea8699f101948f2d659ea684fb73ba560adbbe171c36eec3ae244a9f1707349647213518a654d48c5725
 DIST openmq4.4u1b7-final-source.zip 6892740 BLAKE2B 0101648b1688411579b5d1133714b79af24788a548643546de80a708028a1c08af92e2534767eb0bd9f9eddbb16e77a1884880a5d4f9cbe4f0166dbce0b2045e SHA512 4bc51a3bc0a82ae41998ae3d60912d807ff069d6165ea9cfdc1c6eefc9e57b00ad91d6ed2efa032e76be744db3328511bb02023d14a64bd3b64c8667982fbe8c
-EBUILD openmq-cclient-4.4.1.ebuild 1882 BLAKE2B 4b07549794f2b2adafeebdb734a7f88df029ce0e70c5e305709ddafeca40b59c180ea587a52cc3a4d29481b776851bfb5aa544f8c016ca5906bbce4188a59fc6 SHA512 cd6110491e4fcff4b0eb3223c43f9d220ed7251d379a16f168765e4442a706c1ad98dc37b8acffac32eea4b845642c183915629bcce72b60be3570135b7d63b0
+EBUILD openmq-cclient-4.4.1.ebuild 1873 BLAKE2B 7f9817d72638ee619bb8373907f9d90f181e037ce4751108a35b1d27a308c6be09d12597a3140eedfa5da6a54e339e838b57bffacafcc039d4ab60ec60e6b6c5 SHA512 4948001c166254179402453c8f291461c94e3a3b779b43c32eb970c917fbcac453a6f6fb2e80245f981b4b1f71bfb05673a3652b45ef3393ef97c35536cb4673
 MISC metadata.xml 864 BLAKE2B 5b7d8beccae5cf49a47e7986c9720788b8e307b48d45e9890a70dd268d31c7783fbabc2ff616ed82ed6af87dfbd25aabbfb082a220578ad73d2598700dc3c29d SHA512 beb566a77afec231f42d0f44dc4442c621a6341c40716d44f68f32ad517be715925635b721e57a714f38780afa90fbb30e85fb9f8350ef930309bfa0ebcb811a
diff --git a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
index 8fdd8ee4a310..0036565e6274 100644
--- a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
+++ b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
@@ -13,7 +13,7 @@ MY_BUILDV="b7"
 
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 if [[ $(x=( $(get_all_version_components) ); echo ${x[3]}) == '.' ]]; then
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index f049ad777f8b..7c699ce235ab 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -7,8 +7,8 @@ DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d61
 DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
-EBUILD pjproject-2.10.ebuild 3145 BLAKE2B 3e7fd5a37a2ddf51e1673c4ed8cffd5a3a95ff9661469f2e063af91de58098d053886672939df14ae4a3bde7d880316848895116bb3259c19e63a5d194fe3a16 SHA512 a6b5079b32b697efc140372715ec90e59c7d447d907daecc9e08e1312840b8c7f7e19d80e2e6e834740936be93ab0afa6ca6d69a2caf6ba7cb6bcd67057ed08f
+EBUILD pjproject-2.10.ebuild 3161 BLAKE2B fa70acb935516ba0da7c7fd04c8f7b77b7b94e32a68a301a43cfdcfa5e90200f266f88e70076f23bb2a12e37f810ac217ff7f3ce926f126fa6aeaf0903d57008 SHA512 ab5d1d18760d3ba41cb4445be8d6e7b5d403bb9b8d0be40a62d626c6fac005d30c2253674fa3b8322a7c74a2beef87aebb3acd1c48167dd3973313698924a47a
 EBUILD pjproject-2.7.1-r1.ebuild 2618 BLAKE2B 607df084017b04a906260d066fb28ff0a0ee11aa73430e40723c53ad87fee8298bfee203f231d4fe4fe7160521c5bcd47eff85a13a7d02c6790d42e4d29505b8 SHA512 08cfc90ac6007da1ba37c2b58417f9b71064982d818f1bf04c325501486ad8b3382d85347ddd6419ce5195539ad3c77575846eaf52ca9c92628b9bd79fa46670
 EBUILD pjproject-2.7.2-r2.ebuild 2754 BLAKE2B e26d384028d5a0211c48963100f55daa7df626b39d4d64d25d7c60adc33b2925c1f4c61af822699977a8c07cb437c227990e33a53f98eabeb058cfc111b37557 SHA512 1c1b9856f09f6bae89f3da0ed8b5a622a84402bb3f663b8fc1e9d4f435700e157511ae120fb074fa7bf02df6b031cce138c1c288649751bbc84263e39cf36361
-EBUILD pjproject-2.9-r2.ebuild 3123 BLAKE2B b46ba44852d0aa08aa43a9cb2d696b1f1065373e022224154ca49e3357ebb9e2c589b18ea00af0d65cf0270192f0c0b441bd6f723f534cd40d3a57bd796f5af3 SHA512 9ff5be65dd30be1d8b2dccf5021f1eec56e0edc348a5afea71a01ab638edbba2359f52bdd503121b1d88da8c364371556f5b52a2b47d44aa5a3081af7fe16b1b
+EBUILD pjproject-2.9-r2.ebuild 3139 BLAKE2B a99817e6681eb3afdef894148d8f864839c92042219d7c4c7ecee832b77de2f59c0f2c2412f1508e2572ed1b0d665d304386bd9e99ee7de9e4cd34c7a085ec88 SHA512 ca61e9530f5a5ce630aa31b1d077236a9fb565bb9c70ab0171f3663a2ad7a2813e967c1581e07b0f18945587c34da061aae6504e390b2b472c9e58775b913621
 MISC metadata.xml 1348 BLAKE2B ddf0fa47ffb1701bf95f3d51d04acecfdc16980a810f5af577d9cc8a31ebed5516a95e7fa6257a0c35af7fddd391da51aefa461561e48c13af4e143e7e4d2b84 SHA512 0fd1c947edacc7a5cbf615d2afb8830d7e223a493a26b18814f9bdabf7216bf2737350f7b6ba69589852df5ee409256b60dd0e8c93f81eb696d5e2d94504d535
diff --git a/net-libs/pjproject/pjproject-2.10.ebuild b/net-libs/pjproject/pjproject-2.10.ebuild
index ffbd59254094..5c724042f614 100644
--- a/net-libs/pjproject/pjproject-2.10.ebuild
+++ b/net-libs/pjproject/pjproject-2.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="https://www.pjsip.org/"
diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild b/net-libs/pjproject/pjproject-2.9-r2.ebuild
index de54ebdfa60e..74665390b360 100644
--- a/net-libs/pjproject/pjproject-2.9-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="https://www.pjsip.org/"
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index b2f00477b0aa..6365388c4c25 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,3 +1,3 @@
 DIST rabbitmq-c-0.10.0.tar.gz 145361 BLAKE2B 99b53d5178fa407225d2060584239af83377027fb6a209002d11ed54be4b49bab70ae55c86ab971394ab745a632ece6f070f9c10a9bdd330de4778edbd8e1ea8 SHA512 52a1194fab2dc8698ed065d63898e32aa004a4d68080d4aaf5cb7148cc28ad967283f7a99910d7f054cbba92b487b3a67b839b6f0bd88486ef9be043c9517d4c
-EBUILD rabbitmq-c-0.10.0.ebuild 1343 BLAKE2B e347369578894b1cdceb766e0415d35e34bf824cfd61857abf3cdfc0919638859ee32ca140a68c28bf5130aed333e1f67b5374ffbf5f1ec84997d2094102f74e SHA512 2f775e2efea67b7a11de725eb84f2fe57712c7a8713600f82f2db5ff3848f4551c54a001a14c7b3b2a71fee20d01962a399628045244fc8616bea05d42fe1e71
+EBUILD rabbitmq-c-0.10.0.ebuild 1344 BLAKE2B ed875553656f55a43d8388819e8fffb97d7ffe9a169d6e05798e6beae0fa9db971a9239f08a9fd83839ba35d14393426733c59b118b8f1d59e05dd4980ab6629 SHA512 ec5d215fc246441b44244136e85fa5c8afc81b582d35845a3df6416b343e232593f8795042fe42ca6b8916a98091863a4f14f9e446dfa79285618aa7a8fceded
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
index 87168444b22d..ff1a742535fa 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 73bd1fe6e54c..d74976160232 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -5,5 +5,5 @@ AUX serf-1.3.9-python3-check.patch 2896 BLAKE2B b757a9d1d3c4d5f9928e70a0182b3c7a
 AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.9-r2.ebuild 2153 BLAKE2B b09553e1f47e7474a579417f840ae881ac723a7d1eb57e23622a2b609b15cbd1317c95871217fea306742cbc43f041df800f03379516310042f232bb0919be79 SHA512 f648ccb2672accaf3ed7ac35e95798c8e8e0c45d11aad8f7b38b07b18b2e9c9e7cd85ed4de8b614553520fdebb1143c2a26fec8ca802caea82224a08562e6bb9
+EBUILD serf-1.3.9-r2.ebuild 2145 BLAKE2B bcd70217530362539b903a7d63b63c08d7fc47127a172c8572c2313d3fd10782df7a3c2c10c2845e40762da7af28a4af5026c3669b4ee6d4ade177d680c705ce SHA512 a8d2c104653293bf6d21ffc98e97d89c53d09fe2a7c68c9e28a58834f2dde0e9e2e5bf737780bb9f71fbd5f5e23cccadf34da51b51cc5346e94bf75f5ed5b9bb
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
index b75c44ccaa25..e83ef0fa6be1 100644
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index f125c92a777c..df4a11c7e2f5 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,4 +1,4 @@
 AUX 1.2.4-tests-pid.patch 1229 BLAKE2B 96466d9b8da797a31140d862326f5aaa3ecab0098c534f9df19ca9b44b98f9f539fa2b1aa5cd9fa0af8054387bfa19f5960200cd15d213d7c96f14c715d5479d SHA512 1b3358e7a5da2a3fc896aacd62adc70e803aa441465f1fa560745f90a48f8c46dff3fa594285fe0bf24008e572be3f20449f5de10087ea1527fbd392c0a4af31
 DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
-EBUILD socket_wrapper-1.2.3.ebuild 653 BLAKE2B 6587216cbbe8662e38e3f079f3902994880e762954f8a36bed0caa7c02b736ed88e9a2ce0e9a6d4844444d9e31060a2726a53916d78b4242cb8c09eb0ff1ee85 SHA512 bf9f490c4566ff184df86a598186dd28b3ce640a81d37a7c768c9f01c28e43defb117854a0ed73200671e5efdf9ab5bacb97b7d23011e9e878b3a57f247919ab
+EBUILD socket_wrapper-1.2.3.ebuild 654 BLAKE2B bb26492c7be4e1bf50190fdc4bb4114ed4ed22613076f90e6500fe568ff1b1363e4b84f9b72e746728eeab3115ef9f224f5d583b789ff5437404dec5dab4dd70 SHA512 68604ee3717a131e17eb8e8f165b8b05b950e9b41c4cc2a19471d4a6fc1784cc9170f292613fdf97b76832b8a785ce00ab8cccc94991d28931d3df0e023b7c77
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
index 1c99cfc52cc3..29a7bc245040 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://cwrap.org/socket_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index eeda1e3f1c1b..6d89bd6f1ca4 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -1,10 +1,6 @@
-DIST stem-1.5.4.tar.gz 1915722 BLAKE2B 37c278eab0d7c7c305d7fcb498ff39460921ff59ea16cbe97d985c742290b8ca938218cbc7d5e4d1106ffc9f6a20461a4692afd14565698abbdfbd8015cb6f18 SHA512 1ea74341a1013f1f98d3d5ed1d552e79277cf54a6337d1a8b66bda0baae022d70c4c0c9ce35c843222d183a716466d93e1df3ee55ae6cd16cf10c6cf415d3cf7
-DIST stem-1.6.0.tar.gz 2049999 BLAKE2B 10846dbd20f22b489fa885e8f100eb2ba4053aca46db140463882cbc1f5701893e6a4a28820100e05e3ed4fa5ff76135a3b20ec1af917a63f63b3abdf5361df6 SHA512 499a15b1cbd12d75865c93e253e797507564d5b5f2a9a0f021107d89c85db040e050944a9ac69b629f74e265d350467bef9d36ec52f7ef2e6a97180a7b93e94c
 DIST stem-1.7.0.tar.gz 2196759 BLAKE2B 2f4bf8a65e5e89b01e6d1054a9d7fe01d4775dc31f1846c300190320361e15a312ce35867fd7d6af2d0cb315894aa5f69f7e8a47cf184e1d9018342028ba1484 SHA512 10750266860f4f90df5d4a3bf24ec68e28d12c84c136c35d2f168f767f4facae3d02cc62dc972a08666689695ea17337a7a6b80ec1c5ed8b9e5035d7417b07f5
 DIST stem-1.7.1.tar.gz 2196854 BLAKE2B 318b762390ad5f1b8a7ad49bd442841d4552cf3d6782c7c912ca8251a076baa6d01bd6f60ea2d79f96994f7c29775c09b815ee41177c638c7e4089e5f4b1b1e4 SHA512 a275f59bba650cb5bb151cf53fb1dd820334f9abbeae1a25e64502adc854c7f54c51bc3d6c1656b595d142fc0695ffad53aab3c57bc285421c1f4f10c9c3db4c
 DIST stem-1.8.0.tar.gz 2853802 BLAKE2B a275a38e53c5a4a3771a30528fd5781c51370352dd384a77ce27b31f034bece6fef448d74008adb82d2d909104b7338b5168a1a343c799637f9e12d39028bd09 SHA512 aa2033567b79aef960f8321e4c6cbc28105c59d6513ff49a9f12509d8f97b1a2e8a3b04dc28abb07fad59b0f6ba66443b92bbefa0d08b26038bbaf24f7f2846d
-EBUILD stem-1.5.4.ebuild 1273 BLAKE2B 84c053e28a46142740b0e842d90b240b69ad0bb7921aaf939f186ee5c7a03f388e38a8a1719ec9e69f004356ecc3ae527ba99cefd44491ae32529bacc47aa435 SHA512 55719fee3ec3e61489019272a2e2b48e392b3142f7ea5c1d5f5ca8cf8b37159ad086554e447bb7a5d2ba824295e842940bc2468d7f86a6a37404682db13ec00f
-EBUILD stem-1.6.0.ebuild 1273 BLAKE2B 84c053e28a46142740b0e842d90b240b69ad0bb7921aaf939f186ee5c7a03f388e38a8a1719ec9e69f004356ecc3ae527ba99cefd44491ae32529bacc47aa435 SHA512 55719fee3ec3e61489019272a2e2b48e392b3142f7ea5c1d5f5ca8cf8b37159ad086554e447bb7a5d2ba824295e842940bc2468d7f86a6a37404682db13ec00f
 EBUILD stem-1.7.0.ebuild 1374 BLAKE2B 35cdb0469f371c54567ff80cfec32004c25528d9d0700abe383d4607bfa6e6ac34c45975a532017c5b986aad6d1632e8008ac414902bb14014e015e36e56f517 SHA512 2ffdda0ce1900d247774a0bd372f61a0e68c357b57c560e612c99f1e9348c8148c4152c25b5ba7101eec62d1351e5b5f664d1f6b0f4be03b0332fdbc8a5bb946
 EBUILD stem-1.7.1.ebuild 1374 BLAKE2B 35cdb0469f371c54567ff80cfec32004c25528d9d0700abe383d4607bfa6e6ac34c45975a532017c5b986aad6d1632e8008ac414902bb14014e015e36e56f517 SHA512 2ffdda0ce1900d247774a0bd372f61a0e68c357b57c560e612c99f1e9348c8148c4152c25b5ba7101eec62d1351e5b5f664d1f6b0f4be03b0332fdbc8a5bb946
 EBUILD stem-1.8.0-r1.ebuild 1397 BLAKE2B adcaa869e7e1c002562ef9b9116598a187f9781968bd16ff95cb6960d90434c8b9f6c1a5deb0b3fcff6b5cb8ceb1f942ba0debf9ccd5730df74777182a0fb328 SHA512 5b157f9155cd83826c334c7bbee90d0cfc11e58d0c66bde0e516d6edcd7c6134fc9e069bdf8b473410d6b88695e94c0c9a49cdebfab0c575ee1a812dabaaa722
diff --git a/net-libs/stem/stem-1.5.4.ebuild b/net-libs/stem/stem-1.5.4.ebuild
deleted file mode 100644
index 7511d0f5501f..000000000000
--- a/net-libs/stem/stem-1.5.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python3_6)
-
-inherit vcs-snapshot distutils-r1
-
-DESCRIPTION="Stem is a Python controller library for Tor"
-HOMEPAGE="https://stem.torproject.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
-	net-vpn/tor )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="net-vpn/tor"
-
-DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
-
-python_prepare_all() {
-	# Disable failing test
-	sed -i -e "/test_expand_path/a \
-		\ \ \ \ return" test/integ/util/system.py || die
-	sed -i -e "/test_parsing_with_example/a \
-		\ \ \ \ return" test/unit/manual.py || die
-	sed -i -e "/test_parsing_with_unknown_options/a \
-		\ \ \ \ return" test/unit/manual.py || die
-	sed -i -e "/test_saving_manual/a \
-		\ \ \ \ return" test/unit/manual.py || die
-	sed -i -e "/test_sdist_matches_git/a \
-		\ \ \ \ return" test/integ/installation.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${PYTHON} run_tests.py --all --target RUN_ALL || die
-}
diff --git a/net-libs/stem/stem-1.6.0.ebuild b/net-libs/stem/stem-1.6.0.ebuild
deleted file mode 100644
index 7511d0f5501f..000000000000
--- a/net-libs/stem/stem-1.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python3_6)
-
-inherit vcs-snapshot distutils-r1
-
-DESCRIPTION="Stem is a Python controller library for Tor"
-HOMEPAGE="https://stem.torproject.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
-	net-vpn/tor )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="net-vpn/tor"
-
-DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
-
-python_prepare_all() {
-	# Disable failing test
-	sed -i -e "/test_expand_path/a \
-		\ \ \ \ return" test/integ/util/system.py || die
-	sed -i -e "/test_parsing_with_example/a \
-		\ \ \ \ return" test/unit/manual.py || die
-	sed -i -e "/test_parsing_with_unknown_options/a \
-		\ \ \ \ return" test/unit/manual.py || die
-	sed -i -e "/test_saving_manual/a \
-		\ \ \ \ return" test/unit/manual.py || die
-	sed -i -e "/test_sdist_matches_git/a \
-		\ \ \ \ return" test/integ/installation.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${PYTHON} run_tests.py --all --target RUN_ALL || die
-}
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index f21512611cc2..cd5a08126e86 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -9,6 +9,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 2279 BLAKE2B e0eaac5509b28f0fe5091ff87bae959eb5e23e312e22ba67fd938e3a9f30eace1fc3bc95bc162a8187f61814c9b3f3c2a78f5c5f60363b0dd83e724aee581c54 SHA512 714dff120d673caa3f93a6db3ea3946c5c15b29ee6f087a397bf055b4898481fb71429ee8b727259d1fab485756a10e7ac2b1d417ee6802d912aa5cc1156e100
+EBUILD wvstreams-4.6.1_p14-r1.ebuild 2280 BLAKE2B 9cef63f98d6d05cd4dcbe41dae9d1cd840a0606b9d338850f10ecc3b4c2eaecd4146abf7d1876a0524f1678269c4e39da25f4003c6ce8807ae8b269f8dea62d0 SHA512 982f57b676139b047d320057b3495c60b065fe22dab3107d784576e8f83c7e2b9371318ea42d880347f03e1f26e0789962f23d2ac9d8cb1a09dd5eb2fa995de4
 EBUILD wvstreams-99999.ebuild 1994 BLAKE2B e18ee55f383342113ea3e7015a209bb1ba13baa8dd300f9393c463c379a5d656a595ba3a3efc1fc19fdbc05b18adc03b95c9002c06f8a29b69bee2eb3de8d15f SHA512 a6346862fd514dc5d320c233c85f1ae90111d285ad6e2593546c69f91aeb65b8d753ccbdf8b663e9787a98a81c0e560ef2709cfb5a7c91ea156c96475e704445
 MISC metadata.xml 523 BLAKE2B 3e0995913beec728b71c7c7e160f0a43719cdb6a47ab9d7c5ac72262098a8519e3b273bb20c0485e8d2cbce122c34b3f825bd6ee947bfbb6d793ed32af6a838d SHA512 e882c00a8c9148dbe7c1a2cb1fe8b56b78c9821bacb9ae0541322bd535e03a3074696a285d975a823570e0f09822ff0108340c12ea31aa3226bcc4ec8bf1f993
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 06f36322819b..0769d3c5d002 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!
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index b25614452fc5..a6120dd070d7 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,3 +1,3 @@
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
-EBUILD zeromq-4.3.3.ebuild 1436 BLAKE2B 500b642be77c2ae67926d932eddead3a872bb6cd5d0a752e2b7fe87f5ce4ba52b3256903f05ba62e923985637fa3c7af08fbbf504cf79b7caff2d74a7f794397 SHA512 333b64802cdafc872e5db83fc3566f6f307e07cdd668939f0c955e6bed2c156dd02ffde51fc17f393842ca13f57a5ec9f44f459eaa02d5fc9ee13331b9600926
+EBUILD zeromq-4.3.3.ebuild 1437 BLAKE2B 142fe72fd62e80465a0092dabe13abc0ec345b0db83eeb43586867524f18377e94f602a0c10911eee3ee23de3d4567d90faa5b5131fc3c0634ca996ca109e1f3 SHA512 e1949c3458b9ec36fa07e75568be7583ea9ec5c1abdbe0883e1c884b13ac98440e21f17540c2ce9e8db5fe115164e1c0261abfe2d343580be4cc4234d4c17a30
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.3.ebuild b/net-libs/zeromq/zeromq-4.3.3.ebuild
index a35a1e964c01..e826583f0aa3 100644
--- a/net-libs/zeromq/zeromq-4.3.3.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /net-libs
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)