gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /net-libs
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
70 files changed, 1018 insertions, 281 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 68c2842e724c..3f1349b55e58 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 39de9457ccec..9d41a1b8f29a 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -6,7 +6,7 @@ DIST courier-authlib-0.71.1.tar.bz2 2208870 BLAKE2B 5058a5d3182c53020c3be0a69390
 DIST courier-authlib-0.71.2.tar.bz2 2208460 BLAKE2B 49aaea85032166ba4867e7834bb2f6c8d3eccb0ebe24b94bac3033a3da2154e3162d06892354b37eb0c38db092ce0096b050246db341b18a32065c19f322238a SHA512 b0bd2356013d48a998908d4825901e8e730ec276699005696948781e8af4014e25eded3116fa5a8a38b6236e9713f454170628b51aedab7b7d2ebec082643a47
 EBUILD courier-authlib-0.69.0-r1.ebuild 4452 BLAKE2B e79a211dcd59c555ed48d02b243115a4a828cd100fa5c7970791b2de0b895f92756959521679fdf579dc682e5b8501100da9fa6a819c27ef8522aad14824ac97 SHA512 ebf0d33aea13b122d8a8a4de1449cd9bc993a2b5771c7ca02e59b0f7cb612595fd0f4467ab307d09ec13754f78fafeab168811845b5d8f174a5807ccc8fab427
 EBUILD courier-authlib-0.70.0.ebuild 4460 BLAKE2B 8dbc3fdec9cdc5d9492d500630fe5abec099ebabdc29bc8670d4a945e34550ab8df4875c79e4bd81ec46457c220f5982a2a9b2d50472de821c385b89dfe4e99a SHA512 d35c6a06d8508ddaaa8742f651dd99626249db8b7da85e3745cf1a51a58eb18de3bdf1d04df61d86a81326cda1521ef38675d7fcbf52685c3b7c4c8831feb8e9
-EBUILD courier-authlib-0.71.0.ebuild 4453 BLAKE2B 473964dca0e1dd6d8ce07fece8ab892800c30b0c97b45144047b080463e6cd02aa971e53d9cd2d4913ca66949200b9bfaf9ff6406c808e3b5dd8ecd53b6ea4a5 SHA512 847649af71b5d47f0f14d0208a5204327b2561ff97d00c14832ff470bf5d917dc99cbb93f6a4f191f7cfa2aa80840023541eb4b9b3a686ef2d6493c88003d990
+EBUILD courier-authlib-0.71.0.ebuild 4452 BLAKE2B e79a211dcd59c555ed48d02b243115a4a828cd100fa5c7970791b2de0b895f92756959521679fdf579dc682e5b8501100da9fa6a819c27ef8522aad14824ac97 SHA512 ebf0d33aea13b122d8a8a4de1449cd9bc993a2b5771c7ca02e59b0f7cb612595fd0f4467ab307d09ec13754f78fafeab168811845b5d8f174a5807ccc8fab427
 EBUILD courier-authlib-0.71.1.ebuild 4462 BLAKE2B 77343ec67e0a1806f6545e862b2f500c0125aa67e647d03083d888b623ceaa7f6d419628cf4283953919227f6c9ec79842affe91eb5b9ae731865363aa8a3c8d SHA512 cf377d4ea863ff3ad206f2a666c0c89100dd75bf3d1241a4d64695561468e8db97d6f81025c84d6a6c8f54ccab56d48496f7b3227db2ff2850f4079ef6e2c4f6
 EBUILD courier-authlib-0.71.2.ebuild 4462 BLAKE2B 9b46449737236b73b6d83517d3352d5f8ef72983de1d0dba0c44ba668a0f4d3ab9e2e75382cabfa7c3aeef60168abf2018b7d912582bb6d3332fa012a6e4d500 SHA512 69fe0dbc5cc4a8e440be73bcb7db560afb89395a6ea964645a7acde6b7d56382e53f92c1f70381eda62c395358602aa155a47d4bb09fee71fdaf061b50cd6e0e
 MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
index 2eb2f1ab6f20..1f4954c3e5e8 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit flag-o-matic
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index 836eb31afc0f..b3368959fc23 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1,7 +1,7 @@
 DIST courier-unicode-2.1.2.tar.bz2 445242 BLAKE2B 118afeefbb0d957f3a0b7a39e573edbdc3fa1d85c1028f4aca46137402f01a6b4d5df11c48e9d8235483ba277e187863d3f8f7b1cf426a1b5f2d40eb243cca4f SHA512 97d1c12917a1d415b4dfb8155e2573e0e4101112433107e252e393765fa88edd5aa8d349a2c201ea951bf0e9d51ac0f0c6444494c308fbe9909929364661bc24
 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
 DIST courier-unicode-2.2.3.tar.bz2 593337 BLAKE2B b384aaac20ae645f4eaf256c90e50dda4e7b7e78f91188fbadae9851c7fb1c994b1b91b942a02cabbea357e15bc3d9e9d64f97d2810a359604303905b3d03fba SHA512 aab25e9b095e11e5744d4148b50d95ded2a5613c48146f90dacb796eba82aaf41b0ea86ec82a0edd702ad2a8c00bb7f784e12c3ddd01777a19edb3da10a168f3
-EBUILD courier-unicode-2.1-r1.ebuild 524 BLAKE2B 193482c0ce637c50aabbd0bfafd54db751fc07720f71f6c87be788e09068731111619ce27911efb10a0673390d3f064fe2a5e0445282d262cc09ff2d16117e0e SHA512 4183e7627946a5f3ca3167fb6d73dc7801d71ca4be8b510441910b2f059eb8b045775e72b563062f5bd70f0fa08ca773cfe0cfe81c0a0e59e2967c01482d5e1b
+EBUILD courier-unicode-2.1-r1.ebuild 523 BLAKE2B 4d524358fbdab0b45b70c54dac63cfe445645826cbb382314e9b52aed377764ba281e15d134fe4df0d72d3fef62ed277960529beb6bce51370dbfd213d243202 SHA512 64bbbeac23da800df682c2059c17e162ae2b36999fce9fe0015a82469866b352c165c4757ed56d1307a2a6dfda3902fd7a510dfbc4bb7d3a1b7ee0995a20cef8
 EBUILD courier-unicode-2.1.2.ebuild 531 BLAKE2B 9f1fd38475d02afcf9a161501f54884b3ecaccb6738917630e8a80dfde9d50701bfc432584ddf0adbba7c6c8fea6f1946f5f5d7ff226e2c88eeb8220a75a5e12 SHA512 63658aa656ccdec8a9941c23a422f55bca14ba8977288ec96a8ffacc11880878bf9832780cd55b47c684a36b5b206c762405d710d4f527eefa2de221890c14bc
 EBUILD courier-unicode-2.1.ebuild 478 BLAKE2B a3b9872184bed03e527cc7a91b41baaa65a762155bdcd2d0543b4ab51d9dc307414c9a231eadd34af37051725740d8893c3aebe8f99b070da118ab013f48c1c0 SHA512 9e168562de2b26bed904d5c44b445e793a6e8efebb37b84e9a22b7c5c8ee647d671777efb054b4df173da6ef122a8c0def3b1343738f086a93cd0d1505d9f34d
 EBUILD courier-unicode-2.2.3.ebuild 531 BLAKE2B 9f1fd38475d02afcf9a161501f54884b3ecaccb6738917630e8a80dfde9d50701bfc432584ddf0adbba7c6c8fea6f1946f5f5d7ff226e2c88eeb8220a75a5e12 SHA512 63658aa656ccdec8a9941c23a422f55bca14ba8977288ec96a8ffacc11880878bf9832780cd55b47c684a36b5b206c762405d710d4f527eefa2de221890c14bc
diff --git a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
index 8015be8a0066..a80fccb27ac7 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_configure() {
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 4940b5e702e9..02b3e3f46cb1 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 1168 BLAKE2B 329b9bf87e51d55ae8f8c8b528d96f5a03417fb59cca8436eb3e382a1f0b484fd2aced56f5dab8dfd661dcf51ad24feca51dbd77df67e9549cb5c769b630dd89 SHA512 37a90add2ea8fb85d4f05cba6ff2f031f74a086af47d1bc486b007a2867f752794322cdf3fe82cea20f15eb729bba7a7909aad10fea35c0be948dc6d635edbf2
+EBUILD czmq-4.2.0.ebuild 1167 BLAKE2B 6aeb3a671a4ec525a361ba558848cbe65bab7bc9e831f04a3eb3b2c4470207460f15385e304e2293ad260967ac5ef9fe39a2e943315ef3783fb17d82bfa4f4d8 SHA512 a31dd593f9d2537e71e16320eefcd6785f9338395cb51a30de30b3d9ffdfa41f143174934d0ec794f67f2b06d35ceb10151846dadecd2fdce8dc8a314bf4a99f
 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 ddf995f59146..678a10dbc555 100644
--- a/net-libs/czmq/czmq-4.2.0.ebuild
+++ b/net-libs/czmq/czmq-4.2.0.ebuild
@@ -9,7 +9,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/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 232cd2be9d2c..1cbafee528d4 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -3,5 +3,5 @@ DIST glib-networking-2.68.0.tar.xz 237992 BLAKE2B dab2b692c48366ba71325e1808d51a
 DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22
 EBUILD glib-networking-2.66.0.ebuild 1732 BLAKE2B 6cbfdd30ba6c617476e3f650c8d410526d85eb64733acd2c540d1d17582e07d8b614f0154a80123267e5765aac42ae8160b9e948522b9c6f464731401a427681 SHA512 24558ff4378c928f7fedf49da0b8274a91bedcf52baba3f44db4e085af2bf44b6d9fc0e552937fe36c1c593b4468daa1cec69729d32c63be4d0a29a5546c7ade
 EBUILD glib-networking-2.68.0.ebuild 2085 BLAKE2B dfc363273c029ee981e018b71ddb847f4b18a088c9b09cc2404c0c47acb6a0602babc12c14d4feb82b8dc8d6e61878d0eb24918dbd0a238972db6e7df84679c8 SHA512 b274ed487420d6fab68f65282e8d10b4f20ebf0689c39f685ca6de56938ac760316e108832db853d3ddde88dca3a8413e8cb9c916543d0577a1eba865ad51097
-EBUILD glib-networking-2.68.1.ebuild 2085 BLAKE2B dfc363273c029ee981e018b71ddb847f4b18a088c9b09cc2404c0c47acb6a0602babc12c14d4feb82b8dc8d6e61878d0eb24918dbd0a238972db6e7df84679c8 SHA512 b274ed487420d6fab68f65282e8d10b4f20ebf0689c39f685ca6de56938ac760316e108832db853d3ddde88dca3a8413e8cb9c916543d0577a1eba865ad51097
+EBUILD glib-networking-2.68.1.ebuild 2092 BLAKE2B 6ed18cff2b3cdb89c696311bea781a055afa51fdd4aab0ded17b3a5834d7dde6da54073097b383db60c8833336a3ef73665f0b510acf9eaf7552ad56029ff5ec SHA512 755449e980c4c2703afa47101fb8f164541f1a5451b6a71899d32f77a301dca0793f434e87e6a3018014c0480c2608379ef6df5b01425ba79eb12eba3804a329
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.68.1.ebuild b/net-libs/glib-networking/glib-networking-2.68.1.ebuild
index 8c9ab087457f..370996a7150b 100644
--- a/net-libs/glib-networking/glib-networking-2.68.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.68.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.67.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest
index 91b05ebc3ee0..0deaf739ec65 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-r3.ebuild 2021 BLAKE2B eda8e9160233c6d7efe989356e2d410f819a6f94d40ee652e17d9c0d059c290a55fb4e103d8a3435164f6d2f0d18aa80afd1f890788675c65c3eea1145434baf SHA512 247f5ce38de9e8ad19c6be1a9fcb7754bd2ff292865a16bdd099a3e31187b523ad12e09dcc96af02bf49257c286ff62b4919960421f10bb42c8a59ae8b8d43a1
+EBUILD gnet-2.0.8-r3.ebuild 2057 BLAKE2B ca48c424db278f02683847883de06daf906ce4f555d4893da16583f3a5db33cf267e9bbd7d7c41c12fe71f470482850b019ec674f9f5f62a802d35f9cd8e7b5f SHA512 bdd19fc228fe7aeb83bfef89f09c18dff739b743dc3ed04e65b03b957b7351665a9d3df38716e25647e0330237fb0a66f12e1a36a40a028086a8789217583c40
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gnet/gnet-2.0.8-r3.ebuild b/net-libs/gnet/gnet-2.0.8-r3.ebuild
index 40c3a0ad5151..27d0d63139f0 100644
--- a/net-libs/gnet/gnet-2.0.8-r3.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r3.ebuild
@@ -31,7 +31,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0.8-context-leak.patch
 
 	# Fix usage of check framework, bug #296849, from master
-	epatch "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch
+	# Disable this patch, bug 698654
+	# epatch "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch
 
 	# ifdef around network tests code, refs. bug #320759
 	epatch "${FILESDIR}"/${PN}-2.0.8-network-tests.patch
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index fbdb58b8d08a..326ba2edea4f 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,5 +2,5 @@ AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0
 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
 DIST gnutls-3.7.1.tar.xz 6038388 BLAKE2B 1d55eb441827c7148d63bcad37bf7bc62d539ee9bc7e14c2fe5ec1d0bdcadd75e2cbc98ba104523b24c8dfd9526b4595475a818d206971cc012fac509cd33a6f SHA512 0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95
 EBUILD gnutls-3.6.15.ebuild 4304 BLAKE2B ac36fdbe080003eee3519cbc05ac7b8bcd2013ca24e5269d37d841b5199df3c4140287505b98e45943b47304adb3cd5136d604ccbbf25fcf1fbec8ece24e5f18 SHA512 891490e57eb4aaf60877a060b24c2d783a6e85807456ff6856563d4c9fe30641b101ed67934ab9a5743f868d5e1e1552029ef079f712fd9a771bb1abb3d6876b
-EBUILD gnutls-3.7.1.ebuild 4234 BLAKE2B 4bbcb12ad050cc5194549d429a161a2530aa0bcf60f7dd781d7a8f5b39e3be5d1d37405550177c5e027f64d14ff34781b51fbc624df035787be95bb3da67156d SHA512 251faee18d4b560902b235dd787e5bf48fa453b82c9896c83ea42b0d50d875790d5fc2a1c80fd6e4e39dd9970b8205b1bac50b72265d1c0f6755ac51b78de39d
+EBUILD gnutls-3.7.1.ebuild 4232 BLAKE2B 35454524038a30fcc8d83f3bdc4b3f3773710c3a0e64881e4a29cefb205385b7693ac01ee24fd97e09a5941f1e2f67a91f0bbdf23cde404c88da80fe17c0c00c SHA512 31e764285b44dbb55d5aae1b070bec327a9544211ec89e74039220816b8140ee04d35e1d78b2118d89df4f141253695741366cb85dcdfa017ffb5b39ca6f0491
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.7.1.ebuild b/net-libs/gnutls/gnutls-3.7.1.ebuild
index 2a251871c77b..82de8ba5e7a9 100644
--- a/net-libs/gnutls/gnutls-3.7.1.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 5c8a67231b19..c92657ac4e42 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -4,5 +4,5 @@ DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeef
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 EBUILD grpc-1.28.1-r1.ebuild 1589 BLAKE2B 8f45534c7e1f1ac0ac037a7a44279ba6919a15d0a4a1d587fad33e4d9ff12a3ace54488a9872d322fa0de22aa9ef934ee81ab17bdfa1edb76ea22e6e3ffb6be1 SHA512 de584b6dc05d75b1bca48adbbbbfb26a88e29287615dbdaa8e832eee097c1840763e1a71a119c49fd75e09209ed105d6edd250a739a93c4e5817cbc04d68d4bc
 EBUILD grpc-1.32.0.ebuild 1932 BLAKE2B b2c797c72c4e5c6da11a593ffc7a45d0d8b81ad24cbe3d778f813a676330e2620f5b12509fc94b4dc98af5e07bc24ff2cc0a76092e1a3416c968f2a82ceb06d9 SHA512 d895cb3981f6a0cf947e133aa0600c1e500a3d4a04899d13b3dcbe22f03dd7269b5530f13c8a2b15309e162bf828f980316ca9f9ee690a806c478e4a0c0a2cd0
-EBUILD grpc-1.37.1-r1.ebuild 2707 BLAKE2B 8259a6a1ab2869db83131e3dcdc57102cd70fde238224be2ded942a802b9824fbe3312983a4422d82cdefec69936d844ef69cf583bf9f5a305ebc7afc8b3a18d SHA512 e8a8c706f189654c49cfd83165afc023d4ea6bfaf430b66f9cc0673b411bf4cc3c7e80fe92ca39a790ebd9d73cc21ab441bd70adbba051bd5c9a3882fff90d5b
+EBUILD grpc-1.37.1-r1.ebuild 2714 BLAKE2B ea8a876d73bfc8a29f9aa60a84ab510cb74fac1486ab526cfa1f9d9de8d5208b93fefc6f08c4d22d2e75adb62d26c1a2e1b3cebb24fc95701b3a315b669c1152 SHA512 ca2ba79a51ffa8130b71492ce04fd7edc0dd8cd8b05c084058eb2f3ef26c4d92f70ad2967d35a2ac9e47ccc662c64e06fbcb7c36b6c6a6649c76b41a888a639a
 MISC metadata.xml 459 BLAKE2B e12d07ea4d2ecbaec9babc586e2417f1267067aff89d67debc7b4d5cd954bdffdd08f1cac4dbadbcde4dbdbc05147eea60f1dde419d207601bba123dfa59222f SHA512 f6c5483cf4bef3919ce69ca03d28cac0967b2b25d40a3c6d921764f8e451e191b60c5c769ab7554f536564b6b5bd4cb89abcac925d3a87779b0da10f94539bbe
diff --git a/net-libs/grpc/grpc-1.37.1-r1.ebuild b/net-libs/grpc/grpc-1.37.1-r1.ebuild
index 167a30875872..cf129dc2a38e 100644
--- a/net-libs/grpc/grpc-1.37.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.37.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
 SLOT="0/15.137"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc examples test"
 
 # look for submodule versions in third_party dir
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 2661ee8d40e4..941817c8d3f4 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -2,8 +2,9 @@ AUX libiscsi-1.18.0-fno-common-2.patch 2058 BLAKE2B 00a2d3bd1ae4b08479593f92eaf8
 AUX libiscsi-1.18.0-fno-common-3.patch 1387 BLAKE2B f8bacb84a3c340a528576f56b52026fefc97792b9d5a136150bf348e378cd60b9ea702101b8e9443a320ddafe5a21d646f98a4a3434661adb39f595e2e9dc52e SHA512 b0c359393b70ee6a808e254a8aeb58d7bea25307fc0f957696369e74d82eced2d7b3edcbc18dc0c3be0b45016bdf331183bcf8fdfe853b292861ea28238aad2f
 AUX libiscsi-1.18.0-fno-common.patch 386 BLAKE2B c87a1e2c2b582277b3146a592cf385520a20513cc349a6244cba8e55f4a8f3e7f830cf16160564b07756899cc982993fff45900f512c0cb187340ecbb7bd1e4e SHA512 fc1aae874619ba263f404da0cbb4009fc09b907c2f9a65e29e18874b18daff7f0bc243b9666f19430d5a52e30adf5c784d380162c2bb65f1c79c9084981e2c8e
 DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
+DIST libiscsi-1.19.0-remove-ld-iscsi.patch.bz2 6104 BLAKE2B 611202ca0ec046caf5cbd1adaeafb42a7d7d00fcea51e61df6c251576ea276cfe9a2168a9c3f1d4c7aa585d7ff9e90a95d8da03d86ceee2971a84c2bce8d7a5c SHA512 e826883b50e04c6dc3340b51d7b3d3f3fc2bb91cf4e5c13367341449d5a57618d5918946416994f6acbf3e13ab38bafe435fb9ad4542d5e3bb1dfb08f202adf4
 DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
 EBUILD libiscsi-1.18.0.ebuild 908 BLAKE2B 4ca51f1f01cb18445990e05ad606eee71638d82adffc2d2d02b098241575f27e293388e06af4b770171a82021c5f3d6c2232bf507cd7696369523c10f8231f5f SHA512 0592599af1fe5116abcd26ed6835a080b9514def998ffcc1829922c5d32c41d0ca71adf7cb609304e62644426aa679906004621c1cd08e1d0b9e6ea064e604be
-EBUILD libiscsi-1.19.0.ebuild 975 BLAKE2B 6e239b8f48437edd357f760a3a1c7c18ebdc8192570bf1ed4a1e42135f73e9709547ac7ce3606b9da9eebec6e7a63b6b6f5aa3746428e7904bb56e8f4eea8dd2 SHA512 142777c88a783033ba46fc6a73be7b540c766249b965ad408d4d841d731eadde16382cca0aa6ace7429c59550137bb3af71671d2a4afa25300b37e8c913cb9da
+EBUILD libiscsi-1.19.0.ebuild 1077 BLAKE2B 3c55ef59df3254c562ea0b6bf0d11e611aa2092e25b494e24a6bd522b006d2cd4621a87a94f13f14671861f5769533bb895ac15bdea895478e96f74cb079ccc0 SHA512 fad483abeaab71df65361c86cd51246daa687d455979e87b63bc83713d50bf26d6014e4144e2a03c9098ecf38c428f3d7448f12ffa240e439cdc9f9518f96186
 EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221
 MISC metadata.xml 247 BLAKE2B 3951ab56f9a5dd54a6da332a8f5a7c2b445ec812f8ba6ff6e8957e0ea605c197954b403c8da0d81fc02ee829ccbf807ee8fb929b05ff6d347e67bc22d8023c26 SHA512 8188eee6fd9f0b2bf471e9ceec1bb6459f1ef84ba7ef3dc372747043d3a6db6256dccd4e9e12596a07a04e778576e83fcb56350e59a7e5e09c43ac4dac789af9
diff --git a/net-libs/libiscsi/libiscsi-1.19.0.ebuild b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
index ac0e12e20ddf..bbf7c504a2ce 100644
--- a/net-libs/libiscsi/libiscsi-1.19.0.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.19.0.ebuild
@@ -10,14 +10,15 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="iscsi client library and utilities"
 HOMEPAGE="https://github.com/sahlberg/libiscsi"
 
-SLOT="0"
 LICENSE="GPL-2 LGPL-2"
+SLOT="0"
 
 RDEPEND="dev-libs/libgcrypt:0="
 DEPEND="${RDEPEND}"
@@ -26,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.18.0-fno-common.patch
 	"${FILESDIR}"/${PN}-1.18.0-fno-common-2.patch
 	"${FILESDIR}"/${PN}-1.18.0-fno-common-3.patch
+	"${WORKDIR}"/${P}-remove-ld-iscsi.patch
 )
 
 src_prepare() {
@@ -43,5 +45,4 @@ src_configure() {
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
-	rm "${ED}"/usr/bin/ld_iscsi.so || die
 }
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 46917c4a924b..eda21539fabd 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libktorrent-20.12.3.tar.xz 604488 BLAKE2B e51bba82990632744aaadf3e40043fa80e64395f6f3721992780ff77d7663a0a3600aaf7d2653a00f32366555f1000a961c3e99de6d2e2cfecc4c1f79d1ebb00 SHA512 e2259251e8edbef6154674898614f81b3a29d5c711e9f751435450edbbb987c5e2a1d8ff864da5aa180b5d1adc3ef611f46175f2126faca52d1b1338d986d1cb
-DIST libktorrent-21.04.0.tar.xz 603584 BLAKE2B 5fe1012bf5f18d3d8e08f1372216ccd975e544daf79063267285e06e29be20e9ca3f2a443bb52a8dec5a3bb3c3b927eec024e91c549cc22ff707db4e2d5bdd92 SHA512 b0455a589bf0d452c3df142182d677659fb4d0a3e4e80ca0dad9abc8c4c276bcd7b2f0889a0bf33ceddf1e71aaceaa3e654b26e904988a96e62ea42a0ba0952d
-EBUILD libktorrent-20.12.3.ebuild 1450 BLAKE2B 9622963f20945eb74d30d6a87fac967d4970d73dcd4ad2ebec04b528c708df172fa8a7ff7e8a19f3b6de5e91cc005259b1ab96ba613a530ac5a32e5f15c0b6e2 SHA512 c041d91582cff0e468eaf24319a79bfa482f238f9bdefb59bbac604aef15bf9cc5317564f31e62a1c142bd8df8aa8a4a7e9c35f6628b11db4a735f686f8def0d
-EBUILD libktorrent-21.04.0.ebuild 1442 BLAKE2B d5b0abc6b02740cefad1ad9ee4d25b8e47fd0b03148498d759fbcdb4173abf66a5862630e9292bd6f53b7109e921314698499cd291af2ee19ac720bdda12bdda SHA512 09ee605ddfb77fda18bdddf9361487b2cc846ba089760ef94e5a5aed6f6e7f776d7faa7f94aab786c09254e7d187bfe15cca827a5123d1189b910b2fd37de32c
+DIST libktorrent-21.04.1.tar.xz 603656 BLAKE2B f1579f35cfe1c966b6311c0bb125b748d1d983b7ee4b3274808dffa93308c6db545375be730291a4d8cefc66b3e5e3f3ba02a71325bc1ad2bbaea335615b336f SHA512 d2084f1c98395dbe16204c6a2461db41f7905965ccf3de445c6694526150f658402aeca5ccdbd47ea6fafc97cdcad620cfab0e30537f14845d4f0b101bd4749e
+EBUILD libktorrent-20.12.3.ebuild 1448 BLAKE2B 9e40d97d0aef21c498dd61cd924dd4e8f0cf3385d4269176fffc3bb5634b3959de35d723cc3708e0c9f8ac43d61cc893f60981d937ae32b6c039b4cc4a7fe708 SHA512 c3792ec5496f2534b6ac95a7368abc02bc7fbea277b3eac4be062b59f4fc7c3099113713a81a003e43187d7d618c258922320a3e4a420c230ab61f3f5e926aa2
+EBUILD libktorrent-21.04.1.ebuild 1440 BLAKE2B ae855b981c48206979a2abe3f6556584857b4b8c6fd456293e2e9baf0faaacec8997653ddd5e8c098cae4a91be9a04cb10ee1372566dfcf929f2546ccf21ffe0 SHA512 e5a2548d353d0048a7da3af7b4bcc1d459f9ff2049049d70556d0b96cc380456e1226067f9780e66609b014f491c69f23b77e5d64088cc69537799ae5089cffa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-20.12.3.ebuild b/net-libs/libktorrent/libktorrent-20.12.3.ebuild
index d1f8b32bb18d..6de758108ebd 100644
--- a/net-libs/libktorrent/libktorrent-20.12.3.ebuild
+++ b/net-libs/libktorrent/libktorrent-20.12.3.ebuild
@@ -12,7 +12,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/ktorrent https://userbase.kde.org/KTorrent"
+HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
diff --git a/net-libs/libktorrent/libktorrent-21.04.0.ebuild b/net-libs/libktorrent/libktorrent-21.04.1.ebuild
index 13cda9ce275e..9f24c96e7f05 100644
--- a/net-libs/libktorrent/libktorrent-21.04.0.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.04.1.ebuild
@@ -12,7 +12,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/ktorrent https://userbase.kde.org/KTorrent"
+HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 79b21f83ba71..da6764d357a0 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -3,5 +3,5 @@ DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860d
 DIST libmicrohttpd-0.9.73.tar.gz 1738675 BLAKE2B 63845b1b7fa0aa8ce29e9917521e10bd59fa0d27658e87ef3273d5014adf5cd9514a2d84465a573df03b44dcd50da7d157ef9c4952107ebba49efdfb398476c2 SHA512 473996b087ac6734ab577a1c7681c6c0b0136e04e34e13c3b50fd758358c1516017ad79097e0c57792786f6dd0208834374c09238113efed13bb4be11ef649d3
 EBUILD libmicrohttpd-0.9.68-r1.ebuild 1200 BLAKE2B 3973e2a7077ad323d8177237d0a4e067303d6a9234bea971b0f541b67d680234d5edee136c34ee6b1078ee186a969f273d7f01b2067adffab2f9301f816576de SHA512 59fc30ceb6fa7dff759f115f8ce626085204e34e4d887d79a851fa5f9827b2570c047b76ae9ff5f2be3bea61e6e294347805c1161db827b606be93dc91588e6c
 EBUILD libmicrohttpd-0.9.72.ebuild 1236 BLAKE2B 21e77d98dc6839be7c55dfdefec799cdfb49f5631f05c61da8436ef27640201916c0987d9beba802dbabf823ec80f7724e38a379a085d45be3101459ed074c7b SHA512 1df698bac5e462b9475d0fbf7b0b2810852b23d5cfb0e3cd003eabc4fbd4de10b28679a9c776c4ce7a4d732f06062f81ea4a61a7bb243149809c70d75aa53007
-EBUILD libmicrohttpd-0.9.73.ebuild 1425 BLAKE2B 540305f963f2e8e29c1293d27cf856984e52ec1618f63a0f87769190c8a7a91157f15ae4da9b2d4fd034f8f7a595fec9bfcea47a1765609ff23e98d81abf04b4 SHA512 1cb00654b7f32836a2e046c92cede0e0244021b5fbf41219aa81a759bee7d7f2b36eb7ee365e5b1f0af34bbc8ed9dbe31ff129bc9ab9ef68726e7f560e710c61
-MISC metadata.xml 594 BLAKE2B 2cd0819db9dbf19c9c7c04aaa3e373d77aa448edf18629ed2ffce1d5dcda573cfb788e3f86354c07b99660f27a91845ef3c7c8e8a8c76cd604015165f373098f SHA512 098269a2b2464ec0a55430c1a60808e3441b307a0aca9df0a062a17e49e9da38e27f8b77be897cdd9048107649a96108fab2e7c5c0d6502fda072f690b031f3d
+EBUILD libmicrohttpd-0.9.73.ebuild 1370 BLAKE2B d6f2a9f573c8e838af7f38e16ffb008dfb85a01b77d6eb1081377f817caf5e97661053ae22a309242aa1c6393f825d1c0427a893a853a37c6ff7bc839c37161d SHA512 91ea9a7f49a81c9e742ce9c12d9c1aeff10110acb701184acac81020ea43e1914a352de311d97f5ebb281bd1426d7f3e87ad90ceb699b723e4195caed6fe677c
+MISC metadata.xml 631 BLAKE2B 84912d97f425f6adf4c70ce77df6cfc7c232d193206a28e41c6fc2ef7e4beea8bef738e5fa8f6fbf379cf2e3a5ed7750c85d0be8156a924e330e65891fb519c8 SHA512 d5ac18342550f72840cebf86c8f99b4f042e2abfd42fe26643264706679fa09b10c67b3174d41fcfd786aad5665e0c130da9a9876869a113d24493ced5334dc3
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
index d881dcb779b6..4a3af5871918 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
@@ -12,20 +12,17 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+epoll ssl static-libs test thread-names"
 RESTRICT="!test? ( test )"
 
-# libcurl is linked to for tests and the
-# curl binary is used during tests too
-# if available
 RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
+# libcurl and the curl binary are used during tests on CHOST
 DEPEND="${RDEPEND}
 	test? ( net-misc/curl[ssl?] )"
-BDEPEND="virtual/pkgconfig
-	test? ( net-misc/curl[ssl?] )"
+BDEPEND="ssl? ( virtual/pkgconfig )"
 
 DOCS=( AUTHORS NEWS README ChangeLog )
 
diff --git a/net-libs/libmicrohttpd/metadata.xml b/net-libs/libmicrohttpd/metadata.xml
index a3803466a893..dd3c1dff304f 100644
--- a/net-libs/libmicrohttpd/metadata.xml
+++ b/net-libs/libmicrohttpd/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="epoll">Use epoll() system call</flag>
-		<flag name="thread-names">Assign thread names to internal threads</flag>
+		<flag name="thread-names">Assign thread names to internal threads, useful for dependent apps debugging</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:gnu:libmicrohttpd</remote-id>
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index 04f8860e8d63..62ba76a34b22 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,3 +1,5 @@
 DIST libndp-1.7.tar.gz 363502 BLAKE2B f9b4dc455a666fb8d7bbedd49ed2c66764eac0e886943647be906fbd2912379c8b0bcaf64460316417b9d13011c79f5cf6a79d0dae0af991b137cb69940e85c2 SHA512 4aadaf6d7d8b9e57983cba17ce92715cceef6635613c4c5326decb97fb575ce5f5d5586a629645e3605a03e385c6481bfb6c4458216be2bbd36959af62783790
+DIST libndp-1.8.tar.gz 364669 BLAKE2B 29fa41b40300b273d50aed4f1fe4a1c552023aa83d6f4b1bd6033cd0a41618b453bd1ec7ac5223fe7c123649f389587e89e635cb988b392f1af04cc1d6b79002 SHA512 bce17095f01eb9df6601a2ff0597b0373f4b0005b1edac8c085e4c9d54f9cd18f08faf1604624e0e0992be66fa6f22a71106af46bc73c9e326663c7cf0c5a7fd
 EBUILD libndp-1.7.ebuild 531 BLAKE2B 81df5537eb9ab4324862b956ffbe2bb05d18256d6f045faa8414e6fdb4d6274cb3974e52e634c93ce90fb50190fd12b65e81e942ecaa91e5e5e5789576093ccd SHA512 42a9455b62bfca06a528bd06354d237db6271355c575e8fdfb418b136825d6f1bf2c764a59d8d7fcf81ca2238fe059cd34c1f6430a7cd3012f54a212814bc23c
+EBUILD libndp-1.8.ebuild 537 BLAKE2B 6e698f2dcfd6b62ea9b6b5f1993d2b0048552ff4ddd069d07411f774b56d8260ce2cf271e2d60892148e98db2745792dfe36b8b9b47198e47b392e2ba3766513 SHA512 1977eeb98cc017dd1c71ddaae05ec34cc97cad5860297b787dfda10e0962762ad99fe92657b889adb661dfc893230a7e44fdddd183d092146a2792a2de62c4e1
 MISC metadata.xml 328 BLAKE2B daae7e3df86ad08016fd775c15491ac7d74f23b068d738ffc3ac73afe1be68567d488a007b49a2fe7c5c93b0fc06138838b3deede3b999728e9a597c3e7b0f9f SHA512 25b1bd4544967e35a6a9fe5f09992dd422f9f13203a81feca04db959bbc26bd1f1bb5b6be4642b97ae043c1998107fc54ab721778b2969c4652a90193eee4828
diff --git a/net-libs/libndp/libndp-1.8.ebuild b/net-libs/libndp/libndp-1.8.ebuild
new file mode 100644
index 000000000000..e187a4044197
--- /dev/null
+++ b/net-libs/libndp/libndp-1.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="Library for Neighbor Discovery Protocol"
+HOMEPAGE="http://libndp.org"
+SRC_URI="http://libndp.org/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		--disable-static \
+		--enable-logging
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 6e24d6461eca..7a3937193c3c 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -9,5 +9,5 @@ DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
 EBUILD libnet-1.0.2a-r7.ebuild 1409 BLAKE2B f1906501d9d776e35207b85e259bcc66058b64dc7b025fdb0aa1f7b580ed8066e65c17a8686173c264dc0fe51086b73259ca1d7c6583bb9c0de53ce63cb7b6b9 SHA512 7b44ebfe6aee06809dd721aeed50dbf443a27a531a99ee24abd31f535acf3454374bafbd2d79af0c0b95f8b51400ed1e10dd93207e98b0cff215553419098e3b
 EBUILD libnet-1.2.9999.ebuild 682 BLAKE2B f4de78e01f11b24255ab6713c484ab9954ed6cd4be54d7da340c780ee5813291157ae2fe881141faeea2d0b2df67af71ab06a11949c57d8db4a5f3f28533cd30 SHA512 4d899c428e510ad9ed76eb0b573fcac4903f3d8782398890984c0eb85186bc0e84326c35c04ec04dfc78891f8f48d7a3b47c19d4715d695edb7facc573859d73
-EBUILD libnet-1.2.ebuild 891 BLAKE2B 5eb9a20102428815d27ec6d88f319e2eae6e2307cca7a31196890a62ae3edbed799c5e80a48d7e11e56c5facc98ec8c1b5afd7e2b962c0c55181b6be6ed346af SHA512 af8a30d34802f8c8b1cc08529733f1da96896917a3a64d351d9753ba1d4882be4e5fc66d9ebbe6cbf605c047ac1fc52312064600046d33f7333b90116e80a545
+EBUILD libnet-1.2.ebuild 890 BLAKE2B fd865116bd86b149c9efd1682a89ac101864b867897e77af0637081c296457cd493519af371f4cfd9f1e0b2202707646997d858de3e9a8add3391434557b9399 SHA512 85e4f6c1fb9b22049b3341518fc2e43813772ab0e579e0d656be9c4e26c6a77bc67b3c73d293a9546052a356b31162b9f5e35137263a58c98f8b81411b4a1125
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index 7c9c1dba2b03..3e584a429106 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 DOCS=(
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 42f3cbb4b085..50d442005c46 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -2,6 +2,6 @@ DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579
 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 959 BLAKE2B 42fa1e8732e6550f5dfa61d220fd8224b894b0c3f7b3073e00eac3101a756b9a0fc8e491df988da4629ebe7aae32e9cdc66ceb7b97df2a6da01d4076a3ab9082 SHA512 a791b161fa2a4a7d900f926e929a7789057b2ebaddaa9882ae652559d3a9f59b9bac6e690cb15289f873a63a93b507d09d9acb3879695591335331314173fd35
-EBUILD libnetfilter_conntrack-1.0.7.ebuild 967 BLAKE2B 131804387b9edc374245bb662e0489065b5da66094ac8d9672d4899f3db64308e78f54dd6d0dedee71e0c256b8540952d09fbbbefc3fd451a7f94c8d57a3c591 SHA512 1f9c9bac46710dec83260cff557efaee5a0ec4e2656b459e97270e18d466ccfef69e6035e2b0db5fdb0f695482152ceb45bb61d9ad6a37614b40328dd6eacfb8
-EBUILD libnetfilter_conntrack-1.0.8.ebuild 967 BLAKE2B 73c1e8535d4f0680053fba85aac571a77053f5a3868b6d4762a929bc5251f4ba06fd68bb24bfdfcd336027ed91c0d9b53e04671ce7a92caa9b59e3d32fd93399 SHA512 195ddc976102f88928ca070722a775540b0f7318fa8a23604511957ce8a269478d6752d8387f14d94a01bac43be724fdfb453776f344d4b104059a8f93fd805b
+EBUILD libnetfilter_conntrack-1.0.7.ebuild 966 BLAKE2B 7b943004490c4c6a13fe21faf47e74bc82487c568099b64c86e493c09ca597d11e7f36f0806dd30261959d0dea35422be9d54b87defc0d57b5eaec574bb7bc53 SHA512 8c5e50506388a81789997944ae67646bff479d941372d57c791f19e50d8f02547f4853ee4adb57a53d253831ee112875c591b0a9c05fe09a1aa2edea5d546416
+EBUILD libnetfilter_conntrack-1.0.8.ebuild 966 BLAKE2B 7b943004490c4c6a13fe21faf47e74bc82487c568099b64c86e493c09ca597d11e7f36f0806dd30261959d0dea35422be9d54b87defc0d57b5eaec574bb7bc53 SHA512 8c5e50506388a81789997944ae67646bff479d941372d57c791f19e50d8f02547f4853ee4adb57a53d253831ee112875c591b0a9c05fe09a1aa2edea5d546416
 MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
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 319887c21a9d..3ef261d55d21 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
@@ -11,7 +11,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_conntrack/libnetfilter_conntrack-1.0.8.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
index 885bab96515a..3ef261d55d21 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
@@ -11,7 +11,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/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 38f88b8a1bb2..5305ff28a40f 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,8 +1,4 @@
-DIST libnftnl-1.1.7.tar.bz2 387829 BLAKE2B e21ca38edbc7c651a061fcd6db80278ba99b4fe0c92c1912039fd0a1cd4b7636c87e17f538eaad8c6b963748c7c77800eaa83ddb80d344865504329984ac9c96 SHA512 80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407
-DIST libnftnl-1.1.8.tar.bz2 389632 BLAKE2B 5668bc3839abb99b44d2eecfa4fe391d1669b31d5f653f859ef2ae80ed355252bff20bc74773ec68024e0bf9e93c8993765b84e8d562fc2b2b1f7e3f5d3fed91 SHA512 173d8a7b95eb964a9fbe7ffcb46541a6bae976b4d4f2a28fbf9b03bf3e50a29b1ea12faa49926d2d33bc088580a833fc6e15ff59a30bcfe67c91c524f00c778e
 DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25
-EBUILD libnftnl-1.1.7.ebuild 1167 BLAKE2B 94d818ed22c7eb28202fc481beadec1c83e3e6690a4e1980faa47ee1427fe345df0e19cfb1afb86e38d579b15279554cca0a94867bc1d11fe9a7a577bf03ce2f SHA512 0775729fa5cc11fd3126e86ef18e2c965a3d987c0fcc8e6c766f92ffdf3f9577ffca6aed1ab02395f85089267f7e335dc4cd34be3507231800ce7469a62a96f5
-EBUILD libnftnl-1.1.8.ebuild 1174 BLAKE2B 4d768841a0625afef9522b2addb2dcb7a6c60935456392d14bc52f111b9a226478ebe00e81da64d13c53bbe11f31e21d2fb89a19fc78136fe1f7cd13eaa44e9f SHA512 7446d029fdeed5157d19db65a7a81cba8bf25037cb73588825983cdf76a178291975215be798eb20554cd6078b29be1dd5f958f6760f5d13203b28c78998f6a2
 EBUILD libnftnl-1.1.9.ebuild 1167 BLAKE2B 94d818ed22c7eb28202fc481beadec1c83e3e6690a4e1980faa47ee1427fe345df0e19cfb1afb86e38d579b15279554cca0a94867bc1d11fe9a7a577bf03ce2f SHA512 0775729fa5cc11fd3126e86ef18e2c965a3d987c0fcc8e6c766f92ffdf3f9577ffca6aed1ab02395f85089267f7e335dc4cd34be3507231800ce7469a62a96f5
 EBUILD libnftnl-9999.ebuild 1363 BLAKE2B 4ae61af654e23b0ba0bf2289291ddbf104f497cdf0d62397961ad5269f2864b99da1f6e803fbb158732e4ad16f284f4cc5fa2dc2081252a67690d43524b221a2 SHA512 0fb3a1814221ebc9a3296b6e08db738080285334308e3f8c6cc7e1a805e7cd7115f119c536f24d2bcccc50d07940e79da5894b7f5d6030cfef1d1c0f765ec460
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.7.ebuild b/net-libs/libnftnl/libnftnl-1.1.7.ebuild
deleted file mode 100644
index 2592a59415cf..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info usr-ldscript
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="examples static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.4"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.1.8.ebuild b/net-libs/libnftnl/libnftnl-1.1.8.ebuild
deleted file mode 100644
index e08a48df5f0b..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info usr-ldscript
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/11" # libnftnl.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.4"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 3c7be38422cd..a178e0782130 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -3,5 +3,5 @@ AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a639
 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.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126
-EBUILD libproxy-0.4.17.ebuild 2555 BLAKE2B 916164c55b0c6f3309a0b7da8424573471a516859ceb8102d6bd3e623498fd6de4d159bc2190a6805519413f650eb9f1c3a01837a3ebce38839888721e26ec55 SHA512 8f4ea4ce77da46d937e7218d4f329db3e51a1bab26a2c63b94beb69c7e2ee2d3a15f9b02039b0d8ae9c2e621ec44c739af033bb040d497d321d453c3a7024883
+EBUILD libproxy-0.4.17.ebuild 2562 BLAKE2B bb4b1f48c3b14b28252d1777b943ab98ee8ee8d72719d0479c919f2e021d88cf7b0b1b1bd3fc55e6d85c2029288af1cb570438b1957dd3c1cacd852ce16c214c SHA512 64f9b4e0e626af7d475ca819e427a872f43913e94ad572b5887796c2ace9d7b1225303eb076a3a1ec31499482e0167d0b0f367a7d430e989e8d5d2b3ef7328fd
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.17.ebuild b/net-libs/libproxy/libproxy-0.4.17.ebuild
index 05856b011b36..4777e3c49fcd 100644
--- a/net-libs/libproxy/libproxy-0.4.17.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="gnome kde mono networkmanager spidermonkey test webkit"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 563a6905279a..198f83262ad0 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,8 @@
 DIST libqmi-1.26.6.tar.xz 1127552 BLAKE2B 1dba56c867c688c991fde7bb019234a05d77092f0725498d677a7ff620c56e58e17c873c773d96ee2131bfeac8cdbec86dadacd8fcc2f751f4e9a8d2c75efe5b SHA512 6c5e05fc158a085e1f652ff31cef65762c026cb09eb630153fddccb15e19187141e74c79818ebe00a058c5624891981cfce4d56545d4150ebb3b6e8d7bddb5ba
 DIST libqmi-1.28.2.tar.xz 1165204 BLAKE2B 17f7462d84b74099a5ef4fa6f28e777a4587be0a7652b38c4ab5c0f50bbbbd0b8b293df22d7a8c470444df23fd405e3b176e8c449019787c5305fef13d0b27b2 SHA512 10d11b780aa381e93669aad2540c609bcd3f789302ed76d80b9845a24f84d8741b8c39287a2007ec80d8e0e517686023d08a7a677426c77f3b12ec172edc05e7
+DIST libqmi-1.28.4.tar.xz 1168088 BLAKE2B 828a8688a49a08f0848414b8e51c2ece4a0035ecdf449a5dc9e2cf3b6ecaf1525d5a1c29e329a584ec054f66b9a141d0ba3980b8affb34db3088ed2b5591a265 SHA512 dad3cd2740804d2ec6aa04f0f140d385c00d5a3854d75ccdf54ee6fa4f3cdfc02de5da21cd8b43d5a7c6b467b94b5001bc857fbab01aeedbdb51c0e3d9da9690
 EBUILD libqmi-1.26.6.ebuild 1146 BLAKE2B e2bb050d6c6ade7ee0e493ab39297082ab155e6d3361d95222252a3e05443daaa64d0aa07eabf938825297980252ae9de5ddd0420b69adb68f447bf81890982f SHA512 51c72da9ef8d66a75c84d375d9ce27948b3570a7559e2a44d35e7fb4b4ba4f8b4e852e594e975544eefe8f490516802ff4c3b83fa216e7f13a372ea361661084
 EBUILD libqmi-1.28.2.ebuild 1228 BLAKE2B beb397e75288d176644eccb208603199dd814a176c0351bde511559dcf1c2a566efe1623ba1b91410e784cca944204378c5a91b1f6fa9a753dd4496858b791f3 SHA512 b7efe428b4ae2a5c65e55a905b05e987f552605f571d64eb11b55dcaa3da705d0799936d08df14de9a6e5edaa91050818fe9c6bac63cd0938a8b370b9644f6cd
+EBUILD libqmi-1.28.4.ebuild 1228 BLAKE2B beb397e75288d176644eccb208603199dd814a176c0351bde511559dcf1c2a566efe1623ba1b91410e784cca944204378c5a91b1f6fa9a753dd4496858b791f3 SHA512 b7efe428b4ae2a5c65e55a905b05e987f552605f571d64eb11b55dcaa3da705d0799936d08df14de9a6e5edaa91050818fe9c6bac63cd0938a8b370b9644f6cd
 EBUILD libqmi-9999.ebuild 1223 BLAKE2B 526c92280dd6838c08a7bc56d975a472bce40b04627cbf2a69402cee7a32fd11b2ca4a658a333b2215272226a380b93aedb8f58bd7669da931c037b4169b9059 SHA512 ec855e747177f058290f8b0375dec0d0e73bca68d8eba4a70203d0013d5a9938c121423c1bbdf23649e20a62c8e3a413627bbf5d555eee05a486cc0434c99205
 MISC metadata.xml 424 BLAKE2B 17aae2f0c88f12dd7de0c2ef76687667b5e6c1d0c42e2f584b868f025d0069a56b95d11d8d4f137f8f6e783fdd30f49d191bfd6b42f479057f9967fe66d77a17 SHA512 9104fe16ee4aff27aa0c9861456518ebb0b022b1d37ab7c260c31aa3ad19136bb3338072a1dfdc53a024a3b31e8e6e6bfec14eca2b92d53f8d62b00b213e060e
diff --git a/net-libs/libqmi/libqmi-1.28.4.ebuild b/net-libs/libqmi/libqmi-1.28.4.ebuild
new file mode 100644
index 000000000000..ae2df1d55498
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.28.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
+
+LICENSE="LGPL-2"
+SLOT="0/5.7"	# soname of libqmi-glib.so
+IUSE="gtk-doc +mbim"
+
+RDEPEND=">=dev-libs/glib-2.48
+	dev-libs/libgudev
+	mbim? ( >=net-libs/libmbim-1.18.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )"
+[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--disable-qrtr # libqrtr-glib not packaged
+		$(use_enable mbim mbim-qmux)
+		$(use_enable gtk-doc)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 7666fdc3f347..b3422bd74dbe 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,5 +1,5 @@
 AUX libquotient-0.6.3-no-android.patch 930 BLAKE2B 15ae94889d5543b9d8e6113752df00fef0bcabd2c44adf4146d2751077ec08db17048d4c8716bd245b4f6856e581970c1d230511a681dbb6ae64178bc3fcf75e SHA512 ef3414f3e3dda3926c246d0360be227c52a1ce0aa970f65aff29d2dcbe2c605fc2f583cebba4ad3f8934b872a035a3cc7a9895847eaf9faddf0f46023647f7b9
 AUX libquotient-0.6.3-no-tests.patch 1421 BLAKE2B 97f6b9c3cfe5b32607d64fadbd8e72aa0d1f5d14382edd2792fd564cc226cc473ccda18e770d1b449c158b156bb67dcbbbc36f8587436bec28295b8737279f9e SHA512 76d47d6837c4cfb86be95253ad89fb31de60181b12433a579072b567d18c49a040aafeeb51f333ae4038b141724fbaf68a28a440a1a986f5c61eb25b093b2139
 DIST libquotient-0.6.6.tar.gz 560130 BLAKE2B a8f12af320e0f67b0fe40ec3892cfb2bb7686f066633c061936007e0eceefe5133d3c021a0d1856504f606b5c1bdb66ffa9d8d304b0b631be34f938ffaa061d6 SHA512 7560194bee5b6478ac8efd15d6cfef9cc003073744b4860e3177e51e49135cf2ad96c69e8cd21e64c1f9902ea4d27c26d84d200fc862c5c0daeb0cc4bb4ea65d
-EBUILD libquotient-0.6.6.ebuild 865 BLAKE2B 2431de16f13e607f793b629182c954b0488c8dd107123398b7d5e9d13c88c3c70d7e92c2d3f519552a8dc12c581dc323f67b41b09624338cd254a539e5d5dd68 SHA512 7befebbee995aa9b4211c05149d119556ed30e50656ba0a534ba08acd60ac4a495006a9324b2201b7273df5673af22d2cf77c597e7d8a7467894986f368c0e8d
+EBUILD libquotient-0.6.6.ebuild 872 BLAKE2B 292ac644871226e3b07e6d3920553e59be3e8c722d60909ca607378fd8fc270b2e8435c3f4d268ab02c9e32a28fd82ae03e3fda70bd24eda9c15b1f277a48993 SHA512 a2be01c7c8855ad00d385684df470f97dedf767d71078f76649283364292778c3875b46f89f88e2edcd021b21563ac1b19748b96a01721d363821f8a3c0a2276
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libquotient/libquotient-0.6.6.ebuild b/net-libs/libquotient/libquotient-0.6.6.ebuild
index 0474fff2b604..ebeb0a0321d5 100644
--- a/net-libs/libquotient/libquotient-0.6.6.ebuild
+++ b/net-libs/libquotient/libquotient-0.6.6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/libQuotient-${PV}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 IUSE=""
 
 DEPEND="
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 8e90e5e77d90..969d5f126d0d 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -2,5 +2,5 @@ AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde70409
 DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
 DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
 EBUILD libsoup-2.70.0.ebuild 3001 BLAKE2B f169f2ba7739d75aa7fd76078727aefd623fd86f43c7e666a2b5c86fda169c54626623cb7d6abf33304b56a7012cf5b9a3b7ad2dbb136ca0db0e10a3c785277b SHA512 17c345485bd99b036af6487369afb7566576f8e2963c1e5fc7cb75003a0ade7206dfcf9ec969ec7df511d3288172af856a3d2d7e14836f55ab4a0cfb843d69fe
-EBUILD libsoup-2.72.0.ebuild 3111 BLAKE2B e5ce14664d617661914f6c757a34e3d428d2da5a8418b6aa821292dbbc2fa15877c0fcf8e7c0873ec5664eba002e6f6410e9e984472aef56cc5b59978f37cc3b SHA512 d5c38cc670d5c1d2cb3fa5d74698d7f9f3fade310302e173e4052cea68f7bbb09ce701d8c3f6efef3dc2988b582715799d855a2816fd36c532137f93e269bba2
+EBUILD libsoup-2.72.0.ebuild 3118 BLAKE2B 4d00e99941c176401a5f218a60765e6c3ccd12415b081525f01afed555d5b13f757213118c1175645ffcaebd1a8332ce7deeabd93946e1a18765604489bef3fa SHA512 fb6bea7d90da5967aa97d0358463e6cf6d4dea4a0b4120eebfbe784e5defd603edcba3e6bcaab576030c70d34163742ef95c6532f3445781b29253ad30b4c02e
 MISC metadata.xml 577 BLAKE2B ce68b60f9438bad0b1fb848dada28796f4c9a8f6ed119b29c26139bf7c146edb7e701f7565e425c27587a911e62bd1ed15cb6d120696ab1ac0f631f9f8145cc4 SHA512 a2937c0036d3decd995f8e83321b7b1e2bd9f6a5fe83ff7061dc1443ef5cfb4714d38c32689cd46065a7efbb5c8f120eed5ebfad650e7ccf4f1d98d9d45afb0d
diff --git a/net-libs/libsoup/libsoup-2.72.0.ebuild b/net-libs/libsoup/libsoup-2.72.0.ebuild
index e832e552fd6d..2374db53ddcb 100644
--- a/net-libs/libsoup/libsoup-2.72.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.72.0.ebuild
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index fd6ba8f979fd..6d53d75bb506 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,4 +1,6 @@
 DIST libtirpc-1.3.1.tar.bz2 513399 BLAKE2B 8cc42292cdbde55a0095669bd9ccb3666b9e33d6ec9880ac79d034d42155d1b585f4181ff92f8290d7b5cce01bace2629d1ddfe0d61813f00851216f2be5ed0d SHA512 131f746800ac7280cc3900597018fc8dbc8da50c14e29dbaccf36a6d110eded117351108c6b069eaac90d77cfec17014b08e9afddcf153fda2d780ba64260cbc
+DIST libtirpc-1.3.2.tar.bz2 513151 BLAKE2B 375b7bb046244f4666522c4f148428349fe1867b095dc5e268d037ba26982f88df70b0ad21fbe2b99150f644806a46651b524c3b9f7fe2499469806ea50b0331 SHA512 8664d5c4f842ee5acf83b9c1cadb7871f17b8157a7c4500e2236dcfb3a25768cab39f7c5123758dcd7381e30eb028ddfa26a28f458283f2dcea3426c9878c255
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
 EBUILD libtirpc-1.3.1.ebuild 1478 BLAKE2B 966d8a329908ac935ecb62303453fc382424414f020791f6b3a12feee8b347b59151b15a75e1909a727b1b3e23bea42232ae15343beaa1580656f3e5533f1854 SHA512 93f7f1c03e4e244da42e2c9c18dfbf8c162e230639947597b23266c2b12d533260f12287552434bc40f0e42b997e5c120936ee770053cf8fab33f9cd81d08c6c
+EBUILD libtirpc-1.3.2.ebuild 1486 BLAKE2B fac35adc99475188422ac8778a00813e267efdd0038cd9a171dc46e38f7a3a40bd900bd64f0483ecffb22c20cfd1d0b7511fe7a7faf0802f5ebc7da80957a965 SHA512 b6fcd1166746c6ecf054c85dc9aae480d43bbaebe1a91de8b28c37f957f80054911704be4ff5936c3944453d8fea7904e1c7bec68c9f91a339910a8055cf70a1
 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.3.2.ebuild b/net-libs/libtirpc/libtirpc-1.3.2.ebuild
new file mode 100644
index 000000000000..fea15bb4317e
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-1.3.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal usr-ldscript
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+src_prepare() {
+	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
+	default
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable kerberos gssapi)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# libtirpc replaces rpc support in glibc, so we need it in /
+	gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc
+	doins doc/netconfig
+
+	insinto /usr/include/tirpc
+	doins -r "${WORKDIR}"/tirpc/*
+
+	# makes sure that the linking order for nfs-utils is proper, as
+	# libtool would inject a libgssglue dependency in the list.
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 5cf9e097315c..73a2f4a23cc6 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,5 +1,5 @@
 DIST libyang-1.0.215.tar.gz 1666478 BLAKE2B 66fc53458caf43e8473905ce9294efb9a49f0c73206a4c5ef96f7b79e72fff9429aa4245fdb29a7d2b4a23460d771d30a9397ca4d2ce76379675dc4a9f6427fd SHA512 042e7be3a658340eebb5aaf819169a516af5489c366c026b599d673b623811b01a5cc7b2fce0fe39c5deb5cce5b1e0e6dfc4eb85a331fb3203d415011e6d2dad
 DIST libyang-1.0.225.tar.gz 1667054 BLAKE2B eb1bfd555d72aceba7da7ade1a55985caad9d3cc904c5504978c298ef9e08a6848c810d1b62b1fa7076a9f30638b6080a3546c07892d3e8980eb1db337dc4deb SHA512 3366df8c2869454b6da456010ca62b538876cba16fa84e1ed9053acca6d7756c15329c0fb8a62477a1887d6c00cce8449f29954b2d2b0e556d81baa11dc9776d
 EBUILD libyang-1.0.215.ebuild 897 BLAKE2B 404a7b7a0319cb61c2f13f882e6f2ab9563325063c2f4ab4c2f4a62de0598d22c29a02b8efe3165ddd6181c4920e1b7e8001cafde98e5cacb4c6691e70368dd8 SHA512 6834392c435108aa490861c17d4133f610ffe92560807206803dcc0206821a6c50989a917a0b9ce2db63577bbb8eb2c1e92368cab5baadd29fdbb93a1863092d
-EBUILD libyang-1.0.225.ebuild 890 BLAKE2B c26b21d32893072ae441cc3697feb77c5cfebb9ea5ab45d8cc9a0af07ed07cc076832b3b303fb6138b3fe7e3eecb2c7bd898de1b98791495064c7b854736195e SHA512 ec5c85171f8790eab2d20311b2fe086bb90a7c75c4fd6614e85a520642e2a94f3a1675789510799b6ace2aeba9c6790fb535a3e75f744292e332dde00a4e955d
+EBUILD libyang-1.0.225.ebuild 897 BLAKE2B e5d1e73c16e8be086668fb4365205dda0aaf15cf592b47476c0c16fc61a785f1e3789096bac27950886092a567d6be5994058888f616b878fb35454e9846e9aa SHA512 5717df5882cf10a77b3bd57c77fe6981c70b96d7f007532d0a56de2971b816b65b310838178a0186d68f5cb32447efdc6a27dd5312f7031b2ea6e3bc11b61308
 MISC metadata.xml 326 BLAKE2B e52c1d56ed6f14dee505e8db5bfede4cb326e8a98a50df576244e8f2ce44d964449acbf00ad9bcd27f22546e1a029cfdec22919edd887a2db9e10f471f322af5 SHA512 bb91dc41fa93fae47c0ad7fa99868284e61a3d24b261cb5feb44cdcd91255744de1d860b1b98374e8d4a8ed4e931c2298c28527709f3e8c5b4bb223484edc076
diff --git a/net-libs/libyang/libyang-1.0.225.ebuild b/net-libs/libyang/libyang-1.0.225.ebuild
index d56736baef1f..463140a483d6 100644
--- a/net-libs/libyang/libyang-1.0.225.ebuild
+++ b/net-libs/libyang/libyang-1.0.225.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 567e36b6643c..389319e12d1d 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,21 +1,25 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
 AUX nodejs-12.20.1-fix_ppc64_crashes.patch 1788 BLAKE2B 48a5c5343b654fe57f021644c063b98db32bc634dc1ac5ef4ef9fbc3a1988ae3c7ae51ca989715154f5167ce985b742806de667bf6126bcf535f0ebae448b5ce SHA512 804347c985e59c9e3852af4c3d807ebaff95f1afe88a6ec5785baef51ba6ab9b3257d202fdddc5daa982fd06324a8f828f7d8dca8f99e071c52decea6cb00b83
+AUX nodejs-12.22.1-jinja_collections_abc.patch 3159 BLAKE2B 52de2f76151fffa436bf8a53ef6f38cee0cc566832a31c68cfb8fd36a82a187cebe389041355137b2f2a53454e26b0460bfc8a63154528d51264aa01503db10f SHA512 197ae5b316af6a253614fb0f9cdef644678a9eede770b3443ab417397c40caea1fc00c7300dd67af859ffeab56a851b70778bc68bc915559fab1f3dcb27c0461
 AUX nodejs-12.22.1-uvwasi_shared_libuv.patch 297 BLAKE2B 1f23155371499f891cf796c9b5c8b4c7f69074550ab2de15971a2b53f80eaaeb32aacc661fcd305de68c188302d2ce16db7b702b28fbbfc37b666b370e2159e7 SHA512 31572ac8332a9551d3273516c91665d6064ae905b8676fe12aacaa1f10f3302dc31e41ea328452685be75c4956a1d7f4833df31dca35d8259d0fc13534547de4
 AUX nodejs-12.22.1-v8_icu69.patch 2923 BLAKE2B 0e4da87a091dde4f84a980d43223f8d085b50e4cb16fac66d0a275a2257f8b61e1a2996e8a4a469f282c1a7ab622d9b9183b1801818af3ca40051fb4661e8f12 SHA512 e30ecb75b3fdf33cf9efa74250e4b91ab9ebfb81cce4d6f926c6a04cc20bf8222f68b2af4eecbbcd77fa5bc922b8a62be8fe8d918e309baccc09dafa40029e10
-AUX nodejs-13.2.0-paxmarking.patch 2710 BLAKE2B 9e63761ce7160434f7f9e5ef76ffd4d0fd61deb24cacd9ac4736bcc74145090d730c6b1d0a60cf9c815a08f22c7925e0719dae835a0ede0b65bb8af53418e016 SHA512 e5aae8fd9758fc1dbfc77f9dbfb62b90941a4b2e9e06a6d70f47aa6462d120e61a1774ba8526b2033161195040326d1b5ad643a816552154ff69a8e2548b3d70
 AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23
 AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396
 AUX nodejs-14.16.1-v8_icu69.patch 2938 BLAKE2B d69206f4903c63df7bf1882bc9d41510a30d2c8bac8141ac08b949578b17e842761edeb10295b95b7aed96cf1ca38c6bdb3bc4b83d8fe2b795a39d50d779f883 SHA512 55933a40c9ca46b2a00a9d6ba6a2b5f08ce0b85692b602b38b05c323c46778f267c8ac5f960661165b4221c8ea84f92bd5957773b9a5e6ff49277a258df3e380
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
+AUX nodejs-16.1.0-ppc64-segfault.patch 4664 BLAKE2B fd66e8e6332b763b008b56dcbf6c755e80f3494f995beef0b2d041c52fafdcfda8122de633754c989bf7c033e0980515e33b6369c19a5a8f7cbba269d798feeb SHA512 d1e886cafb64108f4c0a7200f8994c30fb15c60b3090bd151a080d2df71afec6996de408fa0dc671093c4c7c2312f4dfc4eee09bbc777cc00f7e122e6dce3a59
 AUX nodejs-16.1.0-test-repl-history-navigation.patch 1970 BLAKE2B 7c33e36c1faafabff42e0b98ca83fe25433fadfc77196158abb2a7e6fdaad09fcdeb0aed75a1424e8e96425b10a7e396b21cd8ac3cb06f20a632f4cf38b76060 SHA512 d53bc20931bc3f6c20ed0d9b050e95a2aa698b9dd73d0faf8628e6e0f07c030c3dd4d6504ec4b962c9932384d85683188692ef3fac264a73785f3c961ce72454
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
+DIST node-v14.17.0.tar.xz 33484212 BLAKE2B 0ad045b7e0b96f564f42cef703338fece2167cb8bfe32840b765b137e01491a43a9c31ce290a3379ffa834ddfe4e2e1f42f95d4d0014240151b06313e0339383 SHA512 7a7683523904580462077c8bf3ee9640f1b674c7df55655049ca50ca3cfdb2973b13088f2b65e4eccf4df2641cd9c86c9716bcd160a5d5863a969cb1e88de093
 DIST node-v16.1.0.tar.xz 33770472 BLAKE2B 2b7cf5f07dbf72eb25018cd046ce15cf6c5a444225e34d425614c19e69888b4f5c9488b079fed12e6fe52cb8dfdee20cf61c4df5a39f53e60b95c4da445f2091 SHA512 dc12078203940e7b280198ae15f51f68aaefcf8cab71a9f988952e67045e4b16dc48ec471abcc497bd15b0b426c06678e376b53762349d6568b48d52888cc2d5
-EBUILD nodejs-12.22.1-r1.ebuild 6976 BLAKE2B 65c091a3834df7f256fe9f24d81c4a350bc80d2c73c97190d376d65106948511843ad5610bbfaced8dcd8a2839abfb402f9119d8142354e5fb2b0ec53e601005 SHA512 06f2f07ba8a0e5173549fbf3d01ff92e58e3ed4c7f3cb048d03e561f58ce1d79112c25c6486625c7b971d8118860ffe75f493b5ea684359709a74e43a4e50276
+DIST node-v16.2.0.tar.xz 33786196 BLAKE2B be2784332cbbfa58cf24f830cd88117378c51b413167b6443ed90176bb0bd429005a99b5148f5d8315fd751dd34d83192c2a09753f84faf3d91080fa6e5eab44 SHA512 bf86427d29679f47d0596c532e84790ceea1784b4a06fc2a63969a1bdbf853b06d14f264c416f357c8ef097189566a44f962a678b5026bb4f781557f7b2bd363
+EBUILD nodejs-12.22.1-r1.ebuild 7045 BLAKE2B e9dde41d247bb9f8c072b0aabe3f04ab263ef1ea3b6bb14057087847a5642556d1c0f9d46257422850446ad21b847ffb1505e3651aa78096a9e7b40733d55faa SHA512 ece228de136e6041b996a8d9ed0099ddad524309c8e00738233476f72463fff9e306aa3211c4a914e3599f8951579a05fdbeb412693401dcd97852d638f5b426
 EBUILD nodejs-12.22.1.ebuild 6412 BLAKE2B 7e5671b07a93b739c8b3a84730f0a873dc18c6746fe25a112ef8efc6bcc44c5c68a4df3eb16cea05cbe0ef786857a4b417c463ae3469d3d09c1d1bb1ae5e1725 SHA512 b38fef7e77ac63f589d52b4836483aaa36ec36597f130e83334b3a59a9bc7e7c98fa3d2ada868472db556240b355ebf4415b656823adc60b5f1965a010e97a4a
-EBUILD nodejs-14.16.1-r1.ebuild 7025 BLAKE2B abaf829b8f37b6f985319e770e5888c376e3845eeca30ec4f40d8bfbb0f7205ea030d42c74e0c0364d9f7cef35ecbc79f241daa92c4ff85999f1c7d675f5f502 SHA512 f3a4580d9396a6bd2993219e85eb50d7653e0f49ac6c8ee04c2020430d2e21ba1f4d2002d8595ca338a791b96bc0ce4457080cd1104fa2b5f0dd45b484ffc9b5
 EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 55b923b81044645154639c0768f2905b612dcea70e703451bc5bb0868f17c7c635017ab9d390cff31c2903e0b0226e5c5c0a5323d73eecb3ea730ca7ace83cc7 SHA512 017c31360f866ea46b435dcf1ba84cb8075bcdf3925da51e1c81a0b3f0a73e3b4f31b0192ea6efa890e64eb9d3ccf548fc57f17bb44f5c20c5cdf0736b287eb3
-EBUILD nodejs-16.1.0.ebuild 6669 BLAKE2B 4411616ca4379b122d832a32801aee91dcdd4d4396f02c3a1b0ef2c48a69108eff7ec0739ab435479a6a94c203ac8fdd3bf2eb98fee4d6ee21cde54a7346118e SHA512 758c31953bb6e94794ce6877d3196b4d89d196a2ba5cb27d51c51c5a6676a400662bfce9a2fa3a9c9e95d7ece8bf64e2eb46c62370f1d8babbaac06ab6060709
-EBUILD nodejs-99999999.ebuild 6486 BLAKE2B c686818d5a5f832f3520ef3c4c5458526aac4894c251a2c589bcfff5e313b7b7602fb7d58bc89e7fbfdea28eeb4b570748026d38e8060430aea1b983b49a7698 SHA512 49a89ee3ef022a9d1866a33a4643d23f362c39442725a7267aa55c12898dd7d96dceb95fc44bdf36112b18c93ec9dde6124cec34b3b277e4be2fa740ffde4b4a
+EBUILD nodejs-14.17.0.ebuild 7083 BLAKE2B 9f8bfa1c3d01f79f62faf84764279727eb2bb27909c51e14dfdbd3540b8ea01e17b6eb789da165e309d5876fb362ef84b92fd63eeeff6aecd00ac0323231461c SHA512 f52f9c57ec23e60949246362205bcf3f5f61314d81c22c291caca23c5f706ae799e00456b387a3f375e7fc9e8c0f037b7de44fd14c1b9e1981bd7f56158c842a
+EBUILD nodejs-16.1.0.ebuild 6814 BLAKE2B ef9da264584d3bfdcc3c9c07d69bdeadc2e00a5bf094534799367488a27df0aa2dc296f9fde63683c0a43f095231f4d117268006947f01c2514704a1f40e1b66 SHA512 8eeba25b13eba364657c2e7999b9eccf18b6da0462911b5b95788639b3598c2f87593dd62dd4c6e173bf608790bc231cbf5cb8ce99678f49d69e7c06867881fc
+EBUILD nodejs-16.2.0.ebuild 6751 BLAKE2B 36bde76cfbfd2b96f332934993eab783ba8aa3fb1f86f027d91a9e5db5850c88bfd6e97ad2dd0c1e882999588cd90ff519879558ba66156ca577011c00e916d0 SHA512 e3938639db32b7ace5c84db61e2b9e84cf39581df42f06287063efcae02ddd7f5d2b0c1b60bdc8914e09651c44dce2cbf9549b5985a8dc381209b5463054a871
+EBUILD nodejs-99999999.ebuild 6590 BLAKE2B 893ec3a62202b9c38aa213175c405da66490b53bff00394d5b5d71508212735c12665dc88ca9929687aa43d36522ba7bc44a9cd3c88272ec55e807ebf48d194e SHA512 66c8892ddf86330fceebcc8646460f03eb9d719a878198c2953f4f72b39154a1aad290e200e40211d0cd3595d8f5939eac6fd1e7178c66d7ce5050592aa720e1
 MISC metadata.xml 1000 BLAKE2B 4785dba31037ad28281266047c8e59cd1d3e0e723128831f3aebc0436727b41c283284a450b5c619868e0317d3bc61e239a85e0d47773e9867f2606d5dd59047 SHA512 6556cf00ea009b394a56de614226b8cf0e04e868f47d827dba1907b5d89b957d738e4529b6338126cff9ccbd573c4451e9c2d5d4f93e4e4dad376e88419ef489
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
new file mode 100644
index 000000000000..5f0df09b6e2e
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
@@ -0,0 +1,95 @@
+--- a/deps/v8/third_party/jinja2/tests.py
++++ b/deps/v8/third_party/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
+--- a/deps/v8/third_party/jinja2/runtime.py
++++ b/deps/v8/third_party/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/deps/v8/third_party/jinja2/sandbox.py
++++ b/deps/v8/third_party/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/deps/v8/third_party/jinja2/utils.py
++++ b/deps/v8/third_party/jinja2/utils.py
+@@ -482,7 +482,7 @@ class LRUCache(object):
+ 
+ # register the LRU cache as mutable mapping if possible
+ try:
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+     MutableMapping.register(LRUCache)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/runtime.py
++++ b/tools/inspector_protocol/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/sandbox.py
++++ b/tools/inspector_protocol/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/tools/inspector_protocol/jinja2/tests.py
++++ b/tools/inspector_protocol/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
diff --git a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
deleted file mode 100644
index 1061255e1637..000000000000
--- a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-    Bug: 694100
-    Add actions for pax marking mkcodecache and node_mksnapshot
-    to disable mprotect for pax enable kernel.
-    Reported-by: Attila Tóth <atoth@atoth.sote.hu>
-    Co-developed-by: Attila Tóth <atoth@atoth.sote.hu>
-    Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-
---- a/node.gyp	2019-10-23 11:52:41.000000000 +0200
-+++ a/node.gyp	2019-11-12 20:58:43.957881862 +0100
-@@ -233,7 +233,9 @@
-       'deps/acorn-plugins/acorn-static-class-features/index.js',
-     ],
-     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
-+    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
-+    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
-     'conditions': [
-       [ 'node_shared=="true"', {
-         'node_target_type%': 'shared_library',
-@@ -436,10 +438,24 @@
-           ],
-           'actions': [
-             {
-+              'action_name': 'run_pax_mkcodecache',
-+              'inputs': [
-+                '<(mkcodecache_exec)',
-+              ],
-+              'outputs': [
-+                '<(mkcodecache_u_exec)',
-+              ],
-+              'action': [
-+                'bash',
-+                '-c',
-+                'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
-+              ],
-+            },
-+            {
-               'action_name': 'run_mkcodecache',
-               'process_outputs_as_sources': 1,
-               'inputs': [
--                '<(mkcodecache_exec)',
-+                '<(mkcodecache_u_exec)',
-               ],
-               'outputs': [
-                 '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
-@@ -461,10 +477,24 @@
-           ],
-           'actions': [
-             {
-+              'action_name': 'run_pax_mksnapshot',
-+              'inputs': [
-+                '<(node_mksnapshot_exec)',
-+              ],
-+              'outputs': [
-+                '<(node_mksnapshot_u_exec)',
-+              ],
-+              'action': [
-+                'bash',
-+                '-c',
-+                'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
-+              ],
-+            },
-+            {
-               'action_name': 'node_mksnapshot',
-               'process_outputs_as_sources': 1,
-               'inputs': [
--                '<(node_mksnapshot_exec)',
-+                '<(node_mksnapshot_u_exec)',
-               ],
-               'outputs': [
-                 '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
diff --git a/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch b/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch
new file mode 100644
index 000000000000..5ddd1fe7d08d
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch
@@ -0,0 +1,119 @@
+From ca4bf75504d07db5e1e66ec5c867cd76c90268af Mon Sep 17 00:00:00 2001
+From: Junliang Yan <jyan@ca.ibm.ca>
+Date: Tue, 11 May 2021 08:57:03 -0400
+Subject: [PATCH] ppc: Prevent trampoline emission on deoptimization table generation
+
+The deoptimization table needs to be continuously, so we need to block
+trampoline pool emission during the whole process.
+
+bug: v8:11759
+Change-Id: Ie5e0ffe27dc8e6cdb18985dc2cf26bdadeff318f
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2881918
+Commit-Queue: Junliang Yan <junyan@redhat.com>
+Reviewed-by: Jakob Gruber <jgruber@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#74506}
+X-Gentoo-bug: https://bugs.gentoo.org/785751
+Backported by gyakovlev@gentoo.org
+---
+
+diff --git a/src/codegen/ppc/assembler-ppc.h b/src/codegen/ppc/assembler-ppc.h
+index 794b917..ae04118 100644
+--- a/deps/v8/src/codegen/ppc/assembler-ppc.h
++++ b/deps/v8/src/codegen/ppc/assembler-ppc.h
+@@ -195,6 +195,12 @@
+ 
+   void MaybeEmitOutOfLineConstantPool() { EmitConstantPool(); }
+ 
++  inline void CheckTrampolinePoolQuick(int extra_space = 0) {
++    if (pc_offset() >= next_trampoline_check_ - extra_space) {
++      CheckTrampolinePool();
++    }
++  }
++
+   // Label operations & relative jumps (PPUM Appendix D)
+   //
+   // Takes a branch opcode (cc) and a label (L) and generates
+@@ -1334,12 +1340,6 @@
+   }
+ 
+   inline void UntrackBranch();
+-  void CheckTrampolinePoolQuick() {
+-    if (pc_offset() >= next_trampoline_check_) {
+-      CheckTrampolinePool();
+-    }
+-  }
+-
+   // Instruction generation
+   void a_form(Instr instr, DoubleRegister frt, DoubleRegister fra,
+               DoubleRegister frb, RCBit r);
+diff --git a/src/compiler/backend/code-generator.cc b/src/compiler/backend/code-generator.cc
+index 023e697..62e57fe 100644
+--- a/deps/v8/src/compiler/backend/code-generator.cc
++++ b/deps/v8/src/compiler/backend/code-generator.cc
+@@ -416,23 +416,29 @@
+     std::sort(deoptimization_exits_.begin(), deoptimization_exits_.end(), cmp);
+   }
+ 
+-  for (DeoptimizationExit* exit : deoptimization_exits_) {
+-    if (exit->emitted()) continue;
+-    if (Deoptimizer::kSupportsFixedDeoptExitSizes) {
+-      exit->set_deoptimization_id(next_deoptimization_id_++);
+-    }
+-    result_ = AssembleDeoptimizerCall(exit);
+-    if (result_ != kSuccess) return;
++  {
++#ifdef V8_TARGET_ARCH_PPC64
++    v8::internal::Assembler::BlockTrampolinePoolScope block_trampoline_pool(
++        tasm());
++#endif
++    for (DeoptimizationExit* exit : deoptimization_exits_) {
++      if (exit->emitted()) continue;
++      if (Deoptimizer::kSupportsFixedDeoptExitSizes) {
++        exit->set_deoptimization_id(next_deoptimization_id_++);
++      }
++      result_ = AssembleDeoptimizerCall(exit);
++      if (result_ != kSuccess) return;
+ 
+-    // UpdateDeoptimizationInfo expects lazy deopts to be visited in pc_offset
+-    // order, which is always the case since they are added to
+-    // deoptimization_exits_ in that order, and the optional sort operation
+-    // above preserves that order.
+-    if (exit->kind() == DeoptimizeKind::kLazy) {
+-      int trampoline_pc = exit->label()->pos();
+-      last_updated = safepoints()->UpdateDeoptimizationInfo(
+-          exit->pc_offset(), trampoline_pc, last_updated,
+-          exit->deoptimization_id());
++      // UpdateDeoptimizationInfo expects lazy deopts to be visited in pc_offset
++      // order, which is always the case since they are added to
++      // deoptimization_exits_ in that order, and the optional sort operation
++      // above preserves that order.
++      if (exit->kind() == DeoptimizeKind::kLazy) {
++        int trampoline_pc = exit->label()->pos();
++        last_updated = safepoints()->UpdateDeoptimizationInfo(
++            exit->pc_offset(), trampoline_pc, last_updated,
++            exit->deoptimization_id());
++      }
+     }
+   }
+ 
+diff --git a/src/compiler/backend/ppc/code-generator-ppc.cc b/src/compiler/backend/ppc/code-generator-ppc.cc
+index 3e4e94a..0281376 100644
+--- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
++++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
+@@ -4296,7 +4296,15 @@
+ 
+ void CodeGenerator::PrepareForDeoptimizationExits(
+     ZoneDeque<DeoptimizationExit*>* exits) {
+-  // __ EmitConstantPool();
++  int total_size = 0;
++  for (DeoptimizationExit* exit : deoptimization_exits_) {
++    total_size += (exit->kind() == DeoptimizeKind::kLazy)
++                      ? Deoptimizer::kLazyDeoptExitSize
++                      : Deoptimizer::kNonLazyDeoptExitSize;
++  }
++
++  __ CheckTrampolinePoolQuick(total_size);
++  DCHECK(Deoptimizer::kSupportsFixedDeoptExitSizes);
+ }
+ 
+ void CodeGenerator::AssembleMove(InstructionOperand* source,
diff --git a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
index 84110ff87064..9c4fe05c005f 100644
--- a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
+++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -30,6 +30,8 @@ REQUIRED_USE="
 	system-ssl? ( ssl )
 "
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	>=app-arch/brotli-1.0.9
 	>=dev-libs/libuv-1.39.0:=
@@ -53,11 +55,11 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
 	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
 	"${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch
 	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
-RESTRICT="test"
 
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
@@ -100,12 +102,8 @@ src_prepare() {
 
 	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
 
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
+	# Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
+	rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
 
 	# debug builds. change install path, remove optimisations and override buildtype
 	if use debug; then
@@ -228,8 +226,14 @@ src_install() {
 }
 
 src_test() {
+	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
+	if has usersandbox ${FEATURES}; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
 	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild b/net-libs/nodejs/nodejs-14.17.0.ebuild
index 82f78fb0068e..6f3e887f73d1 100644
--- a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -48,6 +48,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
 	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
 	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
 	"${FILESDIR}"/${PN}-14.16.1-v8_icu69.patch
diff --git a/net-libs/nodejs/nodejs-16.1.0.ebuild b/net-libs/nodejs/nodejs-16.1.0.ebuild
index f8ca995c2e13..e1f164dff75c 100644
--- a/net-libs/nodejs/nodejs-16.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -47,9 +47,11 @@ BDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
 	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
 	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
 	"${FILESDIR}"/${PN}-16.1.0-test-repl-history-navigation.patch
+	"${FILESDIR}"/${PN}-16.1.0-ppc64-segfault.patch #785751, drop after it stops applying
 )
 
 pkg_pretend() {
diff --git a/net-libs/nodejs/nodejs-16.2.0.ebuild b/net-libs/nodejs/nodejs-16.2.0.ebuild
new file mode 100644
index 000000000000..95fb8c3f56fe
--- /dev/null
+++ b/net-libs/nodejs/nodejs-16.2.0.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-16.1.0-ppc64-segfault.patch #785751, drop after it stops applying
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
+	if has usersandbox ${FEATURES}; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 2b81f6a39ed8..2d45db3952a5 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -46,6 +46,10 @@ BDEPEND="${PYTHON_DEPS}
 	pax_kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch  # still needed as of 2021-05-13
+)
+
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 41a3e4c90b6f..b8c5b6a56670 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,5 +1,3 @@
-DIST ntirpc-3.3.tar.gz 387212 BLAKE2B ee656510cadaa041b4ea389710f667021e07697744dd60ce71f4e856ed91339cc5373bba771ba6bcc09d86e32502339bce7fb1c7e8ae411ec38ebade87cdb735 SHA512 c5586be51960c682f719dc0aae21846cb1af6bab10c1d3b946570508947d281f776595e2f0d12edddd9d0289e737fc2fb823ed5060dba6b6e5c6b01f28c84cde
 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-3.3.ebuild b/net-libs/ntirpc/ntirpc-3.3.ebuild
deleted file mode 100644
index 6e63e824706b..000000000000
--- a/net-libs/ntirpc/ntirpc-3.3.ebuild
+++ /dev/null
@@ -1,33 +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/rest/Manifest b/net-libs/rest/Manifest
index b45b791c3a1c..e315acc937e8 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1509 BLAKE2B 4109ee31b04df1419eb9d4fe271899941c950ebe131d1b0aadffad6e7a1869895c4c5db697e4cab4312811960fcb754d0ab1fd08c9434c67891f7e9f722acbfd SHA512 ddf7bd8d247b5ed67064d57d3b01dfcd20d132cab5984a9df923389259040f976a5f1c0ab5025c2ac4ced3d45fd5fe770e6daed459b0b0e9a00d0d61bbbd1a6e
+EBUILD rest-0.8.1.ebuild 1516 BLAKE2B c35afb9790f3339f2140800a23ba5718056291052d05b661f31130194768d13fe00ac48559e0b182ff747fb1c18f9df74c48c85269739b85ab1421f5dbe6e04f SHA512 95e9637d13305285e6d85c2262e2863a65b6324a39e40d569a90b626589150b39162ddffe4b9680dda41b9a3faa5119eb9c71aa7b571773337c3b859569dff6f
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
index ac7d01ee58ed..1a871b83d473 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0.7"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 # Coverage testing should not be enabled
 RDEPEND="
diff --git a/net-libs/rtrlib/Manifest b/net-libs/rtrlib/Manifest
index b55c6105cc16..ec3c8dd124a8 100644
--- a/net-libs/rtrlib/Manifest
+++ b/net-libs/rtrlib/Manifest
@@ -1,3 +1,3 @@
 DIST rtrlib-0.7.0.tar.gz 260699 BLAKE2B ea8b70b1ca1fb7cacc2943228e398e16f61de6264702f87e6bc5dc011dbb77e760a4e317f109e13b882efd9c080847e6e86c9c47afdc4518db5de210621181fc SHA512 e1c78ce92d066308c1c4fbb6575c2f0dc0f6840c16be90e27bd0da184cab7d0fa4dd1cff3677eda5f1720184756e02765e5abd267b0da0d183082721fee2ffd8
-EBUILD rtrlib-0.7.0.ebuild 1070 BLAKE2B 547b87ec1ccba62a9973e123955f8e5f054d1f23d68cb260489f3e2b941354ce240785595eb91f44ba096771d7e473f5cdbee97cb622edf539eae70366f4348d SHA512 4a7ace0206c5a1828a12e6ee79a331fcdeffe9a20c0d292e40b64ee04bb6bd256fcae87b305d49f8dc9c461cd11c9513651d2a0d708f64d46d028bdb090b580a
+EBUILD rtrlib-0.7.0.ebuild 1077 BLAKE2B ac81f9c6f5ae3473d1a2c39b8d3534e0a43beca9cc6565e1f9fa9d74fa77d44ed5ef998311f787a09fe18bc1bd8f97bf40f31f27e512957d8f524d53cffd5227 SHA512 e84a86fe9e7f103bba945cc027d9c27e06ea6c84e11af451d34e67b033d69ae1e98390dfad1f4561fb696f465bbfdd4ddd4d2693a71b826d5fe948a357d2dd2d
 MISC metadata.xml 314 BLAKE2B 2c542346560c4c3fb2aac071c7b1e86c77c44bf84e2bb0cf0adc494befe7287193c9188d74cdca9a6a13b28e19a892750877fccc36b8416cabfb37cb99b7e01c SHA512 d6847c79918cf25ec8e8071f1a1653c207834441a146e600b64609ce533694885ebea1bf3d1d73f3b71606d94924d3249197a5ad4b4086985b45e2653fc7f9ef
diff --git a/net-libs/rtrlib/rtrlib-0.7.0.ebuild b/net-libs/rtrlib/rtrlib-0.7.0.ebuild
index dfb7e34b6aa2..494f58bcc643 100644
--- a/net-libs/rtrlib/rtrlib-0.7.0.ebuild
+++ b/net-libs/rtrlib/rtrlib-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rtrlib/rtrlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 IUSE="doc ssh"
 
diff --git a/net-libs/shairplay/Manifest b/net-libs/shairplay/Manifest
index 968ec09701da..ac8ae02fd0e0 100644
--- a/net-libs/shairplay/Manifest
+++ b/net-libs/shairplay/Manifest
@@ -1,7 +1,7 @@
 DIST shairplay-0_pre20170118.tar.gz 291352 BLAKE2B 0eb1a60e7cd3511d24d7f6fc910afa85df4488a96ffca80d98bf00b8544b05630f8edb2f5204bc93e8901c4d8efa752f2eef94ed625e2bf7d77cd74ed3053572 SHA512 05a8ac399659235e88d3b1a7fbe8364ba526881b24ee082c3b7a5709b9b63eac376071d44028e4758ab22ca56d30f8e996b12dc9d3bd99bd38fe453e00a4a18b
 DIST shairplay-0_pre20180824.tar.gz 554332 BLAKE2B cbebe272a15a602b79f384c7497bd849145bf065a9b2c6fd335c5536dd0cbefef332945662ad4962e69273d64a23c1f2ace3edcb7c38362607414d27a61397fd SHA512 38d947740da85546cccc4186dfd6d1ab0be71463107b24beb374b17a9e557fc7e4c97e34bfd69e962ddb3e481ecc8e37070e225761d8543588cf047be25ca3a6
 EBUILD shairplay-0_pre20170118.ebuild 960 BLAKE2B d8dd128013d9402402f489d81c6f9d44b70c3b4283852643a9fa1b313538fb48f0900e254faed5ac100e480d7021dca2a776056ab30f977b9dd915314e0b32eb SHA512 3ce15525ded41e9ffd2d6ac3134a73a8bc0a8bea1d018d3e93f42c5aa35a9b983e3848806fad8089f20e9ca7fdaab1c1ba7ad7697423872b1a9f4c89be48018e
-EBUILD shairplay-0_pre20180824-r1.ebuild 937 BLAKE2B c55059eb90eb8cbd9e1b1938ed0b7fecf52771059218c001e8aee07be1c74748202253713e0e6389e0af151b19ba221744ba87aae61f2685e9578aedf49a4236 SHA512 5dbeb48b68bbe8c1bb77638e68e6482846777be0a61dba69b5d6d1b02f5b562f19e8f9bd670d7292de0c46d1129883e9f59fd3e49d8e52759715bc06cb3bbe88
+EBUILD shairplay-0_pre20180824-r1.ebuild 936 BLAKE2B 58a1b6b1ecff1666ee1ed759f315aaacac8ec61a96fc6b9ab34ac5c8071aaf15d52fe90838168cd9fa20f44820fc591933afff6e0b1c7a82baa31fb6ab0d032f SHA512 b91fe0a5285b7285e95c8fb567b5f7616c7d06ed73a9116c064f7078ed0d446d543cfbeec492904ec6abf8170959d12b82d28508a3f14275623d38110dc77f5b
 EBUILD shairplay-0_pre20180824.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
 EBUILD shairplay-9999.ebuild 926 BLAKE2B c6a518f8deff81b1072948c6be8376cec5827da017e721b1179681fe7797db542fd009aeba277c5aee83997d183fc0c9f7f5ea8fbbb7e9dab0ab9b9247331d70 SHA512 4b76ddc7c46d1712831b1cc5cbb5a03e9727b28c7839a3b4a511ae4a3c16a15fc6d4b3d700fbb9d9356394b472c5023dab128923d446ebce34d973c2dfba32cf
 MISC metadata.xml 728 BLAKE2B b706a2a73f7d5c6119c6202452535f1b174a0ae6ae63656155941116c9edbe1b96c607624d235bb0410790f0c36d2ca3b602a0169486825e3fddba2b394dffe3 SHA512 911c29e609c4f991a7c8cb031fb71ab66440d4959a1ba16fb45f8282a770588d3572b8712b4afcf531404c993b1657e6e9d4d749b655998822e7e9d0c46cd3b5
diff --git a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
index 1e2073dc00df..cee511c1686b 100644
--- a/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
+++ b/net-libs/shairplay/shairplay-0_pre20180824-r1.ebuild
@@ -12,7 +12,7 @@ else
 	EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e"
 	SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-	KEYWORDS="~amd64 ~arm arm64 ~x86"
+	KEYWORDS="~amd64 ~arm arm64 x86"
 fi
 
 DESCRIPTION="Apple airplay and raop protocol server"
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index dc89905ef05a..c26f2b1166cf 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -2,5 +2,5 @@ AUX 1.2.4-tests-pid.patch 1229 BLAKE2B 96466d9b8da797a31140d862326f5aaa3ecab0098
 DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
 DIST socket_wrapper-1.3.2.tar.gz 86255 BLAKE2B 33f526a8871cfb1a889a84660ea8e82b6e591646924e16d2c452bb001e0eb4c1457b8151208bbec55c13c40fd124c160fc85d0df227519f62a2683e4ea1acb85 SHA512 f4d3a7026f1777a4c3b5481a0f6e6057b6372e9b64f44523ec1ebf0a34159d7154493dce6ee3c95fbea15607c6ada1382f2475d5d553133a061c80719c135b9d
 EBUILD socket_wrapper-1.2.3.ebuild 654 BLAKE2B bb26492c7be4e1bf50190fdc4bb4114ed4ed22613076f90e6500fe568ff1b1363e4b84f9b72e746728eeab3115ef9f224f5d583b789ff5437404dec5dab4dd70 SHA512 68604ee3717a131e17eb8e8f165b8b05b950e9b41c4cc2a19471d4a6fc1784cc9170f292613fdf97b76832b8a785ce00ab8cccc94991d28931d3df0e023b7c77
-EBUILD socket_wrapper-1.3.2.ebuild 629 BLAKE2B 1324ea81c9aa6f37176adafdceedaf4687e37c519564435db746cfcda785bfe13d9e4044a8a9f016164fa90454788e806742b14832fc37247582d6a2e4201e57 SHA512 0f93abec3130512e153936a6353884da8e09818d14d872de5821e5a81fd7266633533166ea72135dc45a4f08186e80052276c0f2012ad6b1bd3299c355d42b44
+EBUILD socket_wrapper-1.3.2.ebuild 625 BLAKE2B 2f21dabcf5cb5cdfb83dee1d0bd1087fd8ab16d4877cd895af32489adb0952c30cd2294b2eaebb4cafd5775a7c66eba6fa0d567085195d5878a54f8115a698dd SHA512 c8ea9e7258d40daa04ea539592e63a7b991d31a11490e4650658fe119d4c3e3ffe664fc99090515ae9b3d4c09243aeed31288af75558cbf19aba011b8ca50546
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
index 10e7451f7c0a..590a6da95fa0 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index db14a6b90f5a..ed4b6e137ae5 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -5,6 +5,6 @@ AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd854364
 DIST c-toxcore-0.2.11.tar.gz 507476 BLAKE2B 67e86a5e5c8da1c387a319e6726eaccec28608f165f0b165d12e379cc7d8080baf9b89f438804ab8e59a8690a11bebba7f2ef689554800312fe039da77e70cac SHA512 616b30423a170463b4445f6940e038fd9af820946c970260fcf72cc54d08d2615364b9f086869180e3ae26154ea92fea6e9a602366306bc40c3e1575e86350df
 DIST c-toxcore-0.2.12.tar.gz 504832 BLAKE2B 625713142cc1e4b6583879144c05d47a40a1d98031a8a2bf0deec85a199f816a0ff6df5c76e9487a526d7c1c1650b37a10ed81be8233eaa1395707851378474f SHA512 c22f139cfff3a5aedf5fb08c33cae0dae3d6fbceec87867c81290e3bf9d2e13466a0e2bad8378a7a7ba1e9b7b9ad756712963461ae248102e4cab7d4691228d8
 EBUILD tox-0.2.11-r1.ebuild 3223 BLAKE2B fddaa170b391fb67b8eac614c602487cf71a000e0437d3b87826499f268e5d410ee7239ab12f7b0b2acb7bc5c88a60e3daf7c694572fb2ba47167b4cc73cc005 SHA512 f0e18ffec3d23b9bc6c9a143aa0f3c666dd4cb791cc9303bc92e6a6160dabbdf8972af4cf517f3fce5e24344f5c4e0b057a2edc06b0d0b234fee6858a907d1be
-EBUILD tox-0.2.12-r1.ebuild 2907 BLAKE2B 917c21eb2e5db46f661cbacac527f034480818394f6f21ce03c3c4d7e94c8b6b830c461a15230fef4ef16dab91e9ea0e27ee62d1d141b39a5a76c6ee03a1bc05 SHA512 4d8e8680868a0190ba5ea0e926d8cd3ce192a2cf55293586df39e37b7d066ee8fa1fb76c008a72ad9610c6091b93ceab5caedf76d642245b431c59ac80c4444b
+EBUILD tox-0.2.12-r1.ebuild 2905 BLAKE2B de657ca8b2815d0d165a41ea78026bd8f813aa4e601336db68f7123ffd52c0b97e9bd10c99591c3af9f27ec53974521ed3c37b90ee4509961a67bd667a7dd12c SHA512 0265c8c0ebdf18113f600f2d5ad8cb2d87965b3b43393502dba0acde2e587974981e077c69f18ad7303b1d419649ce814afa5102f2a9eb08d60ceb148a14d255
 EBUILD tox-9999.ebuild 2719 BLAKE2B cee3819c949279bc5003f53772161c4606a339918050c5f11ede33e75a38fff8c045d07aba94a20ed8514c9a438a64966c9944aefbafd51b7407d3eadef86b3d SHA512 bb32c733c7daed2f65061d46935d53b5683cf81a771d538ee642902665402fa3a1a24dd547e7203b492982f407e672ebc3f036f7fb9deeea0d6ebdd877e09166
 MISC metadata.xml 900 BLAKE2B d0c1969039265915fd04e0638218706c4f1fe2eef0e7a7cb0c16dcb5090dcae18719d9cd56bf4d67afcfe2b4c49449afe53b32107ac609fc561f1140462f49e4 SHA512 d0ed83f52ed7ac841852645eaaaca4a8bf9a84ce56d5e2bf12c6f71a938881a94234b6716a4f1e9ceb2ce1e154912f28e2d6cad23913335dc1a89f7cb8057bef
diff --git a/net-libs/tox/tox-0.2.12-r1.ebuild b/net-libs/tox/tox-0.2.12-r1.ebuild
index 3e3ebd067401..62cb752a4e22 100644
--- a/net-libs/tox/tox-0.2.12-r1.ebuild
+++ b/net-libs/tox/tox-0.2.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.ta
 
 LICENSE="GPL-3+"
 SLOT="0/0.2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 6e8753c75aa4..3970ce914046 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,8 +1,11 @@
 AUX 2.28.2-non-jumbo-fix.patch 1675 BLAKE2B 13541ce6392f921663dd8af6d8093e9de8b02e7d9e82cc7e06b7126e36d9c060f2342b57985bc7a5d1fa52c4d2203cdf7164a87af60ad9872bc6d12b7e14b435 SHA512 51da3680d873e7ee435a4a4bf0d23171a4ecf80fc3ea5ce60c71a55db2cf090754a4ed0c0a5297995f3729928d31541bab9528695c557c0c309338a7a75439b6
-AUX 2.28.2-opengl-without-X-fixes.patch 1656 BLAKE2B 85b825f0138a40f6647ceba693dccf644a1f86b9c57cda2ee8d6999830ad0bad13456aadf32c6789dafe7531b53f63644d5214b275159c3fce103b262a950461 SHA512 93cbbf092d9953c176bdcfc384e83ec276af35aa9c7645088a56d5c18934712d93aeee7e4c6111e1eb816b54d290ae6b23030683f81bde0f91c3ba3ff440f85b
+AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
 AUX 2.28.4-non-jumbo-fix2.patch 1196 BLAKE2B 735a58a9ccfc9fa61a7d8e649262404d3a1b1b3aa257181f026ceb6b6dfd602679d1add974d6930ba2033643cd9cf8bbb3fea0bf87ec85f769d55de5635d6828 SHA512 78c1426f34dacb65090356157963ae0be4a59c4c7905cfb9a59cc5cde766d2931b68872cb55369a74a871f88f4244f3db8ef8d30ee74d8e75acaaa8893ce7989
 AUX 2.30.3-fix-noGL-build.patch 1005 BLAKE2B 644b114779d34f644168e3cd1e4fcb5827bd39afe3c0f6a615c7ac9ff36b74d9a4ed34b7d91ff9400fd5acaa4d9321c22662d8625a7510a2c6ae411d6bd4c593 SHA512 15cc427a6db3fb32f1951d1dbb39b5d869601be916179d17dec244e80cda16814598271667e2cee75d367e596c470bb8c837abc7651e65ab19305c9b9fbf0002
+AUX 2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch 1893 BLAKE2B be04d827fee9d17d64230c485add8dd21be6f8c9787c0407973774fd2ced724c00c688476c47bddaccaed3b59dab53dfc4de11f2b96139fe2a74b68cf57eae50 SHA512 3eaff22c9002fde1567331ede3196c733c34986932212954270bb59a5c776d6e4709ee8e366cdcdaeb67e36cd7757d01f4cce84ce4e2d6a1eca3c6ab3fa98f66
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
 DIST webkitgtk-2.30.6.tar.xz 22311524 BLAKE2B 369a2f03b99a17b3e7ffbd0a8528a0d7f65334138552e7684fdec6b3003fab8d9a946f1b549849562b71e9a0daa3f870578d088833db2e8e291974bd38eaed05 SHA512 fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f
+DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863 SHA512 ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843
 EBUILD webkit-gtk-2.30.6.ebuild 9253 BLAKE2B 6329515f2f5d078f3e1ecbbd0a421d0ec7eb6453823b531671f55ea2db37a167e06f2d218724274e7344151a8ec2cdb9e17c1b0690a8a4f7bc326a5603e92f61 SHA512 c2e89802288ce9298bc73b82f59ceaf08692cf9eff5a36177d44c0b96d7bded2dca90342b599c16c7a7bb4813deadbd29d0fd83ed60d162b1055d574ad6b2856
+EBUILD webkit-gtk-2.32.1.ebuild 9224 BLAKE2B 77078575ce00bebd07aefcae7eac74a8eacaf69f0f4b896612261be08b771e48c168dd1744e9aa36824f885a83fa294cdb973f17aae91c58231cb90a76539459 SHA512 fa497e9ede9f440fc32c897521f9d1e945b6451ec704ecf0ce1601e64aecccd6eab1ec0144dc6b5aa990c3f4e9f8f7b37b3232be6409a5c133d1aa0974711474
 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5
diff --git a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
index 6976c3ce4db0..7feb2fac42c3 100644
--- a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
+++ b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
@@ -1,3 +1,5 @@
+https://bugs.webkit.org/show_bug.cgi?id=208907
+
 From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
 From: Mart Raudsepp <leio@gentoo.org>
 Date: Sat, 9 May 2020 23:11:52 +0300
diff --git a/net-libs/webkit-gtk/files/2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch b/net-libs/webkit-gtk/files/2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch
new file mode 100644
index 000000000000..dfe0ed9ef002
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch
@@ -0,0 +1,36 @@
+From 94cdcd289b993ed4d39c17d4b8b90db7c81a9b10 Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Sat, 10 Apr 2021 22:02:50 +0000
+Subject: [PATCH] Properly use CompletionHandler when USE_OPENGL_OR_ES is set
+ to OFF https://bugs.webkit.org/show_bug.cgi?id=224149
+
+Patch by Charlène Wendling <julianaito@posteo.jp> on 2021-04-10
+Reviewed by Fujii Hironori.
+
+* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
+(WebKit::LayerTreeHost::forceRepaintAsync):
+
+Canonical link: https://commits.webkit.org/236373@main
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275802 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/ChangeLog                                | 10 ++++++++++
+ .../WebPage/CoordinatedGraphics/LayerTreeHost.h        |  2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+index 6727d16c8c0b..db65f813267d 100644
+--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+@@ -213,7 +213,7 @@ inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { }
+ inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
+ inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
+ inline void LayerTreeHost::forceRepaint() { }
+-inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&) { return false; }
++inline void LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&&) { }
+ inline void LayerTreeHost::sizeDidChange(const WebCore::IntSize&) { }
+ inline void LayerTreeHost::pauseRendering() { }
+ inline void LayerTreeHost::resumeRendering() { }
+-- 
+2.26.3
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
new file mode 100644
index 000000000000..eb00847845d7
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/${PV}-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /net-libs
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)