gentoo resync : 11.08.2021

31 files changed, 98 insertions, 74 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5e675e08c9b9..77c28198d9ab 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 74ea55b3bf85..177fe788d408 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -10,5 +10,5 @@ EBUILD courier-authlib-0.70.0-r2.ebuild 4470 BLAKE2B 1c1dcbde260e5b444297ed285da
 EBUILD courier-authlib-0.71.0-r2.ebuild 4462 BLAKE2B 9d4820ae42e6c5f89f74a2a38c75358b7bea3ff5ce1abb658edfe7b6f8167fa0392b4fc6da69efb2a06f602f20bc434deccce93a837839cb725e29a2913931a2 SHA512 e1da10fd1729f371d37116ef3d59ebf32c401fa3aefcea4e46b117321ed9fd46f16226ff10bc8ffb6ce96e3fae4b2f2fc2b9c7ec3b2675ad7405aa750b3f3f29
 EBUILD courier-authlib-0.71.1-r2.ebuild 4472 BLAKE2B 6b0fcf845187e296e305d7c09f6e5cc29ad0447f04af56313a866dfe5a7d94b9b86e6f2804be1d31c913004eb0fe6053fb0528377e49aba71583d1a8a58f9353 SHA512 c4e46181e82bfaa7a6b24e53675d04d6615324ecc348ba018200f44bff9f0c085a9e8ac0f70fdf9b432cf7eec58e9b6076518d6337019b4e5d08907694821a37
 EBUILD courier-authlib-0.71.2-r2.ebuild 4479 BLAKE2B cee2dff7871ce782ce545270dfeb56c38d6246156ae618aeb356622711808ec3e3e0ec832305cd4dea1658b302def0f07e30639093bf42378823f7b6aec04f03 SHA512 3186622faab364d72b893b39b7e5c6fa1dc76aa5c4b70a3ef45eb5ae4be6b84692827a0ecabb7bd42824c2e760009a7764300306e957e8500882633171a85ccf
-EBUILD courier-authlib-0.71.3.ebuild 4474 BLAKE2B 54f82c6c68548ecc86f39d6253b1e53976ed4d2807e13d2cd47b391f3ec922b6b82b51b8aa778ab4bf8f48408fa7b1b57a38f0f22a87349e9351bc65055d23ea SHA512 f56d48873bfb9a634d1d94bb3672c3fdfec3dd2989b352d1a9ec8106ca678cfa87869c8df47e5d9a01fce7f45fc4736b8db8b3928e03f66759ed047a22e1a533
+EBUILD courier-authlib-0.71.3.ebuild 4473 BLAKE2B a948b70c63b88083b677920948a5c5535d95d4c39630f652a425752f4c63f011b53dea0a976b2d786ab8decfd637687eafd546bd97370543729417db6fb3e7bf SHA512 1bd1908cdd7c8078e57827881aedb649eb05f03d3539d98837fadfa208227e1e40fee66c64ac1a943313134736ec7e450d3ebfc920a02ab0c4f6f39d13d80d07
 MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild
index 8b5a627c584e..208ab35e3610 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.courier-mta.org/authlib/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
 
 RESTRICT="!berkdb? ( test )"
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index f2d4fc3bf144..d9633dfac92d 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -4,5 +4,5 @@ DIST courier-unicode-2.2.3.tar.bz2 593337 BLAKE2B b384aaac20ae645f4eaf256c90e50d
 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 533 BLAKE2B 73fe6af406ca3267a020f01bce7edfcd17f8b835ed920e8791f9aed6d7ea528697fa5b10420807728116e1a53436e574f88396bf97b329c204b2061bba3bf447 SHA512 568d006e27109347d1470bc20b9a0cb5395aa6e722eef9ce0042f22c51460b26937ea35b361c4baefb51945c98c898d14be535f52950cb4897f2160aaccf2ac5
+EBUILD courier-unicode-2.2.3.ebuild 532 BLAKE2B 5c7d054422b8c075e3410bd43fd7da94c38490e2f8e5fbfd2c385c431d6d3dd94d0970779074f304bb065a55bbbb9135f37b0f4d363c74a47e34813d066024a7 SHA512 88ee57b38dd371d91d2c6a393c27f051c3aabd8554bdce0a30eb4209348d4782b2caeca72f4e61d9e38ec7bc33071faf3843f04c21c038dd0d350bb2b8441846
 MISC metadata.xml 293 BLAKE2B 85c442aa45e6a97917305b7e9326f8445f5911a3a3913d3540250b83361a16bc07810b8288a692082d9a2203bd696ba87d8fa1b6ba47c046f6d96577d07400af SHA512 39ee602134069ac766933c31bacbab2de9f40aa8bab6450660ce5319a95e285f4d4c463df41f22d7fd7e1c8584634a4b3ada8962941143fe8d4120cbb11515f0
diff --git a/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild b/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
index cab28dc31f1e..e8e9f45e2e27 100644
--- a/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.2.3.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 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 src_configure() {
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index ba48dcc60aef..df058ff0fc71 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-online-accounts-3.40.0.tar.xz 860724 BLAKE2B 47f22af85b701854396c462df04b9ba2e004ee4a954619916240fef0f8139e3a37608bb9c16e4cfabbb6fc863e7448678a48865620c0293d231f9b125fe9c904 SHA512 ac90226023e2a69ad9cd12faf637844a029814282f164cc905810bf54af6693069b9019ca58211deb8487f6a32886eb072a1223fca32bc4e3fe0bc91ce8f2d6c
-EBUILD gnome-online-accounts-3.40.0.ebuild 1980 BLAKE2B 6b31a1fd99e8dfd66ed4fe5ac94620893ab4ed188097ca345d9ae33553195e0e36522b32746bfee0cc666caddf97c15f8aaff894848d6c87d8a3a0a44f40a725 SHA512 5cb194eeb0168b19c67d9977832b285f4ecb438cf0549b6ddcb1dc5f16930ded4f80c3da83ef38ba337360cbd6ffc96ac7a2f355bdd323e9d70d74fb25c26d68
+EBUILD gnome-online-accounts-3.40.0.ebuild 1987 BLAKE2B 36a1b6e308d49be3265b5a455382f39b456cdb61fae02c446c5e11bc5cb827aa3cc5b528b033816453a32d4349bcfeaaabd054eb5d020d6172206ac7fb57a61f SHA512 48cc7f55915f515c2ce3ca4f0542115bb04e18afdfddea4c00b75936010e1c67d3dea4c304a5a6faa1ca184cb5f20d6132c0fe62f9f0bfdd13845bdae0d204e1
 MISC metadata.xml 379 BLAKE2B 36ab13a2c6483f81247083c86d6424d66e0780ac4e16c485588bbceb8ce8174de38796de29af933831ec3075dacef135d2c06d18b22d601e28a1f5fe5f7661dc SHA512 fbd620273932175e14f89a7c155819d7733309eabdb0a82113f9a88d8e33aae3c2b35bdfe5f0883c133e94d4eccf456ba496c419d15e98fd0cf79b685f7a8c69
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
index ae77321e4b2e..90a80a4489ec 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index e6934daa2a1d..4d8cf300685d 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,5 +1,5 @@
 DIST gnutls-3.7.1.tar.xz 6038388 BLAKE2B 1d55eb441827c7148d63bcad37bf7bc62d539ee9bc7e14c2fe5ec1d0bdcadd75e2cbc98ba104523b24c8dfd9526b4595475a818d206971cc012fac509cd33a6f SHA512 0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95
 DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329
 EBUILD gnutls-3.7.1.ebuild 4232 BLAKE2B 35454524038a30fcc8d83f3bdc4b3f3773710c3a0e64881e4a29cefb205385b7693ac01ee24fd97e09a5941f1e2f67a91f0bbdf23cde404c88da80fe17c0c00c SHA512 31e764285b44dbb55d5aae1b070bec327a9544211ec89e74039220816b8140ee04d35e1d78b2118d89df4f141253695741366cb85dcdfa017ffb5b39ca6f0491
-EBUILD gnutls-3.7.2.ebuild 4240 BLAKE2B a53df62983590ce9052deb810b474563b7d5c046e3de5fcfb026c78962f7237f798be322e940cf78ba1949863bd0aac48606cb87f8e3f0be1af49bed43050f41 SHA512 e54a53d940060f0fa5e037478aa49a6eed4bf3293806a8045e8850918dd7b4cff54cd7786178fe9f17124ef8de2ef7b20cf2e85f5ea8e946ca153c782e51eaa5
+EBUILD gnutls-3.7.2.ebuild 4237 BLAKE2B 8edb2eb54f55e600ca4e949203baba214958578eb4a89dc899a6d31b46640b252f6f11c91a15f8382dc00b0e8c3f2b2d923175e65342a13082837f2e962d7111 SHA512 5b62d8e22f70ebfe57adfd79308b627eec8e3e7b4eff2f30a14e8c8f71b64bb621c78ebedd3cb8dddab8d0c3e18a38f299a03e229686b8ef1b5019ae62da5218
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.7.2.ebuild b/net-libs/gnutls/gnutls-3.7.2.ebuild
index ece149c18554..06c7cd032b99 100644
--- a/net-libs/gnutls/gnutls-3.7.2.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.2.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/libasyncns/Manifest b/net-libs/libasyncns/Manifest
index ce5b134cb94c..146ea47a2afb 100644
--- a/net-libs/libasyncns/Manifest
+++ b/net-libs/libasyncns/Manifest
@@ -1,5 +1,5 @@
 AUX libasyncns-0.8-configure-res_query.patch 428 BLAKE2B e19cdfc88ebee7f22dac6dad6dc302fa80957464c91eb8907ef75bd3f5fb32d7b985545a1aafccf2cd228688c16ab731ddd9c5315083f8f4d117a9a6d4ee731f SHA512 ed338a91575f9e642c3da9764348fb7d4e5b2d0da4ef9a849a4cb176df96776100e59b419bbc9206395252d8317c20c5cfe1b68e008825fde1192e24dc9f8ce0
 AUX libasyncns-0.8-libdir.patch 299 BLAKE2B ad0b79b5725877642c1b03c8183654be8d54e78e44bf7ab4de3c8bd1ffc5ceb2e6cfd250cc4725c2a0491d062d12124faf55fb20b07887e1f47cee7ab156f0de SHA512 b4a42a4241034756feeacdcd9a7d6e57a8b2d9ae945b149e05c6ea9d8b33791733601ef9d153e75d7979079cdf4c02c4136f881236e2a2b393ce070021c3a2b0
 DIST libasyncns-0.8.tar.gz 341591 BLAKE2B a93e7fdeb6e686cf3ed87db8fe2473f8868defd5bb6a29497c48d970d1ff33c550b5521d84a224314c9e93bd4cf09f502bde0fbe1c4d2680f6fa07f1f1a224c6 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7
-EBUILD libasyncns-0.8-r4.ebuild 1237 BLAKE2B 3e7bf04cd8adca1af1d8290d15c8c98a798cf5d0bbb272b48e798cd1d56ec4d6363f8d209261a182711206d8ba9ed4093f580df4d7b837a6a8f6a0b6577ecb8e SHA512 fc51ddae39e7108f9252a1bae06bb471af757e69fef324f2cec1ad1d19f5581b76885515d7b3e03a93c13eef8fcc06f3927a01e719483a8d8bf1a5fe54d6eec2
+EBUILD libasyncns-0.8-r4.ebuild 1244 BLAKE2B 57cabd757d9a3c96bdfdff27a80ba26500fac8bd516b5c0af15377c874692b4b92a71d1dbd0cfd1d5c7b5025d81e1230613eda8d84ed1620c4f23bec0dc7d166 SHA512 d9f67a3413c17467a35a9466984b65207e3492c543432acd791556766353ccdb4a7b21bda0671154e6d9c0a968ff72a91b07635f24174ecfde10bca78875fe8c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index a55c87358a01..c77f4ac25de3 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc debug"
 
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 9cd34fa69539..409ba50cc9ad 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.3.tar.xz 607516 BLAKE2B 5dfea2102fc865d61f2ebf2b1f7045c7ce0f542830f9c7e511d5139f910ff3797a949f85a593a17c56287c3433c086a198f96353a61a4cfc923d96aa30ab4545 SHA512 2c8ee156b0b1e51b96b2670c5fe3f00aa131a34bcebdfdd69898a723fd01a8d2da52a94a1914c13e82b7362a71beaefc03b27eb450dbc84bc43953771bf9b886
 EBUILD libktorrent-20.12.3.ebuild 1448 BLAKE2B 9e40d97d0aef21c498dd61cd924dd4e8f0cf3385d4269176fffc3bb5634b3959de35d723cc3708e0c9f8ac43d61cc893f60981d937ae32b6c039b4cc4a7fe708 SHA512 c3792ec5496f2534b6ac95a7368abc02bc7fbea277b3eac4be062b59f4fc7c3099113713a81a003e43187d7d618c258922320a3e4a420c230ab61f3f5e926aa2
-EBUILD libktorrent-21.04.3.ebuild 1438 BLAKE2B 7bb6488dc5d2a84552e93b36896807d0506e35cc513885a89b5b9dd0e1fa31b075e0fc5c88ec520a26daf4ca34b9be660f7200b39957b05d3ba1ae90203fdd34 SHA512 b08fbe506731121d2b0d8d39bf9ad891e797a443ae3221814137628b29ac67c115001c9c20fef0150c422f0d708b7321704d4fde4df2f5ed0a153992e45927d2
+EBUILD libktorrent-21.04.3.ebuild 1437 BLAKE2B 066e9af041e881c1a4e45c69cff5e671eba2f96933dd1d3054f06895a3b662c18baee17407f77ce9136ff7551d50ada8a77b414046a2a9fc9ecb16141e30a883 SHA512 7c6ff4abd4bf4a2baaf131cf10c353f5a78355dd2930e61867341fd9bc5f48ad20f6122604f46f6df26ac83c595e6319f544135807aad5a1acdf5b350eddea09
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-21.04.3.ebuild b/net-libs/libktorrent/libktorrent-21.04.3.ebuild
index e14cce571e02..3c79e4f37585 100644
--- a/net-libs/libktorrent/libktorrent-21.04.3.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index acbbbe099892..dd4efa522a5c 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,5 +1,7 @@
 AUX Makefile.Darwin.in 2436 BLAKE2B 63d9ce283549b26921cfd317639da45723ab5129e79dc0df0f4c2fa2489264db1991b6e9b2e76fb04906b85325d171af7dc2bb4f7f880cdb76fcdca76b50cd2f SHA512 e39931c63a20d49f6010dd668132295cfd3e02f39566715448665715ee909de3179c1db496b78261866794cdb21ecb14ccdd505f45aea5d8d0b7b196c344f9a1
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
+DIST liblockfile-1.17.tar.gz 69834 BLAKE2B a3c88174d96fb84dc1226102a1678aecec35945b89adb6e143f32674188ff7406f89b05f7219748bf0e9c6207ff3b28b5b800706ffc11b733c294e1e1c232784 SHA512 2169ac2219950d6ec7def6b5cc712cc04d1a185dc9c09b364c8d47b7b3d15c3482a2200b591872da87eb784717b2ba3537fbc39d7075c329cc8ba48039473a83
 EBUILD liblockfile-1.16.ebuild 1311 BLAKE2B 1495377f36328625a0407a76b1bc1a373f8ce3bbdae66600e3e00c6315d584bc29331794b568480c1118c3ce160dc80466a5a9e252dc05a00409c0283c6b41a0 SHA512 d4c32d400e2ec2bfcaec81b91e8bd50c61e546dadc33a69a193aaa5d4a258c8a8d05fe603f024a29ddb988932144ec14107b52c59c8b66fd33a8750a36674b08
+EBUILD liblockfile-1.17.ebuild 1339 BLAKE2B ad231a19f023856b49cd817eb7ddd13fd6b56e4a025407e3b7ae1294b1587af438cb1ee2fc34e2e5b3d026ca69750e10de3cb09d7933a01dc54d36263eb95982 SHA512 b995d514738241d26706f9009a3429be19c18aa5f7c6b92072437249d60516606e4f83fbfbeaa938ea72f8688d652084556e4e10835bd5ee5cd862d79d295782
 MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/liblockfile-1.17.ebuild b/net-libs/liblockfile/liblockfile-1.17.ebuild
new file mode 100644
index 000000000000..82d39902f7c3
--- /dev/null
+++ b/net-libs/liblockfile/liblockfile-1.17.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Implements functions designed to lock the standard mailboxes"
+HOMEPAGE="https://github.com/miquels/liblockfile"
+SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="acct-group/mail"
+DEPEND="${RDEPEND}"
+
+DOCS=( Changelog README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.16-makefile.patch"
+)
+
+src_prepare() {
+	default
+
+	# I don't feel like making the Makefile portable
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local grp=mail
+
+	if use prefix ; then
+		# We never want to use LDCONFIG
+		export LDCONFIG=${EPREFIX}/bin/true
+		# In unprivileged installs this is "mail"
+		grp=$(id -g)
+	fi
+
+	local myeconfargs=(
+		--with-mailgroup=${grp}
+		--enable-shared
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
+}
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 925b75f7637b..e9b1188a0330 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,5 @@
 DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af
 DIST libmbim-1.26.0.tar.xz 554672 BLAKE2B b020ea81d6f06bad4c655b285423075873ea01ad253c8eb79fe6e0ce8511d6a8c684c4d8541a64dcc23b46211de117f867d5b405f08942e904156304ce746779 SHA512 b987b3271166eabda7d6767b4b3cd8f34b07ea6a43d5ed1d7cf083561b0e57affeec175a155e5bf8b998dd60f49a303cf54ad6eda146df7483cabe099c401c27
 EBUILD libmbim-1.24.8.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
-EBUILD libmbim-1.26.0.ebuild 737 BLAKE2B 04978105e7e927961c2d57d1efced6971ea34faf83c52b033e8af0784cc89012c721ecae5f069d5915ab17c2e3fee6fcb3e5a5efc90e17fa9c3b61d36a29fbc9 SHA512 35f8fdcfef71b65421d4b41fb667076718aab988bb9dd2b906adfb0db6141ebebb217cfaf0102419c13cd35c03731dfd7fb40ba9de3b01d62c0efe9d8dea7fc0
+EBUILD libmbim-1.26.0.ebuild 744 BLAKE2B 95f7dede838076cebf936be40bce7b882e8ba7781c1f8b447d2b4e14381ed21c8b9c86e705cebbe9efaa7d2209d4c56b6d64cc252b8f597cbc9eb82ebf3822d1 SHA512 7eb6fb98db02b62a5bd4dcf76dbf10288eb787410b1df069fde91be4adaa2923e231abb5c5b8d80ed9e41e16df4ae95e9aab01ed47e3ee63527ae4c51c7efa28
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libmbim/libmbim-1.26.0.ebuild b/net-libs/libmbim/libmbim-1.26.0.ebuild
index a4e84e6f1bbc..bcc9e1135604 100644
--- a/net-libs/libmbim/libmbim-1.26.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.26.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-libs/glib-2.56:2"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index 1fde46799fe0..e9d60910ddab 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,3 +1,3 @@
 DIST libndp-1.8.tar.gz 364669 BLAKE2B 29fa41b40300b273d50aed4f1fe4a1c552023aa83d6f4b1bd6033cd0a41618b453bd1ec7ac5223fe7c123649f389587e89e635cb988b392f1af04cc1d6b79002 SHA512 bce17095f01eb9df6601a2ff0597b0373f4b0005b1edac8c085e4c9d54f9cd18f08faf1604624e0e0992be66fa6f22a71106af46bc73c9e326663c7cf0c5a7fd
-EBUILD libndp-1.8.ebuild 531 BLAKE2B f667264d0b9be30387b18aafc764b47f06310130fee3c7d4d24837e8bcfabc02ae179b7271a7fb1f9e8e22fcce305d5ce346be373a3e0bbb5c704e965e520100 SHA512 290a11e613efdff47bce23f54a2c357adc24041c7b0da74609676ff8ae3dfac1264fa635790001588825629afa22dfece08d8cdddbdb5d5172b6f01d24032db5
+EBUILD libndp-1.8.ebuild 538 BLAKE2B dd48b0c2ab5a08329e60310294f28ad1d810fa8a692b9e48e5b5a0cbf222e66a21c8337b19fd506503004a17e6b4fedf9c3abe5d773ac0a538e3e97eb999cd56 SHA512 21ac76992b3a78a54e09c9f51d832583ab6c7763523a6d4b7d95704e58de71940997fda963ba6391af752244ccab713c0030470bf16e064bf53ed421fa83867b
 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
index 032f284852b4..332edd106a89 100644
--- a/net-libs/libndp/libndp-1.8.ebuild
+++ b/net-libs/libndp/libndp-1.8.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 08b1a94848ab..c3089bc1c4fe 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,6 +1,6 @@
 DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25
 DIST libnftnl-1.2.0.tar.bz2 388751 BLAKE2B 6f61e7af8e50577029b1cf5ba7260f3803a64c410c7d35be8bbf3b6f9445d9db3be367442f56fb81f3ed49bc3efeab8dd2ed51bab4a1e4427f552d48e4bb559a SHA512 2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380
 EBUILD libnftnl-1.1.9.ebuild 1167 BLAKE2B 94d818ed22c7eb28202fc481beadec1c83e3e6690a4e1980faa47ee1427fe345df0e19cfb1afb86e38d579b15279554cca0a94867bc1d11fe9a7a577bf03ce2f SHA512 0775729fa5cc11fd3126e86ef18e2c965a3d987c0fcc8e6c766f92ffdf3f9577ffca6aed1ab02395f85089267f7e335dc4cd34be3507231800ce7469a62a96f5
-EBUILD libnftnl-1.2.0.ebuild 1363 BLAKE2B 4ae61af654e23b0ba0bf2289291ddbf104f497cdf0d62397961ad5269f2864b99da1f6e803fbb158732e4ad16f284f4cc5fa2dc2081252a67690d43524b221a2 SHA512 0fb3a1814221ebc9a3296b6e08db738080285334308e3f8c6cc7e1a805e7cd7115f119c536f24d2bcccc50d07940e79da5894b7f5d6030cfef1d1c0f765ec460
+EBUILD libnftnl-1.2.0.ebuild 1358 BLAKE2B 79410f725f41b4c8058427e5e0df3272dd36d0c5e3fd712580dcc2acef423bb5a9a51871922d4ae7723877ce4564e8c747449aec5f7e2789759b2fc345afdc39 SHA512 955533cdf65d0368be73f88c7b1c4e06c3a30bc55d94c570f18123861be6f63cb54b0bf42cb0bf1a7143ac36ff43ff67e584ad5d5a85f8daa7768c099a0e7461
 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.2.0.ebuild b/net-libs/libnftnl/libnftnl-1.2.0.ebuild
index 434a775727d0..447974529f77 100644
--- a/net-libs/libnftnl/libnftnl-1.2.0.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.2.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
 else
 	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-libs/libnipper/Manifest b/net-libs/libnipper/Manifest
index c16438aa0ca7..343591a63c04 100644
--- a/net-libs/libnipper/Manifest
+++ b/net-libs/libnipper/Manifest
@@ -2,5 +2,5 @@ AUX libnipper-0.12.6-gcc47.patch 272 BLAKE2B 4849ed6671881029fb0963c09cfa0b9e9f0
 AUX libnipper-0.12.6-glibc-2.10.patch 418 BLAKE2B f981208efc23c3eb37aef0ee75a6e0740867b2a732e2bf2776cbedeafbaec0bd23e1692b2d5e4cf335f74b4fd03146ca12a67f94a3261f905d42e9c204f6a48d SHA512 0111563759771a4fbb9464c41cb66358a8a12c461709b3cb5638663b6d39ea594aa4402eb488080992a173ad1d639790c6632ca5e8f0c85ce60af5c6e1fc54ea
 AUX libnipper-0.12.6-multilib-strict.patch 523 BLAKE2B c59c2e2a9b3a09be2a17bb7d6839a03bdde7981a4bed0c761809ab9e024dc764cbc7bf7e61bd47a56669e3355980aa67c2eb479e8793da8fca44a4cbf06dad20 SHA512 4290a1b5afdf3215d25d1eb173a0dca421f209335cbe413aa3f051df31c132e85dcafaec89eee52709ece258aba37b507cc4499369e9ad403aa7ecb2b7ba04a6
 DIST libnipper-0.12.6.tgz 444578 BLAKE2B 66a9d9158a132a447e5acfb2da51618c2be09f51a8bea3b47bb953a8734e5be5666a6d330e20ec9b5ad6455ac98fbc651a673dd4c47045f916cc3894ff40f5c2 SHA512 eb6eabce06a71463f8dad59a2aca13583e9ae8113b6997a7946b9bbafe54cd0668189c915f917ffcb7ffe3b5dc6dbbf7d37874ec226e5bd8cdd3c8999f9e10b0
-EBUILD libnipper-0.12.6-r1.ebuild 468 BLAKE2B c4399a7aa526117ed3197c493e7dff0a343c21306a74a88150877a7826214d275ef4962aa5064b6fbf87fd9b4e8ef74ba660b48e9e79c116379249f145667ec1 SHA512 7a67d1cab29df68cafe09c4549c6426316f6181b888040ebee8abdaf2c3d3554d7f223cd439a499cf2a361cd9930b6efc3c90e58b7121d009e1dd1f781b71b90
-MISC metadata.xml 318 BLAKE2B f5c07504aa2c9809ffa2798644d13a73383500e16a25f5e2e47502e71b27019badbdffb08d91c705e69708d56154070b82c9d1eb5a07f23c540eefb185e01480 SHA512 8b02dbd54b036d2aa1f1bebefd77ae6a0caf5747a99a00085ad9aede3dafbb62d1c81f276ba8f758999c9f9c84d3f0f15aa3ba82b9c2246f3db7505ffa33e81d
+EBUILD libnipper-0.12.6-r1.ebuild 451 BLAKE2B 2950029c9076b196c54d29842f7d56655fc7b38ae0eb04fb768f2e7586f71c9f5f46dc30223db5de5896df90b64cfe34921eb687849c0f370c758f5854a4fe61 SHA512 396b52619b331747de0105615b060520b7777968abed0bed2e13836827e78531d5b3dd59596cf5c90c20b0a6ef6977e9ddd21ea7b6b0b930a39a0f1f9ee0fd8a
+MISC metadata.xml 243 BLAKE2B 7b0056630c1c87a1d5a93a71057b2ee48a295693e3767741c6c841df2f9a723fbf4c8c2a0765895e2028a41816271b4a93a9616e3ac3f3b76a184202cf3f7e6a SHA512 34cfd346b7f7c38ca4663d17494fc2a0d001206a401e55a037ad8ff45fe9e63b3b1e244fea9fd584810d75f3f8034e68875a81f384ae8e698e2b4c2f45636afd
diff --git a/net-libs/libnipper/libnipper-0.12.6-r1.ebuild b/net-libs/libnipper/libnipper-0.12.6-r1.ebuild
index f06a4c7bc6d0..9a29393477d6 100644
--- a/net-libs/libnipper/libnipper-0.12.6-r1.ebuild
+++ b/net-libs/libnipper/libnipper-0.12.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A router configuration security analysis library"
 HOMEPAGE="http://nipper.titania.co.uk/"
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/nipper/${P}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}/${P}-glibc-2.10.patch"
diff --git a/net-libs/libnipper/metadata.xml b/net-libs/libnipper/metadata.xml
index fb98633af89b..71daedd3b38b 100644
--- a/net-libs/libnipper/metadata.xml
+++ b/net-libs/libnipper/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ikelos@gentoo.org</email>
-		<name>Mike Auty</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">nipper</remote-id>
 	</upstream>
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index e600d8f0c6f4..107be020a6f3 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,5 +1,3 @@
-DIST libnpupnp-4.0.14.tar.gz 538629 BLAKE2B 3bcd1cf04126aa0d16056865e2f7c90bc479ae4ccea5094b2c44ee687be95fe346494a2d07ab7925963d88e614fff1a451341af7d41c2a16df1208aef728d515 SHA512 b224cadbcd92b8d66118da015db345b3ef5c4858a458ac681d550c1409e62f212d3b2a744a8368fa4149309f29de2edb8cb14c75ebcb14653ee351e0d24cba71
 DIST libnpupnp-4.1.4.tar.gz 544243 BLAKE2B 4e2d0ad827fd566d70df440246ad8fe081c5eb125fac72827e84680a1d842125562449866dab69305c16e170e8b04679ad40f73c2ac573aae266d24679053c76 SHA512 8a41f52a5665470ddf48233a5262cd906a384f89308423020a6f4d2b67d38b53d9608ec6f01a1118f703dce41ba0c58a863965e7226411b4f8aababd7b1d22b0
-EBUILD libnpupnp-4.0.14-r1.ebuild 719 BLAKE2B 26210c2824c29e491bdddf8185c8a54057fc2adf1a21354b273bce5459f61aeb42ea3ff63561493445776954ee6897de4aa97453c38bff8f6bfee9f6b05c8f5e SHA512 2726d7f7f0e1bd3f300639a835904659e3ea8d752fdb384105db14484227177b646182103a88ee95d6dc1a35feb9d358b6470ad399ea9920d513afa3afad0f18
-EBUILD libnpupnp-4.1.4.ebuild 721 BLAKE2B 19fa3530e0d7edd98b5f22bc571ef9fdf4c964778fe23942c75e10677af50af4ab9cd54e8a3c3dc68a6b27eb5f39d74c6b95ae0f11a46fffd0e68a0042ffdd5e SHA512 28c69380aef94fb50c19738d2c56d303c13d6d2ec375a3b6e07f82ece9cf8beef35ce8bc8b3cdebb5b2e53b6508226913a23da1290e6988da35ed4864696ce21
+EBUILD libnpupnp-4.1.4.ebuild 719 BLAKE2B 415ea177563e017e1a6e72f2c1454a82026a1fd6e5cd4faeb90ee22c7bafc6ce003cd25047eb0e73b41c8130663c917f512176a4c21189ebe27da34ca2f9e53f SHA512 2526b70fb5f9598987493ece325c757050221ebda0f432550b485cafcdd808b2a7dd4286e9d1b27f4d0430c46b9362c89dbc8ac2eeec9ebd95e3b21b8c05e8c7
 MISC metadata.xml 535 BLAKE2B f106ebdadd8d1f09dfd088420c9c750858ed36a2eff5eac1bd256a31cb277b0dbfeceb3cc1d724b65a66b97243f32d618379a8c65a52cf341f78fb4f20a4ecef SHA512 99e4e4ea26cfc4eff4ea0e289d144ec21cbb3834f434a1071c99dd890a0c24dded48b66918d61c4840bb6ed469b3e945f5292d14c244be7acefad561de55962c
diff --git a/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild b/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild
deleted file mode 100644
index da0ca8884524..000000000000
--- a/net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
-HOMEPAGE="https://framagit.org/medoc92/npupnp"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/expat
-	net-libs/libmicrohttpd
-	net-misc/curl
-"
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--enable-debug \
-		--enable-device \
-		--enable-gena \
-		--enable-ipv6 \
-		--enable-optssdp \
-		--enable-reuseaddr \
-		--enable-soap \
-		--enable-ssdp \
-		--enable-tools \
-		--enable-webserver
-}
diff --git a/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild b/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild
index d35dc2f8d1ed..12dfef202a9e 100644
--- a/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://framagit.org/medoc92/npupnp"
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 8fb048141b6f..a9cfe2213125 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,6 @@
 DIST libqmi-1.28.6.tar.xz 1192736 BLAKE2B 30330a8d085b26fc461c6fec2cfa58757e91093243aed8a4ac6df53a7656881f295a800979ff8fd42b815f96fafd128848765ecfb163e8101ac9c9a52eaaf507 SHA512 f4f7022e8c9b60618062548ec97450d98a5125dbd0e26df3dfb8bda5ab19a1f4c7864d35f7bd77217a4fe5562ce665fa613902b1d2185680bfa5d0c1e229e6dd
 DIST libqmi-1.30.0.tar.xz 1237944 BLAKE2B 862a7f12d458d7fce53596ec12e6e20d41a8378e6d9fd44535ea54b409f7020d33f5b3bab08ce583452e11abcbf5af48cc3a24a5fd382c7a833c435327c91614 SHA512 e0cf97f1ebc27feb68033d19b8bc146c41d134782c3eeefb1dd3502b08e493d8c484835235a7877854c1a9c2524ed6cc31aa1b897b873d0662f494a771b2c98f
 EBUILD libqmi-1.28.6.ebuild 1222 BLAKE2B 4e226ffda064e482aec9c9fb12c93e8ec57b97aaa7d43048e5a183ef63579c3940ac7fbfc3ca8a3ca75c08c8131f4f890124e42e22de558a18cd9171b8392096 SHA512 b862fde5d896147e419b131bf9e123e4bf76171d557363db2cf77726509861d3c8db5bef9b3f706ac59e38f901cc2f18d413287bd637d0a43ac449ae252b7f15
-EBUILD libqmi-1.30.0.ebuild 1234 BLAKE2B 472ceb47d460b35418e0f367a642871b473ad69849a4ba4d06779069aa21bb6b91fe2e2f305aad251113b938ddd8bf69706c0ac85b977085a966d6ef56e4c5fa SHA512 2bc68f62ef72269258850579872ca6394dfb9395b183b58bcbb983c6590d949d0f7c9c9d933270eafeccd60b6cf485d2d7410d8b704722679882952329b1eed6
+EBUILD libqmi-1.30.0.ebuild 1241 BLAKE2B e818264c2841916c29d7a7f9744bdc5a49d383db9e7a4e632124f033b64b03c7d343b10c9f6955355dcbcce1b4f4420a180f5afd2318bdf0a4b6fad70be1a4cd SHA512 a1a56c72c1b7575a9c295e38f37a6e46673852468a3d63da2131088e342956209ecdc27eb9a26a2f5d26167dd30f2bf8789d334f705a48ff1468d45ef938a022
 EBUILD libqmi-9999.ebuild 1234 BLAKE2B 472ceb47d460b35418e0f367a642871b473ad69849a4ba4d06779069aa21bb6b91fe2e2f305aad251113b938ddd8bf69706c0ac85b977085a966d6ef56e4c5fa SHA512 2bc68f62ef72269258850579872ca6394dfb9395b183b58bcbb983c6590d949d0f7c9c9d933270eafeccd60b6cf485d2d7410d8b704722679882952329b1eed6
 MISC metadata.xml 424 BLAKE2B 17aae2f0c88f12dd7de0c2ef76687667b5e6c1d0c42e2f584b868f025d0069a56b95d11d8d4f137f8f6e783fdd30f49d191bfd6b42f479057f9967fe66d77a17 SHA512 9104fe16ee4aff27aa0c9861456518ebb0b022b1d37ab7c260c31aa3ad19136bb3338072a1dfdc53a024a3b31e8e6e6bfec14eca2b92d53f8d62b00b213e060e
diff --git a/net-libs/libqmi/libqmi-1.30.0.ebuild b/net-libs/libqmi/libqmi-1.30.0.ebuild
index 299b20265bf5..c48a2bddbb43 100644
--- a/net-libs/libqmi/libqmi-1.30.0.ebuild
+++ b/net-libs/libqmi/libqmi-1.30.0.ebuild
@@ -7,7 +7,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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 360dc1a64d87..220f0a8ad5f6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,4 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
 DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe
-EBUILD webkit-gtk-2.32.3.ebuild 9127 BLAKE2B 443c6698afcb857041df69322d0cb05f2c7d9d3578a2252377dd5095ea1b4257b8e8bf3e6a3fc9f286bfd0c4d90a406d63325835c1407cd07fad6b37fa23fe5d SHA512 efad4acb738bd51673ca72c5aad1700be5c420b1058cff77da8379406f0524495b13cfbbd6014fe467d4eef4c99913873a07bb259625ae0cb69ee439c3482f05
+EBUILD webkit-gtk-2.32.3.ebuild 9134 BLAKE2B 1493ae541df4cc7f7983f7ce82013a65b64b708e90580ab870d8ccd3033415b7faf6e6e327669e122b18a40eedddc80bd9876d836d32fa2613d7854f657001dd SHA512 66cd69e1ae0258bab69b0c94e00d6562144fb23906d536f019bcab027a26264042c418520371167094109d283c1adc0ecd976936ae9d096078f9784a6b0d5fdc
 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index 1ddc63054d38..2dd5eb64206c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 USE_RUBY="ruby26 ruby27 ruby30"
 
 inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~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"