gentoo resync (3) : 24.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 19:42:07 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 19:42:07 +0100
commit: fbd9734cedfe790955100b8e4ab3613457d77b1a (patch)
tree: 3eda83643563749dd2792dfb880eaeca1d061c18
parent: 6abaca02d36f161c81e2d5ee467719a89f88b2c5 (diff)
416 files changed, 954 insertions, 1906 deletions
diff --git a/Manifest b/Manifest
index ecd6180aee12..c07c7278d2fb 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29277 BLAKE2B e72d7d80f69d4895f6ffeb1b2ae0172d061fce5438bd8451cbc9c80ac2e43cf7d4e5f0448b315ac7aecf56de7dffeef2fa78c04e1dcc1af7885daabe66fa67e2 SHA512 9dd8fa7adaf63616a9204134f3642711f9cdacb20087bc73c22d4d8d0c739628b78e7c304e3f8c1b8ede3f96505271a87ae6cc80c524c71bd146aa7ef37acc36
-TIMESTAMP 2021-07-24T10:39:01Z
+MANIFEST Manifest.files.gz 29286 BLAKE2B c828c066fda90acee109c0fe21d8846b1d6bfeaa7cf25b21d09dfb9a5160a5ce931c77397ff1989cf0fc0aacff7c54f13bd4eed6007badce588bbb15158d50f4 SHA512 c66101ceee80bfa7307c3ceacf7d5a2e8ee9b0e35df948fd4020c5a7ac7c3d64780d630c5bf245ff5025f40f4586ed0e11e87a3d9b5186e6038a9b9cb3601b64
+TIMESTAMP 2021-07-24T18:09:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmD77cVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmD8V0FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCWLQ/+PoEUUbUXoQG4lpC5QImrjDO1I7rQeVpFhcQnKLNCm7amd3DFMjE9xDqZ
-KMQyJXxqrugaZq1/Kfb+DscyYnBZ/D230JrdnQsyYdrm7HDhpx9CEBsxgvc7+f2P
-CipoKDiQGvoJt4KzkWEs+Jv5lv5WZc0r0eioM4ssRzSx6K9LoltV6VdsBY20JatA
-6eO2CnJYdX5UM0ytxcmBlJ4iuBqs6xCJqZV18x+uBC4X6QxAXPaLTJyklVrSRWP6
-5Z42l9hs7G8bHWIII2ebPzzrBNuuxkGdgubkwMoLPy9lxEO+NWwHuqyXMM/as9KG
-+nncyCX5h1u6e7U2xWo3LIt1qZVI9aovwneE8OSd5t7Lf81A6fZbbBd1sjojVSMM
-TDK34AiaDEO7TMes07BnSGQj11ZcGMcgys6K5s/3KA0O7/Mb4d9MsVn5nbG8L+/E
-Vvcw4Pgoh2+QMsvDgNh7CheYfMiqjLTsv2PsSqOOAfh0EIPbIj7TDyrLgnUVI4p2
-LkUnsFipeoarQBnUBf5XgwgcObI6lEVgB4pdvI1EWDJMENaTC/D0VRS82vcTTIoQ
-6s9YwoHrMqLs9cuGAJ3o2+wBg7FDHEvH0bRQfOih0M/ud+DePxOBlJyTdSF4bCHX
-UMQxn/i/t0reQZYWjfSkTBJEBmtcMT/S9VVaO4l4OSom5jD2C+I=
-=jjW+
+klCsbA//en9mul2pYwCedLMGvae8rcmD+3fWZcSKpL2bqPUFxvTapMNWz+kSuMMX
+DtdyAOGcz8GEJMWKBdpDNVBL/h3y2vFDVRnc43OeReHBv8CzjTlHWSes+WsnFAGR
+0LIZHitsYYkdK3eBXJ2OvqweaVJXKeG4orremx9alHUMqan1kthPlH0/99D+l9pt
+UCq2cb29Xcj4dusjuRWUU1eJYl4K0j2aZyq4M566bRAFUWrk5ZM98Isc+NVMatwV
+QxqS3W6wLMTUKhaPtky+lqeyzRqfoC5JheC6rraVoeYDQFLL/ixMaR14Mp7IcmeE
+tdElE8HjFwjarPCwbfc1EXoHtSXXJBeH7B2RwBb4jFlri4RiloKu+2+oTik1jjny
+s1JdwDqiUIej9x5bKJeq0ohOBw+xs0RI/5e4dI8zX0D2AFa+4ORHYnxeVFuopQYh
+zp2xGnhq6ni36sG0Eq0QaMtLVDmW1AM9/oYYtxlHTm8GwQmHVmZjNjt8IqaFRFHd
+JYcogqrrtiJ3ubNiWaIHvuAjoDE//fbgydhJ8AbqPTPGO7kPbxbGh8Fc2qyIY60p
+RpTOJgwFfNQ1uMuYnuJGaDY1oVt0Xz60hjlr2KI2CMUuDPfaqm80mu1AuAg436H5
+d7U+yTmLq+STv9Lcuwp2hjhcxaBGlUqIS3ECVhc13LLRcGLf3E8=
+=PamZ
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0760588604a0..5e764c7b6b14 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 71c24cc6edf8..6141c86446d7 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 1dbf401990ee..fdca5b7251a5 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -3,6 +3,6 @@ DIST at-spi2-core-2.40.1.tar.xz 197064 BLAKE2B dfa19413e6688678fcc0c0ed76d0fca0d
 DIST at-spi2-core-2.40.2.tar.xz 197476 BLAKE2B a3b6f1edb7beace2a54cc651f8bf5d002009a3d2791306f2b0a33c351c68d04e0a1003ab11f215333d498c50d17139b978e7f232df802f6c620bbe31997a8e1c SHA512 854fbba39064ba4b1d9728fc4943e811f0a9557f1096f32d7a6486bcb6c73379ab84c5fb8ce5288bf4dab1d1cd3e0664c492977450d4da503ce4b08abfc75fd9
 DIST at-spi2-core-2.40.3.tar.xz 197528 BLAKE2B bc248d57d51cea6ae6dd6c737d85f10599a9c177a3a59f95ffc8f96f74b7da057f75e2b961c281650795ba8d5387a9439b00a0f277731af3d490cc8f34c3ab1a SHA512 85adf3da0a369d7f3481646a495a9c4c3337da3ae6a20ce8c924f8621d3d6ed1d9461bfac0e821dfe86e4ad6b930e4fd65d24c26401cbea644ef4951e5dda5ce
 EBUILD at-spi2-core-2.40.1.ebuild 1384 BLAKE2B 228eb7444c10a142f85d16e78161dc73005ca47a5a37fbc8444812165cbcb0dd13f7da139c814f95ecb4f2a2a8195e8921e0c2788042e8f443c4a7e63567ea93 SHA512 fa0af448995e79332fa7c05e51fcd1306c2cafb2aca601d42f2f6dccac7bcb569140a7abb98a8c54c0a69bc1b82150427843ffef4aa5fb855063000e395575fe
-EBUILD at-spi2-core-2.40.2.ebuild 1460 BLAKE2B 956c62b7ed372f0a4c2aff7a8ee3e955d58c7aea2eff137780bbf5ffcc130da681dfb7949046dde9fd773d23689cc3eab130d93ae5b68fbf7419d05cc909de65 SHA512 b7b828807497f21544b072740bc51199039c7daae2de4e750010179bc0dd545cc26b26b99ce8e473a4d876afc18aeb9043e3e54b4f218a9b74eafbe87c0149c2
+EBUILD at-spi2-core-2.40.2.ebuild 1458 BLAKE2B df824a43b37bcda7829d3dc21e202d4aacf36d81d7b047a3de3447e1a9159ada562b1b207b06fd6dc0aecf331ea4a0bc7720e6baf493d7ddcc840d7f47cd0c30 SHA512 e32832a771c53744760704ab5a3c9bef0caed556d7dcb2e18f20c44fa1ce598a910739276145478a45a43251c2be2771592f8abacfd3eec0bc1c8d59c5cbb1f7
 EBUILD at-spi2-core-2.40.3.ebuild 1465 BLAKE2B e2632d36d893350a1e21586f8bf8ec30e777150b1f66665f91f05fe2bab96a4229d092645c6ecae6593380740acd43c66abef7378ff3241448d7c1f7de3bce84 SHA512 c619dc92fb6eebfb74fa637768dea2d89fc8d56d64686dd38b5046d80581b13bbb2b9432886ab57092a9445ba9b674c9f6a2c0f6c74aa8d0bc73ec5897ee3541
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
index b72d7d90b637..8370320a1b7e 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
 REQUIRED_USE="gtk-doc? ( X )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d847da2d024d..2519a722ce86 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index e9907f129b42..2dcf2402f44c 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -2,5 +2,5 @@ AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aa
 AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dabaab8508803cde8b4fe414b1bf0e193421a7632597baa3142dcefa1bd53c7ebe6fea529ad827fc65bfd42bd617c415043b795d5c36c15 SHA512 32931311e8a4c57ae167379db5ff3decc5c1b3b891f180e6ee4991a9cf366ac26049c2e3eabc434eef3890635317f2f2cb1a80cf827a4c3e44fe76943665e85c
 AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
 DIST swtpm-0.6.0.tar.gz 326049 BLAKE2B 52b310e4da1f256f440d9e0022cb6d5f5987b10aa85c8bf2837f5a5c61bc076f7d24d0a027987ef28ba0e7983a2fb04476103b88c33e3312536777366bf9b0cd SHA512 b12bb9cc486c50d0689a5655799c0d52f85d320a1d849fd56ee5c4b497472102c61b5d368f46a81e0b9feacc63b25b434bd6229f492951097af1e9c74a37cc96
-EBUILD swtpm-0.6.0-r1.ebuild 1414 BLAKE2B 5cac9b3d8611c4287917b34c2a1d8e557f7e524589a5e2ee52b7962cd180d843053066442e3d9c9f0208f71d956d07a2e86a031532ebf1fc7bb648f0834632a8 SHA512 f355298ff770aaae54e0897055a30880e5960a99017012ec207116480b93c165c52794d5020908fc9390c34d18d9937e0307fcc6a0ba891ff02aee49e8a166b1
+EBUILD swtpm-0.6.0-r1.ebuild 1421 BLAKE2B 03bb9bf185be6488298e48794856a1b099aac059c28290579613c105a9016f28e16d4e0d5f74ec748901745f01d5fd5da788283850996f430ce56c721a5972f6 SHA512 0446e75cdc346327b568b3f077b8c0f9e9f57e8cfec2837c4fc1d66759f6381cff63904bcfec0ed6aacd2b51f832ffe0f19ef589d535d2d711b607f7a403e22a
 MISC metadata.xml 622 BLAKE2B fac6d084af4763e20d7bf965bc66f31cc8485d11b0a79169395e253730ab8cd9754ce6edc9f72f1289347497a1562bfdba083ef49bf4e13e5e99f01cb5ea7735 SHA512 c89423fcbfb975edbe115075aece42f43b833d8ebecfe86630f74e8b7de1cdc279fb3fc580fbf77d19529e8d52c657d0abbfcf95b30683df860d0b341ce3d17d
diff --git a/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild b/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
index b6fb875736dd..4f20363c75ee 100644
--- a/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
 IUSE="fuse +gnutls seccomp test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5fa5f14e86fa..713d15819ed9 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 7a4096aa786c..da07836e57ba 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -5,7 +5,7 @@ DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 52f61a7d5a423e1e0fbada6084dacf1df49
 DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1
 DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c SHA512 32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84
 EBUILD containerd-1.4.6.ebuild 1957 BLAKE2B 37e70d8fb5f2f719762719547696196619185ad50c471d53123e8d85c5fefa5d66f7cfaa1b7eaba1ffed382e6b907057e82ebd755b19a47033e9f261f1d79b64 SHA512 65f9428b86d7ac0720e4354a0d200c15a7305d3042e99919bd773001efbaa4b413d8930a11137a7277584bbde7c8e0f6a1ce54eee4ec8a74639b97486a1a0bdf
-EBUILD containerd-1.4.8.ebuild 1954 BLAKE2B 78c0cdc4e78642e3b22ad38d0977f9d4608dc4038e5a0f61eeb8ad144834ee9d7393b9663a2fbd53764402fdd5b3b5ff6625c623f73bccaec36dd5ece398e3df SHA512 5a1a9ce1360846f1fc02e84dabe5e686a1e8d7e7e053e12a70554b27d5162ed6e4ddfe4aa941f8d3a54bae255f9675454c055dc9e827eba30a81a709b28b6d6e
+EBUILD containerd-1.4.8.ebuild 1953 BLAKE2B 062f65e871fb5b57923748be4e8e2c2ce3af469510a2f3b674d6cb0d36f99d7078457020dc76480744d6193f439d1d572367cc998f53b08740b3fe9a1cecc122 SHA512 eaefef85e3ea128a4bc68e6be9338cf04008fd20701259099e4d6ac9847cb0a1c67cf3c73f25fd900b3e4979b765840c28c2026a9cf2c8aa07911a5dfbac857c
 EBUILD containerd-1.5.2.ebuild 1821 BLAKE2B a2ec9993e78a72e2331a51087f6c6e727a5eb9b4a1168316b9c640424a182624feb0d918beeff2ceb707f4cd3356062ec73e66a809641be5db2e29d86fa9a124 SHA512 92f10036925446ad3bc9a90386c34bb96d3ccf52a1747a8c36e156e0f008beaff2f0d1c592288fbc6f9a1edb871d1b6f94bfc82aa9860ca060e02697c35cc0a7
 EBUILD containerd-1.5.4.ebuild 1944 BLAKE2B d48f24de2088c4d8e71fbaa716f7ab8c9450924e8029e7d9bf5a892643b47ca63275332b1a5a904d439e4f53abc27b48b082d05898b897c0a5087465df49681e SHA512 6f9a892e1a7eb49ecd22006f751c0dee929644ba65edb1836176ea03e9b1e783420cef4b370d9b29a78db5ebc69f434cb337244d59047e7a579a915d562a6fda
 MISC metadata.xml 1143 BLAKE2B 2e3705605579b406365f0faca9238c1cfa1047ebbbe04686281d6b161aeb9bd947641116a755070fff9aa01dd8010ee36d570075a1ac7e87e29c727c2b06be7c SHA512 bddfb97b70466a3ff7442a1249708680b960456e6d1058dea59f09a34bcdf262c7b13430ec0fd3a16b0f060d48ffeda569c8ae4d9d9dbca93e4af2ee13ec1a1e
diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild b/app-emulation/containerd/containerd-1.4.8.ebuild
index 39f3e5aaf19f..c716298ccf9b 100644
--- a/app-emulation/containerd/containerd-1.4.8.ebuild
+++ b/app-emulation/containerd/containerd-1.4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index f0717b179012..ed2acc9d1131 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,5 +1,5 @@
 DIST runc-1.0.0.tar.gz 2366170 BLAKE2B 1b6455cd45bc51b92c12b3293037446da62957d441124e9b76fd44ce92329e0eb2fde2ef71c6519fc4d58bcbd4ef580f64d71753a6fc06f3f6e347de170bd9c3 SHA512 8ddad1e031237c07b6cab5cfe5bdb7b11bf98d5d1064ec06845f36da073fe65a0facc6a28ba5daff71cdcb50cfd5d1cd25e97385b4eddb35b287113c2771365c
 DIST runc-1.0.0_rc95.tar.gz 2309875 BLAKE2B 8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841 SHA512 c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
-EBUILD runc-1.0.0.ebuild 1763 BLAKE2B 3668d81820cffc91f50655bce5a47fbbe1b81fd868beee3dd336e509b0bb9b53b7e187d47568e28d57cc2bb9348e50021280720a363d531193975669f1b0a181 SHA512 28ff218a2bb1382ce4882d723bbef0f69a2e9b86819fd23b119f1cd5789ed34841ea55a22609eb40154974fed1b4d9aee6e83b124543baaf4a2d5b7097f6bf11
+EBUILD runc-1.0.0.ebuild 1762 BLAKE2B 8afd10126cdcc44a041e38c35e2b7a62f1751b541488134f305ca6355fb97e268829678aa4b84807fee2f573919c845a4a3192b522498764a123885ed34a792e SHA512 7bcf5849f0d8a9bef625ea206a888e1e3b155a0323ce7e8553471e33423536d79b3b243c79b1dea2347b1b88d59e61699f58e1d4b26c812d4a9a05e05fde18ae
 EBUILD runc-1.0.0_rc95.ebuild 1761 BLAKE2B 68ac242be9ab60d62b86e6ef9ca26838716697aa30a39dddc008035081bbab704d5a7b0c81a4adb1c3a04728efe9dbc58c664e35af6952c3be8cdb45d9369740 SHA512 70ed74518c4f115007f7cdbcaed871edede44bbcf87f5676e8eb29c10c4ea8b77a00eb23a09c0e7e30560d672a72030e417cb8f8a6b790c5c6dc145aeb0b4f89
 MISC metadata.xml 821 BLAKE2B eb8ae2aafcc540623838afc1ecdb8bab0b60ca1d836dcb4e0ee247219301f6c68e1f25430898f9533b71a5e23ea6c97fe2bad9ab1e375e0488c3084b51437b97 SHA512 15a4ac8303dd81200f74dc8d508fed2997ccb87b3fa5e61757025d0e659422713a6b6eadc00544ccadc902a4b56bc5312c156e75cd098711e240a1ed789c3360
diff --git a/app-emulation/runc/runc-1.0.0.ebuild b/app-emulation/runc/runc-1.0.0.ebuild
index 6941c018dc9e..1b2b9d5f1c69 100644
--- a/app-emulation/runc/runc-1.0.0.ebuild
+++ b/app-emulation/runc/runc-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="apparmor hardened +kmem +seccomp test"
 
 DEPEND="seccomp? ( sys-libs/libseccomp )"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 32d56086f92e..9017b4ba228f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index cba328ada13f..5683eb33e87b 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -4,5 +4,5 @@ DIST enchant-2.2.15.tar.gz 990693 BLAKE2B 09d380fc90cf8404345e88fb4e676f92e795b4
 DIST enchant-2.3.0.tar.gz 986837 BLAKE2B 57859d41d1e605ba5b89a264e3b6f53bab7a2f060c2b306a1ac51c55925d5b30a5d40fd121be7d3df22395cc11ad4808e63627f7e0f5ae9f3c1d2f2939dc2f68 SHA512 ed25d74176aefe4ab3b1754ea09356d04c844f8e7a50441d331fcf6a0fefbedaffa21df7296b7947ab1fcd44844c1d8567d39d67ebc4381ce8766577c0269d43
 EBUILD enchant-1.6.1-r1.ebuild 1618 BLAKE2B 339676eff2871a9abd5bf85a3509924677ec5d9939e49416d4d09b71d4d228b45e81f8ac6b207c449c8ca837aab0d8d63add052598a0ce9430873bf0ea3df250 SHA512 eedb24e76290dffa83a68a565e2f5dc10544360a62617bea107a4270d13b5a6dbb19418a245c84923ad3dd5d6e77dda2338f14bee2b3a17ddeff1b7c2414ad2c
 EBUILD enchant-2.2.15-r1.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
-EBUILD enchant-2.3.0.ebuild 1236 BLAKE2B a0e9b06255e03efdd0aea332bca55ae18a8240da42cc0f343bbb96a2c943b5a7b7973d1725d0de51e4d9f4692be6731194cfe65ed7bc65a58c48deb9eaabdbeb SHA512 4a824c70a407620c74da2b1475ddb51e7fdda25017ae9d9020717b8111ca72139a47d586eb5b6a4a1010de4177b914891acd82f751ec275d7dba5d6d0d29110b
+EBUILD enchant-2.3.0.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
 MISC metadata.xml 536 BLAKE2B 5f66bf0da00c6cfd8d6e22b9644486d0df8cf81cf5875768572965f60927edbe4d46ed2502659bcb71431c715129d1d7da051f9320b3f2834905a0cac3c2556b SHA512 920c2056608571d6a2e52d0c52b995b664c95aa53c8f8cb51129b059c32180d977ab3c840ef7fb59af3dec5f984f3e1488de26cf3ba4d93c2eb81c08e6688d5b
diff --git a/app-text/enchant/enchant-2.3.0.ebuild b/app-text/enchant/enchant-2.3.0.ebuild
index 2942529407cc..148aae6be617 100644
--- a/app-text/enchant/enchant-2.3.0.ebuild
+++ b/app-text/enchant/enchant-2.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell test voikko"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 00636b681b5f..aa9c129ca3d4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 3848ac07e9d7..3a512273873f 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -5,5 +5,5 @@ DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219
 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
 EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
 EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
-EBUILD dom4j-2.1.3.ebuild 2235 BLAKE2B 0c26954207b20bca551adf3bc8a464e911adfe4aa1d0f4df1b2d2dd4b590d482396120d13d8d216b47a8b28734a2798200436329aa9730f3f3034dc4f5f36deb SHA512 949fb855f87ef0ba7707a5f5dd778ae654f5671a8c8521678d1296a3883fb34c27ccdfde30cb4282c9058786c53b137151545f571c14f96f7009522d67ac1b59
+EBUILD dom4j-2.1.3.ebuild 2242 BLAKE2B 60865c1e1d62568a6debf5801ae28c9c9422cc6b365877e7545db5f17963f9b1ca56e2682aae83c3d91473f403045350ab74ad4edf01503371e175583ce74288 SHA512 8efac8eddd40e323ca4cd15281dfaf1ea33ced91b5b2d0faabf9ccf54ba5d43ed258a635cc64e952c567e3a89f0b7ccf33f18bde26c96f5fc1fea950d6766b7e
 MISC metadata.xml 714 BLAKE2B 9669602bf999a3bcf3f303afb06edfe82c3dbd1b52bc79b1a4cafbc944b0c75067715ecbcee9568734af95bbbdda480a972a5d7e26b454460abd16c9feeaa3b9 SHA512 4a1cf930f62685579e6361db5999f377bc8b17acb2b98d3d87fa4501f4de107f6f21822cd0b3d1c2808c3a17f157baf9346af56ebd3e8aa45ff8f4452d0244e4
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 46f4b4956895..f3635e0992e8 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="jaxen"
 
 CDEPEND="
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 22404862eb13..d8fd180fe35b 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,3 +1,3 @@
 DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
-EBUILD guice-4.1.ebuild 1126 BLAKE2B 3233c7c0a85171eaa6d6a591c2522cc840dc412119a0f570e65cadbd110b77b2b4dce4b54af9ac8ea7b2daab409699975177a97b633bd1161a8c51a7269e5f9a SHA512 141d82a11d83dcca1913e2d573b0de7f9ce0f59e400637e282ef2e5aba39254cb52d20434a959d635730be23735bbb3606c0649d446dd849e5583bd533608bc5
+EBUILD guice-4.1.ebuild 1130 BLAKE2B ac5cbf10156dd69bc528468314da5d70740d545e6bdf8ec6c3442972c8a8eb19716ea98a5b444b1fd8cb829ee650ce100d6802d890388743ac102a5f1e0f4825 SHA512 ab5e1dfb01c4f4d84fd5aef2226ea8a103deda3ef7b2850191b98cda9067b29e071d029daf7ce3b7eeb68baad6daac9ea47722e802b6f7e1c112651d2ef3aa2c
 MISC metadata.xml 370 BLAKE2B 1947f66d04462084f7c9c854ad4b8be47d00994b30cde5b58393a182ca94fe2d5cdb78d9d65c2c3981c019a5fe0c3ad8971faca666f0cc6f5c0f0d8f8717e83f SHA512 609b5eac7886689f76a4ceb3dde48858b270bd66ba3c37129069194875a4f967134b46be02236a3103f159e1a2d591b18aac94351415b9611b25e4730cbb6332
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index f6bb9b557587..f1239b6deefc 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 RESTRICT="test"
 
 CP_DEPEND="dev-java/aopalliance:1
diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest
index 2e7597a1d2e4..45dde52b01d1 100644
--- a/dev-java/jcommander/Manifest
+++ b/dev-java/jcommander/Manifest
@@ -1,3 +1,3 @@
 DIST jcommander-1.48.tar.gz 64544 BLAKE2B 29ed81d5f9a7e4ec193c8fa03cdd67481e9904898bee2730c585be6b6beb2e0ec37b31634513095b660655b8202c42077361318a83c1e016c9450d7d7ff30244 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e
-EBUILD jcommander-1.48.ebuild 542 BLAKE2B fde8c8a9b2e403eb3e52f38ac9f3390999ed2cb1016c5233ce3fe623f20ae6aa296516c3989654d03e1b6c57446dd9d5671805b42d9fd564ab3f3eb5d05194bd SHA512 f7f001bc32768c38926da521bc2851973726b12f12d6309a8fb3d0ebc7b86af60fed88a2dfb83e5ec3b007e9d1a751dd78fdd67bf7b0e89af63e97c59d3e687a
+EBUILD jcommander-1.48.ebuild 546 BLAKE2B 950cb6834b570d885603ad1d37c89d9fe1b3343422bceb534fe26cfdb7435bf11cc1913801653bc72ced4999bd246147fadfa2e47325566a61541472b04aa1ba SHA512 88419c1d22bf69289690ab3808f65af9b5a3208b4eaa5b38bd393cf53be9f859de9ffa803a5a6b801f0f45e94c1aebefb7d6d18d2ad81538845ab40f279c0309
 MISC metadata.xml 328 BLAKE2B ede90240c79475742ad49d46837f55550c6b827f0e243ea6e3445908f4ef15cc8f8752505b5e60b50b0e361f88947df964916ceedb37c3d2a99856decf85d552 SHA512 6f2e953c14b69de907b9dce573cfa0e9fcb1d4197b25881efbddc9e4983222265f27679f25a307d7acd90bd29e8a1f7f1b3332f6699c0169817dedef08576e17
diff --git a/dev-java/jcommander/jcommander-1.48.ebuild b/dev-java/jcommander/jcommander-1.48.ebuild
index 1c8d4e5af4a8..87807fdf13b4 100644
--- a/dev-java/jcommander/jcommander-1.48.ebuild
+++ b/dev-java/jcommander/jcommander-1.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 4347153a4202..3388b35425c5 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,4 +1,4 @@
 AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
 DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
-EBUILD snakeyaml-1.28-r1.ebuild 2947 BLAKE2B 69b449227dd2df1c5aa3b00a69a62f582eae7e30bb9b277c56b66ff815473f3a47c84cc081b83af33e98648d3afc1f62e835fedfd721dc2aef0d5b4f277291df SHA512 f8ea7dd4a7942ba7f7f1d34271d583ca457776a895b61634e2dc4717412d542c5347068c4537ad690bbc95c94958474cf8b9326cc12d4d229ee73cdd159eea0f
+EBUILD snakeyaml-1.28-r1.ebuild 2954 BLAKE2B e02678eba3b0c292630eb119ec8f3d5eceea41f32a444b010735cefd0e326d78f1f48ea7b0ce6e30139da3081c932956d40f9998e622e072872b9ed8bbf8b984 SHA512 3d37c060da80b201206b32f15f80d84318dddae83d3515a3fb1a224cccc610bc6f8461243a55986dfb3adc91df9cf7face08dd5e08a249bbb5026bdef81f5b15
 MISC metadata.xml 320 BLAKE2B f5e0df5b735f9728165a2b8a6cd9c5f6d0142878f75ace80705d73e6948654f4761ef4fa4715b23ae4f5d97ed25e2ab6aa72582a80790a3f7a13d8c59f73ad40 SHA512 149372d821a11d3dfce7ec38ddb98c9b5b5e64c513fdd1e27b74dce17f398eec6d24b5a61ad62fb5e6e0ee31f206f1ed005db953f5f2358177f1a1d56420d5cc
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
index 74a3ef6af086..174855c3830d 100644
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index 354a7316d39b..7997952cdd23 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,3 +1,3 @@
 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
-EBUILD testng-6.9.10.ebuild 1750 BLAKE2B d371f64cb0d0df974e35adb987fc41a0c2d916b7a188f20b01255477243bdcbb98bcadbba373010df1d40a0cce1f2aad9e8b3d3ba2df0e53633d38d9607ec3ef SHA512 16a574302dbf241ba9a195f141e6626ddde5362a7ea3a025ce8f4721b7d485f14dac23a0c616a1034d353ef8399c26ac7a92a71f07ff21a5816df37bafa9d8ae
+EBUILD testng-6.9.10.ebuild 1757 BLAKE2B 78497046df9d6f5230ad92e63acc6fda91a1c035ffdaf04adc2047eead5efda78ca3e7f368aa2dfcdc921c7c451d1416117c1561877b46a1258f47fd9f34a6c4 SHA512 4adfe1cfeaeed6d0c59280abe7fe3f0a00824b5120f981bcd0532848164dd2fceffe10a1f69fcbdfd7d5b5bdd5c1f3ba110c968c4050983ee52fe105219bd8e3
 MISC metadata.xml 314 BLAKE2B 7750c36abcf989f704db0760b3e48d331329361fc0c6053966c4e658286b0762a78d3cf13d60c711cfeeb818ce380b1da88b95930c485bbe857a5748ac0e73a7 SHA512 3424de693fdbf8c629df163e74c075446f93f3f73129baec49417040b5ad89acbd70ac9272e4e1065aaaf7a6f3a44a6e15d000860e6f97e2467286fb2df419b5
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
index 6be65aaa0a31..4166a670f721 100644
--- a/dev-java/testng/testng-6.9.10.ebuild
+++ b/dev-java/testng/testng-6.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
 HOMEPAGE="https://testng.org/"
 SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index b0a561cd1efc..61b29bff0de7 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,3 @@
 DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
-EBUILD velocity-2.3.ebuild 5211 BLAKE2B 888ca363c1ff75907d25741d4805df26734c8b9e1cf0364e93ee71fbd5c5f1a21c24556cea107e102a6c4b6013612a4b12346534e03f9038b4659e5ac41b6ba6 SHA512 d1785107bd8363fc501246e8dc09ce9a3572e9f2b2e617248f49f5b9441c21547cb566c2b0b007881dac2d2e5bff1e7ddb223369454bb697667890a2171e5fd7
+EBUILD velocity-2.3.ebuild 5218 BLAKE2B ef7f3f7db7a87d45a11ca1f92ec6202561710da834ecf226c41d2020c5e835c106d1fa2ae49e7648c1bb5ea98349d77989df47f5991fc3c9443d2bb091b1266c SHA512 0447f2f916e65fa00f5da1293e7c4ff4db53a1902f4344f82e334f320301cd8d56375dbe74af0a4c20b9fede2aa3f24903eef059ed52dc310b8240121c0e9e78
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index d26c79aa3f66..894f53e4285f 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c1a40fe4dd4b..2eb3fd10df15 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 49c5618ef072..0da62b829b04 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -15,4 +15,4 @@ DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9
 DIST erlang_doc_man_24.0.tar.gz 1666152 BLAKE2B aaef8165322f39f7410840eafe562ec5038d9c89b4fa99b3b1d5748ba70fe755ba732de403dd916328e1fdcec895e2a347db4fb8c8837b5e41155439c9c54ef6 SHA512 7251f6eeb0534cc8538236a2c4be9d732bf0a05ba6832f9b3859116f9148e469d004331924c7187b07204798afb66067bfd321c8905000c355775927e5841918
 EBUILD erlang-23.3.4.ebuild 4499 BLAKE2B 06891eb432ae12d43e860ce0773eb01768ea75ec4f16c365fbe16c22093039e5b18aaa4d3ca558f7a64cada0fc405ac0ba898065b80c778ad9253197302c5145 SHA512 09397c1f46fcf92ef160dee067b9dbf9e0a9125e112f28748180166ddd0394ad34f03e0ddcf32dccff101485927f41c1b1a4376a66bbfd52c8fb2f74bfac27d5
 EBUILD erlang-24.0.2.ebuild 4685 BLAKE2B 4591f62978ee5d34cffa95b167e344a886ea3ac0e02cbe4ecabc29e145a67dcaaee61b057061249878285628addd053ee51e35738d93e3f7353c5734b7901083 SHA512 fc1aeb839c93cae56fe2729b82508f5908fb30e9891ff5b08755e11473985c91706b10b679c296aaa8256505ad1c0650f29854988dc51af206f70ea94f60bb68
-MISC metadata.xml 752 BLAKE2B 6f18f49b163e69e7748b1dceceaec772499acab795b6c2a80e69a9520387a529d27a781c87e0c59708020d667428d3cace2798a4ebdac792b2db1863151593ce SHA512 b9c5cc32e73c33f3b3d40498c3e9c2937f3a5f06ac7b52d15c4239948d7a7dd95051d8364cd55820ca267a605d156976bd9f03f4534f15b49bf10fa7dcd8f2bb
+MISC metadata.xml 529 BLAKE2B 7c051e3bab4405af2fca75a0857fd44f53cb6df8aeb361910af5007e1a20e8084e1c8b59b9ddfa6d4da8d9abbc20abbf96762875909023c6f1cdb71db05bc618 SHA512 6ae6322e237520246b2ee96e65c3f324703bef24e3839b1b6243ab3ecbd32ffeb8754d563f28eebb132dc49e9ef6babdd8e3b37476b594a9c69545873e46875e
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 7481b07532ae..69c49c1458e4 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>arkamar@atlas.cz</email>
-		<name>Petr Vaněk</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="hipe">HIgh Performance Erlang extension</flag>
 		<flag name="kpoll">Enable kernel polling support</flag>
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 763a87b00064..058fb8bdaacc 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -10,5 +10,5 @@ EBUILD vala-0.46.13.ebuild 1305 BLAKE2B 4855220ceb0594546be128b16092270a4d21459d
 EBUILD vala-0.48.12.ebuild 1312 BLAKE2B 5acc6c67a78ff5aff422e44980db6072ea7f1311f46b107eba95ff2963b78518c2a60136c06fcf6da996cdb9bb222c7c9bda56c84c85166d7a69ca885b4683ff SHA512 78e461a215adbdfc7d7ae7ccccc9f97e1b408a133b0e33005841a74169c57adfc624e12ec0fdab9434ea6720649c3356e90cf9af79e698c2998fa93daac1290e
 EBUILD vala-0.50.7.ebuild 1312 BLAKE2B 36746ae0645349498963828caec58e5e82cd9585b8381c268c6affbb884d223dcdeb2f629678de71d288b8b152820fcdf981d622659cafd249ece2d91b0dd656 SHA512 f013ca54bd4f72ba4e632fa5cd7817545bc778cd261c5167e9e566aca0cfa4b34ca7f02a7af2115701f2fae6830b7dab7ddcfbf312907210d064b96fdeeb9964
 EBUILD vala-0.52.3.ebuild 1325 BLAKE2B 3f22f959527acc36013a9c07978b90b087b2075bc8b8208cfc190eac508d8192c6a2d5fa17bcebd259a6e18faf25e8e804b82e8463c05f9dca66484f555b4e45 SHA512 635fd952a9f4ab98718e22e5cf4806da041bda0ab2b09bc3cc18351de85a1350e912590aded7ba827d7d9460d5091c86900fa4216aea57fefd596357fa0212be
-EBUILD vala-0.52.4.ebuild 1327 BLAKE2B c481b0957945381f62cb921857f91c1eb16ffcb94554377e5d0c5d7b824d567a0c1a450dccdc32b79530a987875d0304422ae1f10c03a0374e7c02122007ef07 SHA512 07fdc4de8d694f4356905303e64b114a58a560b889257f603450b88d0bbce23ecd40ac0820d00955cd8aa129befdfad2a07551a040f5ff6eee20b743f41b812e
+EBUILD vala-0.52.4.ebuild 1325 BLAKE2B 3f22f959527acc36013a9c07978b90b087b2075bc8b8208cfc190eac508d8192c6a2d5fa17bcebd259a6e18faf25e8e804b82e8463c05f9dca66484f555b4e45 SHA512 635fd952a9f4ab98718e22e5cf4806da041bda0ab2b09bc3cc18351de85a1350e912590aded7ba827d7d9460d5091c86900fa4216aea57fefd596357fa0212be
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.52.4.ebuild b/dev-lang/vala/vala-0.52.4.ebuild
index 2d8bdd459604..04d4f4e5dfe7 100644
--- a/dev-lang/vala/vala-0.52.4.ebuild
+++ b/dev-lang/vala/vala-0.52.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.52"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 86f9e0119357..f1a7ee4b44a4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 23aea2d7f258..26c60214ad08 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,5 +2,5 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD glib-2.68.2-r1.ebuild 10165 BLAKE2B 70156b306a52ff61a7f0c998849d28bd088b118e560029b73d9f163b180f02e45d63d9093d78eee4632ee34fb899900fa480b2bd456754c8855f221ce430d28e SHA512 33b9630d5ef59b88f39c62fb1f23c571b7ddb04f46417099037e89565a04f981b611e7b81c99075b8c6bc2c6571792d1dce25459484d1577ab7444cc18e2c2f2
-EBUILD glib-2.68.3-r1.ebuild 10158 BLAKE2B 6389016649044a32b581f89a70d16b47cee76085fbc3720527fa43c2abe4194f96def593382880713e01b6d36fdc9e34af4f8f321a3ad54166bb2318d81ad119 SHA512 614ae63f6fdb9b8935db9a81115e4b0dbf869c6ed953f655e98c0d815b4b24c5c5d7dbaea910fdf9082ddc7678f7d1267dbece61c944eb73cecba1bf2b4748cf
+EBUILD glib-2.68.3-r1.ebuild 10156 BLAKE2B 8208bd7df122b064999f881986b197f6735adbc471eae69e75215b1ab6fedbea8d648e0985c233a6db0e4c5d9287fe88890aaece7eb5ba464ecb061f37b55ece SHA512 da8538e163209a2d3c19f1b35b9972ce8812d81d7f985bb03f2e7d670945b6e8f40eb8ba3ddedaea523f26259d86ea7b4961ee91b92b45b5d311690e50f70c5a
 MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56
diff --git a/dev-libs/glib/glib-2.68.3-r1.ebuild b/dev-libs/glib/glib-2.68.3-r1.ebuild
index 6f3ad8f65d70..4491252a2ced 100644
--- a/dev-libs/glib/glib-2.68.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.68.3-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 71373ed09afd..2ab46fdba2df 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -3,6 +3,8 @@ AUX libbson-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1dc63673
 AUX libbson-1.16.2-sphinx.patch 390 BLAKE2B e7ddac61c4f0b766d39149b0eba136c4c1f2a553b12516d7009be71ecfdc27fe189d10f54b602be4cf6ec608118b61086a34bc1acbe707a72a21484c3aba156f SHA512 4a8aaccd99117953c9351ab7da8e4ae1f420d2b053f4b02da98ee36bf3e7efd9095d81e67f16c3babd48ac56a21e92da653774d5914bdfdbecfd3656c441687f
 DIST libbson-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a
 DIST libbson-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8ecbaedb24b33ddf7ada93b913eae33a802245f386d75fef01bf53c2d9630e68138a5715de001b7acea7dbde05f1 SHA512 49889b9d777dc3cb151b9cbef7bc2dd1785e327ae641569281efcc040d208cb034da3a74ae1115a033cc86e5b70079dab76c3478df8f171cc083d686f7568858
+DIST libbson-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
 EBUILD libbson-1.16.2.ebuild 1105 BLAKE2B dbf2c09216d0b1d3cabc583a80f2d7f4f67519eadb8d27709c46aa6dea3eec658f3fb3ee8dd78972ab1cca25ce548d93328d7e4e53ea5597b338ba5405b05a7b SHA512 4e31f2d52cf21dfb17a067fc4928f918433e26b1f535323861d92f7dca6805a8c0a142a5c8b069bcc29146d419fedc0e4632717c0aeea72d634b0c2634f85490
 EBUILD libbson-1.17.0.ebuild 1040 BLAKE2B e46d4b49d5e9a5cbc938f43cea74dc42ba7449552554a891cc95fb82c83414c0e69aa0a5e76c1e9cab37c87c7ec5209890b0b0cd517f5aa90b1a46ffc622a005 SHA512 5d04ebc113ec3176c5216e19c451750d554f9eae7c61bc7b3fbfaca647de5085b0201dcac316083bbd1ce9c5339a3ee3b38aad1e636e2d0492b70bbda61fe5d6
+EBUILD libbson-1.18.0.ebuild 999 BLAKE2B a2bdba01698cddc2534390a8715f015846aeb6602eb6552405f7b42546b60f062a1e46972c40dbcd4edf0ba0acc7d58761dfeed96c86601c7a6fc7b254e814a1 SHA512 da221f32965eb196eb7e828cb20d975e70eff0deb2fa4436f7058dbc5c4ab87bd696f21c87f0644e60601d4106ca4ed46bf9a99fb68bc874690ced2d428e0ddb
 MISC metadata.xml 333 BLAKE2B 25979b807deae1e87e62fa985ffc6d01853a50340d694ac6b4383854df15c26d1c7faf3a4abefd195a7525ed95e255b9beeef5e22a25fb936244de1029fd0480 SHA512 bfe49ec533a23f950bbd560e65fdfa0c5c839d189a53ffc3135242c5bb262141f0c89cc69d7578fe9b3ea9116b70d55d1c362a1090f069e54e54bd03c51f6265
diff --git a/dev-libs/libbson/libbson-1.18.0.ebuild b/dev-libs/libbson/libbson-1.18.0.ebuild
new file mode 100644
index 000000000000..13a9c702639c
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.18.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-python/sphinx"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
+)
+
+S="${WORKDIR}/mongo-c-driver-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BSON=ON
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_UNINSTALL=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libbson/examples/*.c
+	fi
+
+	cmake_src_install
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index e523c0a1df16..13203ddcb968 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.17.3.tar.xz 612892 BLAKE2B 1acae8a5bc0f87b547c83a0f72e0693ac95cf
 DIST libinput-1.18.0.tar.xz 616732 BLAKE2B 4f12080b5e3496fdb5ccb1375a073860c26037ba47033a7d2d69a2f817b4ab5791aa89be08b193925cddd566a04144c73399cbb196a4cc9d3e07dcfb806d3eff SHA512 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90
 EBUILD libinput-1.17.2.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 EBUILD libinput-1.17.3.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
-EBUILD libinput-1.18.0.ebuild 2241 BLAKE2B 14f411a26e778392c441c2dce4b7cf53e51f3098ab69b8a28244b4ebbb413b8b557158b4e7b38626d1d5ff6233b7e96219b9ad5756482a9d8c700855e551349d SHA512 4bd4aa63c5c3d0cae88bb161613091094d58ef7aa86f30b07f0460a7af710f92a31ade7d76660d61ffd496ab1075d3eacbfe76920473ea8e7c7c00eadf5a41e3
+EBUILD libinput-1.18.0.ebuild 2239 BLAKE2B d34a5eec17d919602ba721e15e3d49889a0bae875aff92407103ab470c11c692e498fb6df9c0ccb26802af800d93dd334d3da565c0892afe2754c3db471763ba SHA512 ce2833d7343515dc0f1d76b338a4fd19f28e5c33f7272c66ffa8044d9aa83714a661159a9f8e4962776486a2e4cddb8430c804f774ece519fe77ea3822d428a6
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.18.0.ebuild b/dev-libs/libinput/libinput-1.18.0.ebuild
index 47c3c7362ce4..f757d3635d37 100644
--- a/dev-libs/libinput/libinput-1.18.0.ebuild
+++ b/dev-libs/libinput/libinput-1.18.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index cae407c7fc1a..1add3b4314c5 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -2,5 +2,5 @@ AUX libtpms-0.8.0-Remove-WError.patch 472 BLAKE2B 08bf1379957d35b123180d0e2434ee
 DIST libtpms-0.8.3.tar.gz 1254474 BLAKE2B c71f52d6475d4328e93a35f88557de3400308984ec086f7e6b3c32ebc266e078b3a9864396546ba11fc310c1572efa1521bdac89075c5eba18cb35eef883e706 SHA512 07cf78c2a5b03f3c9179b041db57d5ec049dc0085c09e4fd5c9b54a247cf81a3b9982f0fb1cd571cd6b21b3d9824b061f8f38508fc25b6a23a6a6b06dea7115b
 DIST libtpms-0.8.4.tar.gz 1255255 BLAKE2B 0786b19dc8f3226508548ab16544ee8ac05e8d9de057eed840a0cb7577c1d1386d83af1a725ec91e64344e2459f9d4836268e2c9a097136cf76d59ea8e23b0c8 SHA512 58244a774cb6ec5dcbbc2d795628fca9eb64936874c72b169ea8288f2bf0cafa8127b1e89ed3ddbf5694df5a5944a7d61254dc729d75b63b3e4f9346b2f0a7b5
 EBUILD libtpms-0.8.3.ebuild 1197 BLAKE2B cfc4d452f26351fa66f744a42f1f24e2c2aa9e464f9189848ef24a01dd94bdbac7a609827407e0e062e90c6bd36646c4bca6aa76a2c52d3d5d7af93f8ae869c2 SHA512 714e720d1895494a214b86fe534f26c7bd28ea5bac0c0eb381e770952bda0f0edaf46bb7eb9cecfe11e5d2a6f8a7bc7c3bd97c00bc2cc8f2fb4656c3fa24f9a3
-EBUILD libtpms-0.8.4.ebuild 1289 BLAKE2B 5721991eb5d0fa307c854cb59c2666be4f4253817d0c5388da44e74ca4089ed32f681429cf45c571659781964e213bf0a0d44bc8f317a2d18e46efb21aec7881 SHA512 500846d4211cdc5d294d56fd4ec6db837bc7e6196ed0252763c1eb3eb1f32cc08f3fb5bad1220d08a64d4595a29c9704ebde5971d4d65ec0a2afd44e253975ea
+EBUILD libtpms-0.8.4.ebuild 1296 BLAKE2B 64ca98b9db516e37c27d4305720a363edaa0640f5838bfdc540b693eef49e2c261912b7e36f8ea3e3f152d918cc19ce25cb7131c0180b6558baaac9cfa531d40 SHA512 8dc99c8cc095b24db6320aed128000914a69caec4cb0e8ef053c2b46afb109b908ae53033bfcb4649a8680f9df13cd526a5f46c76062ebf450aa9ccdcdefe62c
 MISC metadata.xml 535 BLAKE2B bae20f8be44e80b54b497276a1913da891e9c1bf3e61d3ecc41c0db089ba78424dd470d2b3d9e6475f772d786c44b390cea07dba2498521fa5316144622bc4f7 SHA512 ad2c131b3183613382d1ecfb0b24b02ff3f1d2b4901ad586289298816ef39d4604e82ea1065df54f35883e0cc4052c0510f6971220df8196fe9477a105e50f68
diff --git a/dev-libs/libtpms/libtpms-0.8.4.ebuild b/dev-libs/libtpms/libtpms-0.8.4.ebuild
index 3eab05684d98..5efa7fe4f9ee 100644
--- a/dev-libs/libtpms/libtpms-0.8.4.ebuild
+++ b/dev-libs/libtpms/libtpms-0.8.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index d534dda5c898..09751a3810cc 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -4,6 +4,8 @@ AUX mongo-c-driver-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1
 AUX mongo-c-driver-1.16.2-sphinx.patch 390 BLAKE2B e7ddac61c4f0b766d39149b0eba136c4c1f2a553b12516d7009be71ecfdc27fe189d10f54b602be4cf6ec608118b61086a34bc1acbe707a72a21484c3aba156f SHA512 4a8aaccd99117953c9351ab7da8e4ae1f420d2b053f4b02da98ee36bf3e7efd9095d81e67f16c3babd48ac56a21e92da653774d5914bdfdbecfd3656c441687f
 DIST mongo-c-driver-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a
 DIST mongo-c-driver-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8ecbaedb24b33ddf7ada93b913eae33a802245f386d75fef01bf53c2d9630e68138a5715de001b7acea7dbde05f1 SHA512 49889b9d777dc3cb151b9cbef7bc2dd1785e327ae641569281efcc040d208cb034da3a74ae1115a033cc86e5b70079dab76c3478df8f171cc083d686f7568858
+DIST mongo-c-driver-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
 EBUILD mongo-c-driver-1.16.2.ebuild 2453 BLAKE2B f18643407983f1fe8316a774496038b21a05812fbcc81927ac895ae42d6e0ee5ad7c4c8894256546f51de185471d2f4480336674c8ebd6239078b722948aa69e SHA512 2d6036e5715c35d56bc7470bfbe1ad40310bfc0e416326ff0197f71721ffec1747c26a7bd4d746117cc945c06e8f578805389bbdd6eefa0c336a97ad03c8cfd6
 EBUILD mongo-c-driver-1.17.0.ebuild 2383 BLAKE2B a9e95ad7e0e00b4732512c03d1ec176499ef99572d1a940604f455280e56388fbcda2568c00976d8496ca8bead4928247d296f916eb06f2d3fe8be3b493f64f3 SHA512 c8a29735a595fc40e919b47bcb6442accf25dd214bc9eb3e4c6621ba6dca6a07fe7e039bac717fde489aafb3b34419a1622ca72973e30c41bc59fd499e1c6131
+EBUILD mongo-c-driver-1.18.0.ebuild 2342 BLAKE2B 521390b5b8cfa595ea71e0607141297bc5a3fcc02eb7fc8cbd20cc3b0e0319a38dfe71c7ca2183f2b25eea5d1cb44ed8429f35b2f1b5af0d602c376b5323861e SHA512 338aa7b92fd32af9a0f4291c627b81f9a7a9fab2b246eb9ed02e5669523e2c6f43191ad7d04826603cd8fa49a862581c6222953c3fd78c4eb41ba215ff4d2393
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
new file mode 100644
index 000000000000..706008e92748
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Client library written in C for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
+IUSE="debug examples icu sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )
+	!test? ( test )"
+
+RDEPEND="app-arch/snappy:=
+	app-arch/zstd:=
+	>=dev-libs/libbson-${PV}[static-libs?]
+	dev-python/sphinx
+	sys-libs/zlib:=
+	icu? ( dev-libs/icu:= )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-db/mongodb
+		dev-libs/libbson[static-libs]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
+	"${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# copy private headers for tests since we don't build libbson
+	if use test; then
+		mkdir -p src/libbson/tests/bson || die
+		cp src/libbson/src/bson/bson-*.h src/libbson/tests/bson/ || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+		-DENABLE_BSON=SYSTEM
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_ICU="$(usex icu ON OFF)"
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=ON
+		-DENABLE_SNAPPY=SYSTEM
+		-DENABLE_ZLIB=SYSTEM
+		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
+		-DENABLE_SSL="$(usex ssl OPENSSL OFF )"
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_TESTS="$(usex test ON OFF)"
+		-DENABLE_TRACING="$(usex debug ON OFF)"
+		-DENABLE_UNINSTALL=OFF
+		-DENABLE_ZSTD=ON
+	)
+
+	cmake_src_configure
+}
+
+# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
+src_test() {
+	local PORT=27099
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
+	kill $(<"${T}/mongod.lock")
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libmongoc/examples/*.c
+	fi
+
+	cmake_src_install
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 402a60d4e93d..7fcb2200f469 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
 DIST vala-0.52.4.tar.xz 3577796 BLAKE2B 20f541f5429ef52cdcb4b0c5559dc312f62276ac6d91b3ca97f5bce4b954f7d0407637131e16db5a9f059f5ee3e7d44a414cc06311d49c294f22789db821ec79 SHA512 3c7daae4d26e6940b0735cee84f1a25f2aab12c93d2a8a9e9edec45c0c9dc9184cc790acbae19aba0fb31dfd7115afddcf8b9f09b0423b5b6950900641f4c527
 EBUILD vala-common-0.52.3.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
-EBUILD vala-common-0.52.4.ebuild 647 BLAKE2B fa5e9ec87d657f28722b5733f2a435e38a2f168b35327315fc8a63e3ddf9dcea48feab6156a3312c0bfb194337f9d0f5581e7911ca6ee441088b768858a8be1f SHA512 b11638f4c7c39288dbdcaf35225efc7fdf14fe332f2d1210d30e3d601c99740a3ebc2df7ec47ed7f0e0ab411cea402dbdefb124c238ac4e098b83d6b98a3ac1c
+EBUILD vala-common-0.52.4.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.52.4.ebuild b/dev-libs/vala-common/vala-common-0.52.4.ebuild
index a2d77e324096..71dbcfb591c6 100644
--- a/dev-libs/vala-common/vala-common-0.52.4.ebuild
+++ b/dev-libs/vala-common/vala-common-0.52.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 3ce5380fcbbd..86f2eee69a49 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index ef9a9b42a888..c5326ed5d233 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -1,3 +1,3 @@
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-core-2.0.8-r1.ebuild 861 BLAKE2B 8f17334d7dd341661ad70190957edbf51fee7d6d68147caf41a2b9f162ef4974fabca85c6624d7ac5b5767ccf449035280dd71f39c12d7fe626e4f37bb1a994b SHA512 a2f4e1e6b3c20dfc609feb768fc00c30437e9a0e038f8d3e09355037d471431f3f587e448341524f0c62cb186b892fd74e4f3d5ed2de9a570fb755fe8c59d567
+EBUILD opam-core-2.0.8-r1.ebuild 880 BLAKE2B 4cdae8b13b22234fc9628ba3816a5382940201bb6a416766dc0ed1bc096f79fa5ed3d4601547eb83a9655c183a5aa52703e5dc6b068558e0ab83492782c95f6a SHA512 9097d88ac2615449b25a39dde43ae0b61b67bada0f14b2e51071dee777e23b81c7db2872e814e06f44a625bc1d9dcbff27edac87b002f3496ce996dba37696a1
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild b/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
index b32234835a9e..5a463569c816 100644
--- a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-ml/cmdliner:=
 "
 DEPEND="${RDEPEND}
+	<=dev-ml/dune-2.9
 	dev-ml/cppo"
 
 src_prepare() {
diff --git a/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
index 882826314ad1..054346d4156b 100644
--- a/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
+++ b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Check for the presence of a compiler"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/ExtUtils-HasCompiler/Manifest b/dev-perl/ExtUtils-HasCompiler/Manifest
index a4ded09d8822..36d5ece85c32 100644
--- a/dev-perl/ExtUtils-HasCompiler/Manifest
+++ b/dev-perl/ExtUtils-HasCompiler/Manifest
@@ -1,3 +1,3 @@
 DIST ExtUtils-HasCompiler-0.023.tar.gz 15857 BLAKE2B f999cbc13edc4ff9d4fb1f28fc20dc223e2b504a95e44d6a4871c55766ec3fa0cbe6c5a46add40b694a2513604c486d1d98853c17fcce397b21855d6754fa41e SHA512 352e87249eaefcf1cdaa019522849867c2e3dffe60e07c24957072bc27aea39e6855c082b112f326c5a4f86b2174dbb2e03c487b8f7fb2abfd750847f19e7a6b
-EBUILD ExtUtils-HasCompiler-0.23.0.ebuild 388 BLAKE2B b5bec362d3b0ec1473fd0f3ab9345b12ad242a2c559f342b2e97ce8123afe76fde2a703464650a6468ec0b95251d6b12e49a263761c63baf280245d2c4e6defa SHA512 80c3cd37df22a1b8f132fef70d1a57d7d4a648cfbb317b9d5219db2a2f803980f111c77d1998f18c8631483f68b5c52b61a66091efa4a6fb23865d631f6feede
+EBUILD ExtUtils-HasCompiler-0.23.0.ebuild 395 BLAKE2B bcbd08ca0f537c548dc4839e5cab21c819779756c9145c16b47aa6e7173a9bb329e2ef5d024e2578b8e33b977f3f5889c728d2db7c3f767921022ca6cb9562b9 SHA512 58997d6064c6660f1ade9f12f32c0d83e9a671fb39e6cc3d63b1608f5f838b45504193bcc32d8eb10bdcb23092a20d2f54f91c452c5f96189d934bfdbe8ef6dc
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index a6ffe845c02a..faa9ec92c4aa 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Package-Stash/Manifest b/dev-perl/Package-Stash/Manifest
index 9245362951c0..626ae6c317cb 100644
--- a/dev-perl/Package-Stash/Manifest
+++ b/dev-perl/Package-Stash/Manifest
@@ -1,5 +1,5 @@
 DIST Package-Stash-0.37.tar.gz 40309 BLAKE2B 6afb95f87288d1c9081d288c71a77fb5b98dc6ab80ec16db1fbb7a7fcc949afefc249e5a9d33c5835b944ecaa6e9cec771988e2987315bd034764ab977576550 SHA512 d10321903591568d4ac4db91ad9e4dfcffe564ab22a5ecdd8fa103749c9708da082ffb3ca478e98ac120a23e51c0ab0ccf799c0da10fe2be194e9cace1f16b06
 DIST Package-Stash-0.39.tar.gz 55606 BLAKE2B c4e9ff6fe83f2c8a537fba0b8e38456b3b9a9768ee7dc1c8a2b471a42cc4d8b82c5ce74972cc462996718bc84eb7bf4cd651bb21cc870e438481e85d024a32ce SHA512 c5a6cd56c86fb9f6c8585ee7f65d0add8e905c586747763c7841a054f3540b6bc505f57952f44bb90a6bb500d0d60d20ad5df7a40944480abbc9d8d43d64e30f
 EBUILD Package-Stash-0.370.0.ebuild 1040 BLAKE2B 3e7ca230660abbaaba60fec2b677959a826feb6ad8e31eccaf03e683ae472e20adddb0d1649eb4e3a6b9362ab5aac358d58a7f4dcca1717761d40b1a63437f6f SHA512 74ec8cc08c85097d6eadfaac07e209b0cf2859403dbfe873bd92ac6882d6860e729ea4d1cab93cd92f1d706b4e6347319efdc7c4d36e8bada76170b5b96dfa1a
-EBUILD Package-Stash-0.390.0.ebuild 973 BLAKE2B 076ee5de56c29c8f33526b480bef6d39af06a6b329faef1d6942b8a08f4d7cff029eae6c5e9085ab85081a0bbe6d801a046977ddfc16a2a9aeaac1443a23361c SHA512 1b9263a9c0009b5d224c4bc09cb733eadf5bd1333bfbba333e42f150e47cbd34c4cbba2e8badf8a956f7652807e8f64bae46714ebf4234caa208553398e3b0c5
+EBUILD Package-Stash-0.390.0.ebuild 980 BLAKE2B 383356af313129c8419b2e438a1dd60ae9bf0cf3e0f4f522b778928c43978b7826177529f4b2ab395ce089d81aa060aba53f9d881fad32dfde891ee5ca62ac80 SHA512 c9da9fee96913c045f8ecd2da3d3b7fb1b80df8decc164456ecdbf6ef45656c19ddfdc3f2d25b432f1bfbe82755d2ac007f54eb11b3e3ac5ff5882c20a92387a
 MISC metadata.xml 463 BLAKE2B d3b8057579c6439184990d6a8090f76b0800966c0c75bfb9bd0317aefa2f48a1ac375c7b60b3c05c7de7f992f1931ad0606fc44c6e77e4508b71b3987dfa745f SHA512 2b2e4ef2cf309de39aed1422386e2a9737c1b19ba6128e60b21d4faecf2b8f8515036701d3e42f4742d160e745e953b63511e921d206f5643db1ed7c7542a426
diff --git a/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
index 6ef8877dd704..ef7b89a3fa8a 100644
--- a/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
+++ b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating stashes"
 
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index ae3a48d2ac43..1f8e38680e00 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest
index cbd0ea3e284d..4a0b64e0e3ca 100644
--- a/dev-php/PEAR-HTTP_Request2/Manifest
+++ b/dev-php/PEAR-HTTP_Request2/Manifest
@@ -1,7 +1,9 @@
 DIST HTTP_Request2-2.3.0.tgz 119717 BLAKE2B f12972b2423258016f4f4ef8888b5aa1d56bb47146cc6e21f74edfd2e3cd8ae69a1830b4a203990e1346554f2a6e9538e8d5feae27cceadc8465b018dd34ff37 SHA512 52fc2768f3c5afe6fd4505d427255e467b5b7cac8a4116cbabc3f1c0ffe6f1bd061a9c9b31de2ebbd4a7844ae73085ab0d52adf905dce28eb31197117657d77b
 DIST HTTP_Request2-2.4.1.tgz 125380 BLAKE2B 0037938211432be52af8851b015f8c8ef73225fbbc1727e6e647d2e9632fa471a73ae14c4f8c0ea636fb97339dfd53da91bd391543bc855dc9a123ca7a707965 SHA512 9a65aee4c4f724a84815d683522225d36a8e30fc1f5dbbe6b4681ec264b4fb711573bd6d2ec6ddc228c9e259ffbeeb6816aadba155530e969c7bfac4e0617e2b
 DIST HTTP_Request2-2.4.2.tgz 125530 BLAKE2B 3e614e45e40b075930781b9e3cc0ed657f10056aa40bce28910ae9499e9db39a6f36410f632254061a002818343b4454639f4b48f23687e0db665b204275ad0c SHA512 c122df64f3f87d562fd4f818b3f02f7639dc907f724d034c420ddeabc5295d0a94d77221287349bcb7a790a97cf7c9b078d9a8086a476789eae906c6e124c910
+DIST HTTP_Request2-2.5.0.tgz 126988 BLAKE2B 5d1f4f2e3e9b800377c14688529ea322084f126c388f675b5d33ae99ba9d3a10e5da0e30d92984f1ba40e92da908917362e459f7b8415e61a85ad797ca38411f SHA512 a333109077758c0899e74e1037484e749825c87f182e2388bb9a0a7e0a881b1f1aec7b9f7a327ff428e32f874df263e7b4b7714be4d8f86cac9370f31aff2d0f
 EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 748 BLAKE2B eac409077cece70cf089434db484e182c2ba8938255a890e038648063d0b4addb26fae086bb32ac7ee371cd867c612def08fdcc59ce945d57965059d9a453a4f SHA512 796bca65c5e0aa1f97f2e8beccff6d1390f3a145feee1e97e6cc50b44af106055932219feb867f98be0f394f45112043d2de59aa8aaa95877998ce0806cbb252
 EBUILD PEAR-HTTP_Request2-2.4.1.ebuild 751 BLAKE2B 86fcc0f813e1c16087ea92b29b83f560477500cca8c965c49f2ec9bc3ab680c2718ecfb78e4fa76dc57a22543f3a067773b3987213e9cdcd72378591fd3b382f SHA512 17a44ec6535910f7ccd32c2133dd8c984f2e0c31b4a4d49fc5b8cdf80799f536be080d452ce5d7572653a59398c05aaf876b12aca06fba591fb9bc421ac570fa
 EBUILD PEAR-HTTP_Request2-2.4.2.ebuild 751 BLAKE2B 86fcc0f813e1c16087ea92b29b83f560477500cca8c965c49f2ec9bc3ab680c2718ecfb78e4fa76dc57a22543f3a067773b3987213e9cdcd72378591fd3b382f SHA512 17a44ec6535910f7ccd32c2133dd8c984f2e0c31b4a4d49fc5b8cdf80799f536be080d452ce5d7572653a59398c05aaf876b12aca06fba591fb9bc421ac570fa
+EBUILD PEAR-HTTP_Request2-2.5.0.ebuild 838 BLAKE2B 1676711c2cb6338810040be26b5365b97fad62e723626f01c0db136c97acb37bda6921c073eb3f15b9434bd7687ed69e4901cd6a436f98ff83c9d08b88f11998 SHA512 a25a40127458372bd22b36c968994a460d451d9d935943c75ac7dbef2e021862d2d44c17b67f710f2d93761c5775434cb735f71c90df5d8e8df8e7c290571eac
 MISC metadata.xml 584 BLAKE2B 047561372464da70d52c405b145dc141a4104b42986b2adb4286af5ea62ad3c13572c5fd5dedbcdeaa369ecf7d1371f6c0d3f3e9ba37d79acb77800680470e9c SHA512 00292c513e1457d9b02432425097e9f5124b92aa365578f882a94d5d9466d93f6190945e705489a3527236c5cc9572a5ced705f99f8e2f718272eb793024f36f
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.5.0.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.5.0.ebuild
new file mode 100644
index 000000000000..890fa326e01c
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides an easy way to perform HTTP requests"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+curl +fileinfo +ssl test +zlib"
+
+# We don't have Yoast\PHPUnitPolyfills in Gentoo
+# and we would need to patch sources to find it
+RESTRICT="test"
+
+RDEPEND="dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?]
+>=dev-php/PEAR-Net_URL2-2.2.0"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_prepare() {
+	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" HTTP/Request2/CookieJar.php || die
+	default
+}
+
+src_test() {
+	phpunit tests || die
+}
+
+src_install() {
+	php-pear-r2_src_install
+	insinto "/usr/share/php/data/${PHP_PEAR_PKG_NAME}"
+	doins data/*
+}
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index d204407cef92..125792507b11 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,5 +1,7 @@
 DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
 DIST imagick-3.5.0.tgz 300657 BLAKE2B 7cf2c34b84a10f451851493b27a33f7188da0ad53673589db494a6b1a9ae089c5b3e646de4f7b76c29ffb8cbe1c8154ebc8b69d61bc597b082d33778e8f3a18f SHA512 4176494797c78fee28fbf076ee67afe4a634703dd19fa2f727aeb6accc2d65a3fc6224c3131f25d3ac60b2e8d531da2cf76d35800d1f10071cf362067cf531ec
+DIST imagick-3.5.1.tgz 301411 BLAKE2B 551c8a0aa07b18938fce3e39ee503ed053efb261fab712d1c1ba2fb941a911307b8d9e88257dddde19dfa77886688b5b704eb7e1cd65bba734e10b5391661374 SHA512 b922c4fad994a4bf26f4d92b6e81bb761bd8d4d1b52f4b7099cf944cdaed4e44d0318beccfb2cf3bee2605ce33b0ad764d9e3d2ba99c9a6f624ca569a4ac73ad
 EBUILD pecl-imagick-3.4.4.ebuild 756 BLAKE2B 454d515c41354657474a6cef529c09144a5d4c6485b2796691ddfbd6bb4cc1af3ca7cadae84e00c568f7c0e9139c24ff8e5f65db0afce6aaf53293cec8912015 SHA512 f39ceb78e5510351762a2f3c15808976d4ecb044476860b559a78b2bd0cb959cc0e9b213800f701f1e0f1ef1c0ba1da919787dc930696445212b25971b4426db
 EBUILD pecl-imagick-3.5.0.ebuild 863 BLAKE2B f32530e9e27ae8a11db644dbf2c232d28ebad9bc7c60237879c9980f4d2cc5256920dedd2a01fab822d96cf742bdf3a537d010d83729e73a191bcaa92a91cbdc SHA512 f909dd4b728049b76ec3c835dc2de58b4ddfb3c19276ccb3fd43f666cec17f1def25b15645798e0f7b6a0fa108ad552280957c5effb4298a245b79c5eb190425
+EBUILD pecl-imagick-3.5.1.ebuild 863 BLAKE2B f32530e9e27ae8a11db644dbf2c232d28ebad9bc7c60237879c9980f4d2cc5256920dedd2a01fab822d96cf742bdf3a537d010d83729e73a191bcaa92a91cbdc SHA512 f909dd4b728049b76ec3c835dc2de58b4ddfb3c19276ccb3fd43f666cec17f1def25b15645798e0f7b6a0fa108ad552280957c5effb4298a245b79c5eb190425
 MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild
new file mode 100644
index 000000000000..b9df58ef938a
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="imagick"
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+HOMEPAGE="https://pecl.php.net/package/imagick https://github.com/Imagick/imagick"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+# imagemagick[-openmp] is needed wrt bug 547922 and upstream
+# https://github.com/Imagick/imagick#openmp
+RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
+DEPEND="${RDEPEND}
+	test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] )"
+
+PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
+
+src_install() {
+	php-ext-pecl-r3_src_install
+
+	php-ext-source-r3_addtoinifiles "imagick.skip_version_check" "1"
+}
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 6cdaa1d5174f..67688cbacba4 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,9 +1,11 @@
+DIST mongodb-1.10.0.tgz 1331177 BLAKE2B 8593392d50fce99059888e25d6400d2e7a35e93a1e4b74abf9b427ff43dbd2484380ecdbd7b7ce6abec643351a9c3bba572e2e0b551a88b18efbcf4c2b133767 SHA512 72527087dc3d1e1d48d6236592c1fbafa68354e2b8e070e85180d79ffcaa82740641450808a235bb711ded16ff65ec0cbd53fb66f0da18837351a3d402c3976f
 DIST mongodb-1.7.4.tgz 1223416 BLAKE2B 9db40284eb2b70e242f26c1661923c5f33de8ab1e33a7e816863b61fcbc49040204ca556b1f384cab958f9dc2cf4e49e97840b78bd520a4e374b83210a964e5d SHA512 6805ce1d0958e24e1edf3bc9698bc1f4a9d31c26250624fd35aebf7a7d310af30050e1974cd9571f989303fce4c5522e793a8cb41388397df66e8f5fe0a648f2
 DIST mongodb-1.7.5.tgz 1223892 BLAKE2B c30a217d1170c31be00259f4bb58cfea186947fa0bf1653de32e228a8eb8d3fb25b52d7a5a9e16f6b311418d977f7aa00bf96ca9d7e9ac9a8fa7b6fe05eace8f SHA512 f0565adc42659d4070e42122d02a8306f29d6d70fe0b5e9a92144df346a8c672aafdf36613435b9dc8d50db5e98c2359fdf97408c45439d4d447257b85e93122
 DIST mongodb-1.8.0.tgz 1292928 BLAKE2B 3bd9e5eb6b981010637b9e478928fa21268e1d1447f3ff345bfdb45c93637990e261c46b2ce09560cd4e284df73494dac210436cf700b588803e4ceffb8dc67c SHA512 7fd54dabde8df9533abd36d159c3da1c2b4606e7788b8a6d41faf83d0710b74885e8bfb4e1f4837a50248f3af1df2e7414b90f99227fc92c9084f779c7e68698
 DIST mongodb-1.8.1.tgz 1292453 BLAKE2B 25fe36b7d966a4dcf631764aeb93c09932cc0643e46fe5e594d9223a9d3f099b75211a813114c3e8cd4a1722da774b669ef968fdbb1d4877a81cf1f637890997 SHA512 a80682e3a90ead699a930185c3d10bc3a86b335b45891be6d41ef829fab6f2f2468adb5973735048fa98bb6aaa9c8568ba9f7df5709916d5b6f7676c77188d0c
 DIST mongodb-1.9.0.tgz 1300408 BLAKE2B 1cf6a43694e8113df8028c2663db8049421140d53124e6dcf8cb3e42daf961dc6a63cc930c765874eb1ccac13d419980d883e42ba33f3ea389b07ea006217432 SHA512 80ad3caddde045fe5e879167b2b4cfc27bdabf6d3667df4df73f33503c329b0d6bf4da6b287fe454301a9a390434eec19971059c6de8d4c9720a79fe7680366d
 DIST mongodb-1.9.1.tgz 1285984 BLAKE2B 7d3dd7635b97d142abdf0882d03f4b7a7b42b9720a8e790dae5d4cfcbee54a2f18d70641851baf9258e59ebe396336ae72956b9f6e09812f017850dbdcc3dd97 SHA512 e1ff9fba2268020862e917a38946a7f5f4cc5caf22b38e9ccf60b491cdee20f55b9643e8904cd934de48d31ca69b1c26dd86454f74572ce977669f908d4ffe51
+EBUILD pecl-mongodb-1.10.0.ebuild 1297 BLAKE2B 7e095eb949a97b092d8188161a02be42153472af4758000d2d52a51547dd583bc9089025cbbf9e0b60667a1c21308664dfc652bbc1e520481c40aa7c02820abf SHA512 e068f15797748d80af63b0fc3d19b8846115e62c40ab2a6b041a38a49d12c03ba7f447e0fdaf47428ee3cdf86126d23dee2d5524b4977acb1fceab8df49badc8
 EBUILD pecl-mongodb-1.7.4.ebuild 1300 BLAKE2B e478faf0b45dd8ea97b1c80ebc809a09846d107de7b2332417ec8430631942173a48e8bc431d57692684dfcac49b3dff35fd56a021ec25673029e1b9e2c23ff9 SHA512 f1c9ed8e3e82a8025160f72c9e4ae54f268c74d807a7a6177cbdb3cc3339154630b9f72b7e525f7ccfa5a47ddf6689e4bd94653dbc73045daf0fcd81a73f6ee5
 EBUILD pecl-mongodb-1.7.5.ebuild 1302 BLAKE2B 8277a7c2a6a1431975e6f2f3e66d9478ace497d6c3ca56de7fcf80a9943858fb64607e1fe284766e768169bd8ba856c90acf7e19a5869bd5589ec44c3e9518dc SHA512 59d8252eb420f6f5f4cb76d6d86f79ea5076917b94cdac005915dae3837ea012e8d59f4db5e7447b86e34a468b32f6d90b43f44e1a28430be43a76d36cd69b60
 EBUILD pecl-mongodb-1.8.0.ebuild 1302 BLAKE2B fff7c8f4275a08a25c6b639c0492c21acf50a9a234db36664eb5a3d87dd30fd202c642a178d45d4c00f780fa416a0f2e03ce2ae9aee39895cd422fa6425e7d56 SHA512 f0d65b48091d508852d4a8134faf8ed59146469230ce22fbce0f9e040cf0f33bff9b01b98009d39c9ce1b76260f080685df327949d70b74484a4d1e4fd4dc012
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
new file mode 100644
index 000000000000..b1e407d14f1a
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl test"
+
+PHP_DEPEND="
+	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
+	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )
+	php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] )"
+COMMON_DEPEND="${PHP_DEPEND}
+	>=dev-libs/libbson-1.18.0
+	>=dev-libs/mongo-c-driver-1.18.0[sasl?,ssl]
+	dev-libs/openssl:0=
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-db/mongodb )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="${PHP_DEPEND}
+	virtual/pkgconfig"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )
+	!test? ( test )"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-mongodb
+		--with-libbson
+		--with-libmongoc
+		--with-mongodb-sasl=$(usex sasl)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local PORT=27017
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	php-ext-pecl-r3_src_test
+	kill $(<"${T}/mongod.lock")
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4404478fd785..07024ce015a4 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 65beeb04aca1..5669139eadee 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -1,3 +1,3 @@
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
-EBUILD astor-0.8.1.ebuild 611 BLAKE2B bb4f0a6abb3c90578b3c67bc51bcb67c0e11f8bce9492d0c23b02505910b7d0c60091dfc5ed892ec710dc736805b4c8fcad7885a422442717f05eb88d8ce7b17 SHA512 1475a4b544b0a39bd4434ddf899c69d0cec19070608b091869536979d77e7ed83110e8829d3656b5410938876a8854800d569fe8f228d9823f68d0c61d751d49
+EBUILD astor-0.8.1.ebuild 618 BLAKE2B 2bef784af8d281e25ca9f9907c62ea321e37fc60d9e448bb063247154cecda4f2cb28728d92ca1d3bc639671611f48d42354da517893363ad0923abbdbdb6b50 SHA512 a18667ffcbe77e6b9059845b551021ebebfcac91e88c452962f31c780d9dd5ffd9195cf39ba713e63ffcb9e244d32d2a5b02ef40f686d71ec516a100b8956136
 MISC metadata.xml 308 BLAKE2B 4eb385f663046756ae848b87d82301e3d2ddf388eae73431024dbf4758c5d4787f879ad167eda72ae011ab41cebc48718fc40a5ed86f3d382dea6165baf1a3cc SHA512 86cbc23c8c077f9849004214ba32c5096e64ea8092ff1940f3fb4c9bf4fd420f2883aed76a7b96774f639cb98ef14429a9e55993db07173443ee16b3ac393aab
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
index acbd1e50eea3..85f5fe780995 100644
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ b/dev-python/astor/astor-0.8.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/astor/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 distutils_enable_tests pytest
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 206dcfb56794..7105916f908f 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -4,5 +4,5 @@ DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
 EBUILD black-21.6_beta0.ebuild 1536 BLAKE2B 980dc773be1b94a4d1daf50f9a9432b734e166dd0dae79b239ecb720999dd06a1313ada814bc986878e6f433c2965fedd47c437e9fcd64bdc8bd59fb3fbbce45 SHA512 f4f1d020609bf8171e770a2c7f6a41f7ba5047facef5010d229c1881f86ff1bb635341cdff63148b5da0c5b1aac103fb67450ca35d929a7413faba706084094e
-EBUILD black-21.7_beta0.ebuild 1348 BLAKE2B 4b42e640783f97530531950439c5c23757dd8a0129c01b53a1535a8564b4ff4e29ebf12012445067dc4a87cfca242644466ca96f67622c00ada098cd6d35a5dc SHA512 8ecd1609e65d6e6d3b46ea16d465f474905d4be7cdc27c867e59733d902c345630ce450ba130de08fdf2212b63aa7bce2cd42c0e88cc8897d9567ffc35c79281
+EBUILD black-21.7_beta0.ebuild 1355 BLAKE2B 59f4a7e0a2648d29e4fbec70b5667b74f3e9d07d790cdfbcef7c4c6a8e9d014fe82f313b3d0af95e94a581738ea6d14594805c5b07d34e8ce811be846be25a21 SHA512 20cfcca1dd98c1cf798ed96226197499e60027593a68395f4696b085d80f250c9e2caa378d467fc2e2fa7bf990b41f24707e58e9db2d6ce2e06e603604434c45
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index 6c1c2cf07008..fba4e4cd454e 100644
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index b4af89bb9f13..6d02ddff8d38 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -2,5 +2,5 @@ AUX blosc-1.10.0-unbundle.patch 1461 BLAKE2B 05c54929638e7a9a645fdf872c26969720f
 DIST blosc-1.10.2.tar.gz 858096 BLAKE2B ff314011e1afc2d972c2445df9ad25c245494479201ddd0944ddf5f14aa0aa772c9da1e117eb5395f5488e7238aefe1236d9a5579b4d03be2b041790de9575e8 SHA512 82dab50a49ddd45d8276fd43999233f41b507e35af5897ed4945565fde8f56be0855b0dd926d254bd77904ec7a13ad3f024007159510b677769d97599b731222
 DIST blosc-1.10.4.tar.gz 858123 BLAKE2B 01c9bd9486a27944caae1bc92b591c8b6f821bb5a6a0b44bc19f6c1778f2a2573a25783631c2140daa4d701569e584c93f8d5da76a92b73fb35ae5880ad2ea34 SHA512 bb41b83ff5198603e3721150976f95ffcbfe7b91bd5b11e1aa5e440dee1af7a9a6f5033e5aa4858117432e1522052ec074e9f14b5be52545e3752bc818637703
 EBUILD blosc-1.10.2.ebuild 951 BLAKE2B 90e35b8ce48278641f70d79342b1b5d4b042e0d4553cd740e5b49783a06bc86e30da5df23b8bb22e27ef393c9c1c3886c8bf8359d449a45424332588ff23f7d8 SHA512 f168c9a55ba41e2c7a846b7e316126345fa43d907ff7ba4530a6148f7ee555d709385a4c12e26863d834f5c31af6dedc6508b1137624dcf7f057a6502a75000d
-EBUILD blosc-1.10.4.ebuild 954 BLAKE2B 8b536cc9ea5f687d9fe6aa30e765818e15a67f8336f7a6b5715602803d736682200fc008992e0377df4986cb0072c0e691e5a87e6f42f1ceb5a43df0b74a7ae9 SHA512 22992be4409ee6c37e1b71d9a59eafd090496a1da45ece812f7d3f80cb03a89cae61d4f7d3038be088b7ad43082e77b7f10908896947ebd1c4f9d82a5829c115
+EBUILD blosc-1.10.4.ebuild 953 BLAKE2B 204a11d673b94b9ccebde8c269d03a05aafe0601b1a48bdce4841393fd2c8e5ec778355f04936723add2e6299fe2a6d9de33de11d70020ab7baa76aa509ddf5a SHA512 3684f3f68878d470b1564350c9b85a5e66c292933a9640b5dd23eb541e1a70beafca8dfceded637005e31f36600b683cc7af9500da75c57d264d2852da810684
 MISC metadata.xml 998 BLAKE2B 3630fcaea0c8e2e9062aa9f42c60b17b407fd5febb70d5d41b0a0c46f202f06afc79fc25072c1403c917caedfd6205e7133431fcfd40e74f8480852aee7e2299 SHA512 22ffa2acb28f4f6f9af18398681db0ddb5b19c7b125386c0eb24265f11ccba24f90977710f74af57a2de6e497c668fb17398da89a2b2ecc5ef552b201960450e
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild b/dev-python/blosc/blosc-1.10.4.ebuild
index f2deced4776c..a6df49b09596 100644
--- a/dev-python/blosc/blosc-1.10.4.ebuild
+++ b/dev-python/blosc/blosc-1.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 79b3fb1fbdae..f0cde8b0697f 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,3 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
-EBUILD charset_normalizer-2.0.3.ebuild 607 BLAKE2B 4c9807834a2137fc10d5aff25a7e611b7e3611072d0d4af55eb51578acfa2a3bca7241d768809c4a02596402780f2c321436f37aa01509679a88e1e3c2128809 SHA512 a4a05ddb41008aa5f8835362a2e4568d5e4c747c3d40f453d18574ae5ebe467bdc8c0548e5df524b61e56e6586ede56445d3f50a75e945b3bd62cd9bae51a233
+EBUILD charset_normalizer-2.0.3.ebuild 614 BLAKE2B 694cff47328641825580cd7dfa6ac8934f6e72d6eef3d8994aad9e7f4f735f7342f105226a4b98a69c48b26bd9dc01a7fe0738c8c149b08b74247b6357eab539 SHA512 624856021a4a80fa18e50944d1487cc25793fff104019243dc986bed71eb1c16b25eb7cfbb0f3de1d4a1754cd2ddb79eb6454bcad40bfea5fa4d7b009ac5b1ec
 MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
index 8083f63539bf..63c87dc14827 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 92426f3c3ee9..4719e7d16879 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,7 +1,3 @@
-DIST ConfigArgParse-1.4.1.gh.tar.gz 30343 BLAKE2B 8aaed3b0e85b4006c04e7910c6f7ae2c2a07d586ade777eedf078afeea4561a4504614484316afd9d234b2871c0cc45ef47f30254797f9df260373309cf67927 SHA512 304d5981c5685188edb22a63966d25a8943e4c443f2aefc323492f141885f50657e9f9200514df65683f1e13e64173d4def80cdbebcff941c3ee66ff4af0cbd4
 DIST ConfigArgParse-1.5.1.gh.tar.gz 32245 BLAKE2B 9df80b4f0b12b3777311193c454dd010ce60dd9ceb702c99c1d8ac56575c615e77039910f3b412a176c9c229b88fa8937b052076d0cde2307ecc07f3337d064a SHA512 2c3854a45d97f0352321d2442a30408248e990dd46e2515cd7e2576efe9a33e03495231f8397ba6e3d79bb04bf11edfe5930b4765d46f29ca66b7bb3d3c1e0c9
-DIST ConfigArgParse-1.5.gh.tar.gz 30375 BLAKE2B 8a3c0091dc4049e9f84eb6209f7a62cafab0c0357d4d17304520b2855d60cdb68e63607068612bc99b07709f1fde4b0a3f11dbf4e45087968eab901d2b20b79f SHA512 82121fa6e8f734898674220b888dd3670368389a5cbd40e87d9188fa55d4378fdf480cc7dc003a4b9eadc1951fa8fc6141e9c0b079321cfe70c64bebacfb8944
-EBUILD configargparse-1.4.1.ebuild 768 BLAKE2B 525ee2e3d597799d085da0c1a24c708fa8c08d79be86abdf337e77c0c128a7f5257ff9d1a1519cccbbfc1ca779e84aeb008759f8df32f49d287505b0c376c3a4 SHA512 b2f2b3d77e1f9694c8864f25b377ca49ac78f660303c48ba6c881c06337b7840aefdc4319343bd136236db70dd661d63fd12d89276e9a6bf6496fa2d16dc9e79
-EBUILD configargparse-1.5.1.ebuild 733 BLAKE2B 3427c0732415d2962af1f9d3dadb4876fdb9aba69bd363046f005ef9044d8baebeed87dce98749b852c54800be1764fb092e3cbff785681d4d8987a33739f49c SHA512 60c54a99e57ba1899e76af0cd3e79c81584fbd19286a498ea7f6e3cc4eb41c1aef06b6c57e689d98a6b997973f4074aab13f19f2897ea32f84b8a8a5d4c4c41e
-EBUILD configargparse-1.5.ebuild 733 BLAKE2B 6015c5c5e7b37c906c38ba1011469cbd829846e60c4867ec9aa600c8f1f9681df5067a6ba4ce68c11a9d467895dadd1a67054834336ddfed5ea2bba9d22f46ed SHA512 7d543ad181c7f05e278b03321742cf43f3f82ff2e96f9be359319b3819cba9210625725b772a0c9f5bff37d9b10dee2d41e5e9de9c1e11180d1666ec1483eadd
+EBUILD configargparse-1.5.1.ebuild 731 BLAKE2B b1a4eb6f58659fc4db3b4366367457919f6dee8ab456144b2eb24f092586e896e079e129d22590b1944184dbce54a41f138bc27e9aab41f27ee13876a581f144 SHA512 b3bdabb6bbc014e9adb76c6b727d02a470bb642cedd3f52d44343f218e200499228238375e5f8daadc76ff57779e0d4abdaa15d3feb05d94a179262bc955ddbd
 MISC metadata.xml 412 BLAKE2B a4c428193f261d78065fe0a62c06de40fbe96b7dd20c113959ab1c5ce4d715faeeee9ab02fbc858ff070f641b2f16535721374db90a1b50ebe33867d95e0fcef SHA512 85a1b3daeb42979ada3210f978be84f5ca5f4b744d77e9e7140fe9b9595f55f16f4d15f9d40dd50ae5901f3d186aea6e42a4c70ae58b5032aaf22760889c4e44
diff --git a/dev-python/configargparse/configargparse-1.4.1.ebuild b/dev-python/configargparse/configargparse-1.4.1.ebuild
deleted file mode 100644
index 2a7cb0502e7d..000000000000
--- a/dev-python/configargparse/configargparse-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="ConfigArgParse"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="
-	https://github.com/bw2/ConfigArgParse/
-	https://pypi.org/project/ConfigArgParse/"
-SRC_URI="
-	https://github.com/bw2/ConfigArgParse/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-
-src_test() {
-	local -x COLUMNS=80
-	distutils-r1_src_test
-}
diff --git a/dev-python/configargparse/configargparse-1.5.1.ebuild b/dev-python/configargparse/configargparse-1.5.1.ebuild
index 4dd20030e229..37184c108b99 100644
--- a/dev-python/configargparse/configargparse-1.5.1.ebuild
+++ b/dev-python/configargparse/configargparse-1.5.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
diff --git a/dev-python/configargparse/configargparse-1.5.ebuild b/dev-python/configargparse/configargparse-1.5.ebuild
deleted file mode 100644
index 43ba113e8698..000000000000
--- a/dev-python/configargparse/configargparse-1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="ConfigArgParse"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="
-	https://github.com/bw2/ConfigArgParse/
-	https://pypi.org/project/ConfigArgParse/"
-SRC_URI="
-	https://github.com/bw2/ConfigArgParse/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-BDEPEND="
-	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-
-src_test() {
-	local -x COLUMNS=80
-	distutils-r1_src_test
-}
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 9fe51cf9f01e..419f607579af 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,5 +1,5 @@
 DIST python-dbusmock-0.23.0.tar.gz 79928 BLAKE2B a004bbc93cd4dd3ab5919e28bde18e7b015546e43b789826010ccfd2000075babf933bc53b72bc4369458ac6c37845b534b0e36e594afc4bfd298d9ac37495c7 SHA512 b464c376b1489bc2a9967d08fd1e4e8943e372f46eef46d1cebf316f4afd1f2bf55d02abc3b82b7052c685fe1ff9ba22734a58aa75945706a26ae9d71e5d807e
 DIST python-dbusmock-0.23.1.tar.gz 79964 BLAKE2B 60140997f7a9c196d4c38100a975550d6a4745344fde9084ca5a56881035c09cfd56387897a7e409e35aecbc759f01b8f4953b8a5cdda4bfbe70d80cd01b8332 SHA512 933205c770f82aef623e571d9d806b6d639467c977ca326718ff475f41e309ef25e9a8f1cd8439e181edbafeb6513af7b73dfb938b3abfc7d5f63b6b5ffa9fc9
 EBUILD dbusmock-0.23.0.ebuild 884 BLAKE2B bd4705a564681c26f4a7df8e7c7a1ea5c81d2ba34cd9076668b6ef0bcaceb1d8f1d275845a1ef41edd2f87c59b7aa3a4eafabcdba628690c969aaf592d1216c6 SHA512 dd458558957c6a95d08462e85bc54b14ccb865bcb872f282208dd8b8233bdd43ffaceea4d6fc92ca614e12a8d9601b36d831b1685e0af1a2ca237eb047969ead
-EBUILD dbusmock-0.23.1.ebuild 887 BLAKE2B 2795b38eecde4d1732f944ec1469b9badd75c27d64133b3133558b53df04c58d6f9475c2699645968ac99f874cdb7d1a444356d35e3c68d3676ae6a1a35a928d SHA512 de2a2ac35027acf769641d6714ceefbfdfe5014df6e371949758fe59d72b3ce4322542c45e4577ec2d762d4d811656bcc5fd535375ea8d55e16a58aba7f9ce3e
+EBUILD dbusmock-0.23.1.ebuild 885 BLAKE2B a0c5098a9bccda4c78106f33681f86bc06671207e919a0f2ae1ae551ff5a01dde2121f5589f545089583122a38a0418288e60de75ec97f01ada9863a004ac04a SHA512 ec398412aafc00980d35e27c84d0b34071eaa69bc2b2eaa3a7e918bdfe65d94cbd06d6b89a7a503aefc0fe6e41db839d82d4312729e6f998cef57a6e0e2a0db4
 MISC metadata.xml 456 BLAKE2B 1255b5eaa7068525c5661663a3d42b052100e7c0c9ad58f4b85ba6113d2b0ebd4a48691ca52bbaf10635d34e5fe8949b6e44f98babe514ca78663462fa88a85c SHA512 ce665cd1934e2307281538e1f306297974cdf50c7c5576ebd2f290066a39b1a18bd1dfbe34bef29d5f332847699699b811754bac9d52364a96c66b030d953362
diff --git a/dev-python/dbusmock/dbusmock-0.23.1.ebuild b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
index 0898f90fdcee..8c09033ec7be 100644
--- a/dev-python/dbusmock/dbusmock-0.23.1.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 3fc362d4cb6d..2802153b0638 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,5 +1,3 @@
-DIST dill-0.3.3.gh.tar.gz 149103 BLAKE2B b08830ad1eb47ceb29c6be6ae88ab38338d9a8a325188bc3890b71c7f393792988da4962819f9b82bf7ad9ebd668c96989ef8c55072a2c82483660c4ec01d072 SHA512 bb514c37902412380d99f38293d5cb9d3d6a6643a34e59e6e889c89d845f9b83e9fa3fa9f0a75218575aa56670f287144f2b00abc8359b5fc6cb450351b43b68
 DIST dill-0.3.4.gh.tar.gz 152875 BLAKE2B 61c638f0459b94f5cc0dabd9d5fd224c3c010ab6ccc9b7e47943922e7e139bd74c7a5173657febb028fc79632792f807586e271316ad87bb505520163f85a300 SHA512 1b1991909a9782382ecdb2ada13249c8b446d3558de69501280c816f7cd6c6728f9d3303c826461245ab9e42c43c02e4605142f25e09244bb7ccc9ca68a4b565
-EBUILD dill-0.3.3.ebuild 631 BLAKE2B 0429407db79c2037790dff2df36b7dccc234b63f4d78cd0e00a4a75aa869e4bdb4747ef56d76ae6c5acd3ca8ac79b7098de564311e0433e470f363f64a080850 SHA512 f43d66c091971868a2cd6d58aee11d3e6179e79a5a261ee2c04b9f7da1d6f3a50581cfb81dceb8158910b7ebb4ef39ddc046cf6653733e03841b3dedb4501b44
-EBUILD dill-0.3.4.ebuild 634 BLAKE2B f2f920f7cc9b5b9a23a1a9d2dc8d592b7e80f1067cca8400e88b55d035f016382d4f85a53e89825911b47a38aa0eaa6ce6e437bb51662a12072064e9b7002ca1 SHA512 60d94d3984b8a130b6cf28bdb8158bd0a45ee3f7ffe4295e4565fe4413f0d0236c644124320a8cf1602af197a6210266bd8a85211908a980ebaee0e8ab002936
+EBUILD dill-0.3.4.ebuild 631 BLAKE2B deb8ca8ed00a31b3e0148a1e285948d3bda1eb8288edbf44674c9ba3c7c0394fe6173d229351c2ba2377f9dede1a4ea9194c9163a27fbc649e26447088da0064 SHA512 29894a9f32ad179a8ea45503cdc29ce0644d902d410446f136b2b0cbdac6f76bc429e77bcda37e56995882637017a826909ef988d5114ec0c66fc44b0c1e7eff
 MISC metadata.xml 996 BLAKE2B b76f67cff65e28c22663f6291652a39fc232369ba747542d0840236971d9857989b179c80a09cd736e2cb504e1db12934a083cb7e38922430dd25844b7fa40a3 SHA512 0dada43b585791564a0351ad160f0d5c11e8821c6fc494d5ea833e48d59b84a10a2c9a99501536d00b5fc03fc55cc51839852363790e1ffe0eed9971021dba40
diff --git a/dev-python/dill/dill-0.3.3.ebuild b/dev-python/dill/dill-0.3.3.ebuild
deleted file mode 100644
index e8db905be3da..000000000000
--- a/dev-python/dill/dill-0.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Serialize all of python (almost)"
-HOMEPAGE="https://pypi.org/project/dill/"
-SRC_URI="
-	https://github.com/uqfoundation/dill/archive/${P}.tar.gz
-		-> ${P}.gh.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	local fail= t
-	for t in tests/test_*.py; do
-		ebegin "\t${t}"
-		"${EPYTHON}" "${t}"
-		eend || fail=1
-	done
-
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/dill/dill-0.3.4.ebuild b/dev-python/dill/dill-0.3.4.ebuild
index ad2d9fcfa59e..edfacf4878f7 100644
--- a/dev-python/dill/dill-0.3.4.ebuild
+++ b/dev-python/dill/dill-0.3.4.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	local fail= t
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 2f6a86b20003..2fb6c9443336 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,4 +1,3 @@
 DIST diskcache-5.2.1.gh.tar.gz 652769 BLAKE2B 25fcdcf51c8be7a6e2a9de645258f776647789a7f06c70c8564ad28bd003a745167095b11a54d435e733d9f5181a1443be2510fe2d901cc208ea426d3359c0ba SHA512 6e55bada12145d931f4a465092decc3f2cfed2e618d1ea271ad6daa6caf7c3abfd6ae5de11072efdf898ebf272acd39136136b58d7b5e735092963bdd46af52e
-EBUILD diskcache-5.2.1-r1.ebuild 1037 BLAKE2B 90cd8f9c22648b36cd20c63ef0467215149fef1871c37a500c70107320e7f45a667752f1178e12a19fe67e05854439f9fd5204711516a74d0840decb73f55585 SHA512 bd529db091044e8b0d7f70560418b2d81d660d4c56dba75585e9907494da24dbdbc98841c7a976349170c6fa5d25bf537b4c8c82e3f53eda4a60bbf63876a41f
-EBUILD diskcache-5.2.1.ebuild 845 BLAKE2B 9b435c3adf032acdc81a283d00102cb3f0b9dbe22f76438f02eb98b0234cbe0418af1526192f84409d6c4bb7a1b6baec07dcc0ac888002c808dbcc3913462fd8 SHA512 3525d0cefdfa839fd45bf337501a2a17c799eaada4edf79e9ce7a3d890282ba98036b5dbb3741e4a53d7afdb9f0d3e21ea17fb984bd1d084f9569180769c7b02
+EBUILD diskcache-5.2.1-r1.ebuild 1034 BLAKE2B 374b3d494128eb614485c829deaae37b23988c3cf0ff95bcb14893f1d5986deb3448f8d50db2ea0c36ff77307e78e6bd4f8f7d8e486f6be9c5f818a88cecb43e SHA512 23e086e7ab304b153b7b1c3150766818140812f4ac22104018a14ec610ca63446c5f59f00d5d85ec8f809f9abed365dd6c8989510f8fad87567d8a648d046db5
 MISC metadata.xml 416 BLAKE2B abce0086d9e449bb58281c7856b518501d837b88473dcd611d3f7026a221bb320d866ba631f704a2cc9a5d24af88fdb171e5a0dc28a79f88852ce6931d4a37e7 SHA512 14c60bba29274523a81a24008d51d74ed2ff3c5ae84ed11110fd1e3b83c39c35eb0a95d56edf53db5bbccd08c6bea62cc3019405a077dc00a0869f01e6968c9e
diff --git a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
index 0bba6032946b..c83b15546c6f 100644
--- a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
+++ b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/diskcache/diskcache-5.2.1.ebuild b/dev-python/diskcache/diskcache-5.2.1.ebuild
deleted file mode 100644
index d5be692d8b69..000000000000
--- a/dev-python/diskcache/diskcache-5.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="http://www.grantjenks.com/docs/diskcache/
-	https://github.com/grantjenks/python-diskcache/"
-DESCRIPTION="Disk and file backed cache"
-SRC_URI="
-	https://github.com/grantjenks/python-diskcache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-S=${WORKDIR}/python-diskcache-${PV}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		<dev-python/django-3.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove dep on pytest-xdist and pytest-cov
-	sed -i -e '/-n auto/d' -e '/--cov/d' tox.ini || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 5fbe70ad9a79..a984ab68b3cd 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,5 +1,4 @@
 AUX docopt-0.6.2-pytest_node_from_parent.patch 958 BLAKE2B 0fc4437f92f9410a47823a28b1b26057bfbc1687923ee56b0c69b4d921128b7b868fd793098b8399349906a4353aed9e2801ced0d458cf121af31b209df118e3 SHA512 74a384b1e62128df781c5c24bfa6a0f01de63610fadb51349f8f094375b84ab090209d86cde1a65116c735bb90eca61cabcef60e608297bb6976da2f5b510529
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-EBUILD docopt-0.6.2-r3.ebuild 738 BLAKE2B ad1a7cde723e3fced02c848ceeef7477df6cb77a0bd7d6f8a0fe19eb50e2958cde618af92cca1b3c1e8aaa7d6140d88bd46a689f37341d0e373fcec95948f4d6 SHA512 3585b03373dfe0c5d2450223f95127f3a38566c05401e119e2d746a41f1d820ac582d2b217d7b144f27ee333274b5eecdcefcce710366e4e9aba8b75a28bfd99
-EBUILD docopt-0.6.2-r4.ebuild 623 BLAKE2B 5f8aa521a9add2f00166361f2925d36414a98c925e8bf9a039eafe0e408d3f2743da9be5c4422d3638329ddcfccbb52e5c152bcf0ab3d36f5da5a5c2527b0efe SHA512 18b856082f33d157c24e5d6e3f47f6bfbd31e62622401637b65995ce6fcc61a0e46ddf0e7ac4ce104477aec7f3b3d299fbdea3970a7713b5fbdb4500462c4978
+EBUILD docopt-0.6.2-r4.ebuild 620 BLAKE2B 3f8f07a1a6ba5885a904109b48c6a35e7ae74034260ee9f7ce179f7c558ed5237ef5bf1399d507acf41d6558202034a728c75a98e40a8ba27bf2994e96542706 SHA512 9b5da48ccb62f8b1d858db8ae286e318144388a4fae37a0656a2af5abff7adee677d6dd148ad954dda46009a0abc563082bd3e6daff6f531fd55e21be9db9f36
 MISC metadata.xml 386 BLAKE2B b15d37e38ee2fc70b970f7a5d600f0bb8055425c2f519c26ca2c8165a0d414dfb07723834a69b5507ce10ec1e64b89c0c847ff46e741c033d6223b2e9c847dd5 SHA512 009c00ffc25701ee2d3923089f561a688d424984a058d3140cc9d633e409748b8c6cde3f1d073e7e397a36ded1da145fdca5321a7b53f64d388b991ec0e872cd
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
deleted file mode 100644
index 7f9a3a512938..000000000000
--- a/dev-python/docopt/docopt-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic argument parser, that will make you smile"
-HOMEPAGE="https://pypi.org/project/docopt/ https://github.com/docopt/docopt"
-SRC_URI="https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/docopt/docopt-0.6.2-r4.ebuild b/dev-python/docopt/docopt-0.6.2-r4.ebuild
index eda052636089..5a9806a1b324 100644
--- a/dev-python/docopt/docopt-0.6.2-r4.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index af37c39417aa..95b7e350dad6 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,3 @@
-DIST elementpath-2.2.2.gh.tar.gz 232791 BLAKE2B c28dcae59d29fe70422b6075a4a9627037726574c41e43947c00ba47054924c179e646a5dc01f2247b72f8c58d4fcfcaf411dfa1970cd6ae1cd2fb9f1f3753be SHA512 3aebfa15ec036674d716e6fc91745a14b897f757ade1df945270d39153ecfa9486d0465e9126a6c71470b191690158a853c3871d493e83ac08e065ce2aed3af3
 DIST elementpath-2.2.3.gh.tar.gz 234094 BLAKE2B e3e56469250f3fd2135d9173d68cd93af2a6e03830859d03872967d72a6b7a39f4bb9288c341cc47c406ad55d764ad65a16169eb78598eeded48c424245064e8 SHA512 75178c12f42582a391aeb8198a45c732601251655e381cf8961dac2f6467217e5a18effcadcaa7e7206b18f358a70e1e4b170b9e02ba9b25108b1721da50ee4e
-EBUILD elementpath-2.2.2.ebuild 688 BLAKE2B 624fe5885358c07826ebd54d256e36ca831183ae1476e1703d8bceecc8d5b4935d28a695f771396221f5a627f781073be2f163d4de6d91014b89e79267aef165 SHA512 6eebee6147e3728f2fbad198a606fdfcbfe946ee22edd641488c46c4d0cc5681d200a5c4824f99f132a90327c2c85a627c60d2cc2418d55e7d52221c1bb335fe
-EBUILD elementpath-2.2.3.ebuild 696 BLAKE2B ef777b2a7cb59064aa9594a833a112c7bff9455702855e0cd7b76879a302b1845dca9bece8aa25f4cec37095f123043152e77daebfb7986317aa1172f556858b SHA512 428bc4a2e733d14c0fb7f3b22e7f30210e20007b1891b48fbbce59170d87920d685a5d85c8eef37afe34fcfce2f87dd7b98e470d1246ed8e3e31730f3528aaa2
+EBUILD elementpath-2.2.3.ebuild 688 BLAKE2B 28b4d705730fc634fcf9aff912a16bbe19c71b4d17873815065a8f67f79ee87b8ea8a977dd3505f4915813caf0b2f3ec9f0d0cc08d9b6762fbbbc997f180b16b SHA512 a3a9bc5cb6efbaee893f2473648668e566d493410c8a2e2d1cd26d93d5eaaf2c62598b857fe66215a44fa68898268d18a3c2006e564709ef5d6381630570f487
 MISC metadata.xml 379 BLAKE2B 83728e52dcbc4f5794b1d73c968e2f28858cc1e1384dc9c48b5d462f8c50124681691aee7d290b926654cb8453b7b372f81eefc5de785dc43a3165ab8933a22b SHA512 36bf1752608d8d5cb3de0be695774b09c0ac66934928476e8c972e7ec0d163d3e61bafbfdc9f587215a2d8996ca2ddd14ffd26c16791c85c70f5eca7e1e511ea
diff --git a/dev-python/elementpath/elementpath-2.2.2.ebuild b/dev-python/elementpath/elementpath-2.2.2.ebuild
deleted file mode 100644
index a0818c4b77f5..000000000000
--- a/dev-python/elementpath/elementpath-2.2.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath/
-	https://pypi.org/project/elementpath/"
-SRC_URI="
-	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-2.2.3.ebuild b/dev-python/elementpath/elementpath-2.2.3.ebuild
index d8a77de4b139..8cd6b6f9cc92 100644
--- a/dev-python/elementpath/elementpath-2.2.3.ebuild
+++ b/dev-python/elementpath/elementpath-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 0e3fec16fab2..608362aed171 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,5 +1,3 @@
-DIST execnet-1.8.1.tar.gz 173811 BLAKE2B 1d6277177908ccffe95973d34962856f6ef0a6d16c1e046f47a7ab0667b5e5c2867405a7a8bf36fb7be8e2fa0fd75b68375abdd9b70a1a1aaa641bdefadcd32d SHA512 183c89961b8b5db4eca5b64ff6b179f9faa19d26f04ad07740c818a471aedb02b2e7837fb7cedb6b1e4a538b0bd62cc4eff602dffe4c3c35bf826aa5a627afb2
 DIST execnet-1.9.0.tar.gz 173884 BLAKE2B 622a1f47365bdea97ba53aee908faf990ef847e3641ab0590073cdd6eac3413d1517f16e8e5b73b56884f02aebb3142691ecf6113e14f9c49c9b0fef3ee3247c SHA512 d425e7b6f3708efecb5dfa2c36a837cb55f2c32cf2ec0c1dc11cd1ca6ea614d119d04908b84dd5a3593c87db35e71fee202f843665c853ac3538479f60c83d60
-EBUILD execnet-1.8.1.ebuild 1381 BLAKE2B 82bcf0a4966d9eaf5407940b7c614ff0ab21cefef474e7628d88c263de8f67e3a35c239b3d605c029a311909ac57faf8f158cbeeb578cd50f5acd3a39ec3baf8 SHA512 d29b6cfc9d9274ea99bbc3febeb7f7763612b4e870bbdae96ba54607736b8731d6ed98bd7751c5a4977e74295ff18568d811bfbb7e728ee9d0e32e50d1b41573
-EBUILD execnet-1.9.0.ebuild 1294 BLAKE2B ac541505f8a27dcedca15feee521fb85179826008e658a00ad09473881fe6a0e4b01d1d6523a2898d9dc47210426a33aaa03080d46447671ea111153390bacf3 SHA512 f2d43a54bbc535fa74e575a93e4d3e9e00bf6cbe15232c9ae774b9e8899856be622fd17c7b6a6c07226a3d4068849b92662c79a1df0cf226e93de0f7da9cc9dc
+EBUILD execnet-1.9.0.ebuild 1286 BLAKE2B 7d04689243fc54345102db2c66fe559adac511b8f90c0e36276ab4740f2bd6e6b6baa13278e03078de2dd6f04906e0d7ea1c59da6ed512b08336cf106784113c SHA512 13988d347781128a3ae8320fb522fb7776fa4b2439d4b9721c58693e9b9d4a699df7620b2a56931c75a34039123beb417b543d591c44f8d77551cd18133ea36f
 MISC metadata.xml 441 BLAKE2B be64fae1f1acc10cff3492e6c2cd802f9f3bee83d646868d3dbe2336b35c791f8ec0be4aad6e89aaad167f03163740cdde543c5af6dc71c0780754f97a76f4af SHA512 9f17e1724f03b55e0313dd4b7528ef1f190258bd39efe35e144ad1807f4037a08e4302f749153f511c1bd0ab01a885e3700eb3ead4764d44161c0f7080a55673
diff --git a/dev-python/execnet/execnet-1.8.1.ebuild b/dev-python/execnet/execnet-1.8.1.ebuild
deleted file mode 100644
index bae6991e7b0f..000000000000
--- a/dev-python/execnet/execnet-1.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="https://codespeak.net/execnet/
-	https://pypi.org/project/execnet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -r 's:(,[[:space:]]*|)"eventlet":: ; s:(,[[:space:]]*|)"gevent"(,|)::' \
-		testing/conftest.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# needs python2.7 with apipkg?
-		'testing/test_termination.py::test_close_initiating_remote_no_error[python2.7]'
-		# tries to run python2
-		testing/test_channel.py::TestStringCoerce::test_3to2
-		testing/test_gateway.py::TestStringCoerce::test_3to2
-		# does not like Gentoo defaults
-		testing/test_gateway.py::TestPopenGateway::test_dont_write_bytecode
-		# almost all tests call py2, not worth filtering for the rest
-		testing/test_serializer.py
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/execnet/execnet-1.9.0.ebuild b/dev-python/execnet/execnet-1.9.0.ebuild
index cd56d3f62b74..6296f67afd08 100644
--- a/dev-python/execnet/execnet-1.9.0.ebuild
+++ b/dev-python/execnet/execnet-1.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index 4da5a736f7a6..4577e5c63b20 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,5 +1,3 @@
 DIST Flask-Compress-1.10.1.tar.gz 12272 BLAKE2B 857319ea7fabece977429a810706314bc6a7984f2fb4c2ac3ed604fee0494fa60d45ab00a253bf4a3e9394d399f20f23d806744676597b2064bfbbd6f7b11c46 SHA512 fb94aef71f59e38a6058f5ef799c8973d258cf624b1d8bf0a991cac2e4eabb73e2836ce351faa73bc7640720396183212a6dc8d72428b53ceb3473f7b61f0d27
-DIST Flask-Compress-1.9.0.tar.gz 10322 BLAKE2B 4dddfd8a5c4c182a0cb3c5f346ccca611517ab6471dd23512c885e3e370ac09f9a099994afd2ee28eae47cca6cba2d49220d8733103e6cdcfbae03b98a2480f1 SHA512 5f13f20a3a2f8e646a4324cf75a419ea5111252db701a17dd37bbafdb9228d0e279a6c957c5cfd69468bbdffb435e37a50e0dcf5d1a160f7397df1e6a9e6ac9e
-EBUILD flask-compress-1.10.1.ebuild 582 BLAKE2B ab9a5c0e8984fe3d1094ac168a42c7a212cca1985256ecacb3ff5fd8da1ef0d3727fe8c4f4b98dc8c8816729a57054667f8a48888d87afb04d879174a8ec7665 SHA512 f3f8933be75a3546f575964fa9dc5e7a4a83177df7fa5caf99a3334722757dcfcf9a7873ffb382eb101ef0390dd60288b4519479ad70a718bb2377d5fb893982
-EBUILD flask-compress-1.9.0.ebuild 579 BLAKE2B a032f06bf8635092eb5dc958ec57596e5ea4cdf819597d7300b259444f1ed56a3b23654f4cb9311abcf7876fbbfa4ec794021df825c955ecdf0b34b3d53e3794 SHA512 040e25f773b8168308cd3a8ef316a9c4aa63e1a225d89bd42662f097e31b638cfc0fd14560bec9a1b272e5df9ea2fd23374710cade29d5bcdc28fc841d83f34f
+EBUILD flask-compress-1.10.1.ebuild 580 BLAKE2B 148340c09b0a6396496f6676c1d033db81ef1d68844028db7ed9282c5240a94498a21964671be8c9496311338dcadccbc855ca0a339dfedabc7bec13aa538ed4 SHA512 cd3c761d9d86ce4bde6666b4d745f747f78c1f59b4f5e28898fb3e24573ac8d9278f505e35c002ece9890252d4a43255992e8b1d0697a5cee4686d8a1049f6ef
 MISC metadata.xml 455 BLAKE2B 32bea36b88ad19fed08198fe3ac37b3853dd3a50b1d24c67f56e06a222537e48ca275a701a11bd5d2027ef3533d1603f44daa9aa7d2c5b41081bf78e1c1ad842 SHA512 c3f44e2c49cda143874476662b0fb3458d2bd1f2651d2664e10e45cf373886765e0d6ffd1125bc9e8de9c0c0ce9ee1d9b23279ff4afc1ce40e60e5bb748850f9
diff --git a/dev-python/flask-compress/flask-compress-1.10.1.ebuild b/dev-python/flask-compress/flask-compress-1.10.1.ebuild
index a3ed51356ad1..37c8c255374a 100644
--- a/dev-python/flask-compress/flask-compress-1.10.1.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.10.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/flask-compress/flask-compress-1.9.0.ebuild b/dev-python/flask-compress/flask-compress-1.9.0.ebuild
deleted file mode 100644
index ea7d69efc9ad..000000000000
--- a/dev-python/flask-compress/flask-compress-1.9.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="Flask-Compress"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Compress responses in your Flask app with gzip"
-HOMEPAGE="https://pypi.org/project/Flask-Compress/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 45d9410fc7ea..d2852822971f 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,5 +1,3 @@
-DIST flatbuffers-1.12.tar.gz 11286 BLAKE2B 9286d9d53bfca515ff01d329decc61201b8bc6231db8700d920530b21b8a213769f4c092ea4af901168ff31f57641f46853cd9d52a6a90398ec8b6ec67b7fb0b SHA512 d7059508908c6bc7f421d04c0f8dbc9884015009b3601822489119853d851f2bf3aab941a96d19b354edf3c9c377625d0faf7b92f7a63a6d597e6ceac4abcf2d
 DIST flatbuffers-2.0.tar.gz 22462 BLAKE2B a07f1d27afd71aaa23ba26a061267f95bbb7e0ced8b2c110b3d60fdb9d922fd4b339d7abc63068a030e08e6d824871c61110a665edd6781ac54dd5ef8613975a SHA512 76636449c107f1b2d1a1f395dfbb04c89c25946d8a731a257475ff2517f9667095f3527280b87fdd4081fd5a9f7aa0a112d5daae742c1575d29abb69da595b6d
-EBUILD flatbuffers-1.12.ebuild 431 BLAKE2B 2893735c224064e02efdee6d3cdd99c5931f74993536f8b4a74435b42b4eb7697cf01e1944da0c5d60adc4a3d29d1f2d91d4fa5b5241b1cb69785449a405a38e SHA512 e87aa9561418333c6890069d54a368505687b4d0ce2af160c05e8db37bf1f2d9d934254dfc8d56e7e60de18647ee90b3772a9ef44a27bcc9003d9485275e1e3a
-EBUILD flatbuffers-2.0.ebuild 435 BLAKE2B 6941b617ecd5b992d42d1b53dafece4688ba41ffe8991938ba0da89243037f1017d577b28f19c7ad2845954b26c0b2944a3d0b880a3ab8fb5ea6500ccbaaa8f0 SHA512 ee94e0f76c950f054cfe63537a169775248c58d1571939caffd2a549c740c845d386b86fcff3bdab93580fe6026b9dbbd1b0f990aaabb52a030b73d5a64c6119
+EBUILD flatbuffers-2.0.ebuild 431 BLAKE2B 2893735c224064e02efdee6d3cdd99c5931f74993536f8b4a74435b42b4eb7697cf01e1944da0c5d60adc4a3d29d1f2d91d4fa5b5241b1cb69785449a405a38e SHA512 e87aa9561418333c6890069d54a368505687b4d0ce2af160c05e8db37bf1f2d9d934254dfc8d56e7e60de18647ee90b3772a9ef44a27bcc9003d9485275e1e3a
 MISC metadata.xml 401 BLAKE2B 6d14520ed4641a09f40c606854e9a206c3bb02a624b2894f921e4a656a8215cea807e1ec07e88fad96e968c71aa7db198e74ebfb40ea66d5ede0217043fc40f5 SHA512 39b3a99bd0c31a7fbab6264ef16a4a1c53351bd629ed1977342e16705221284a89469b3f6384fea0cbaff77569f56f31db56f1b36e96496d4c0d0843d54ac033
diff --git a/dev-python/flatbuffers/flatbuffers-1.12.ebuild b/dev-python/flatbuffers/flatbuffers-1.12.ebuild
deleted file mode 100644
index 806a74e479a1..000000000000
--- a/dev-python/flatbuffers/flatbuffers-1.12.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/google/flatbuffers https://pypi.org/project/flatbuffers/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.ebuild
index b3cd727af5c3..806a74e479a1 100644
--- a/dev-python/flatbuffers/flatbuffers-2.0.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-2.0.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
diff --git a/dev-python/fritzconnection/Manifest b/dev-python/fritzconnection/Manifest
index d2748ed8a3ef..01972c95814d 100644
--- a/dev-python/fritzconnection/Manifest
+++ b/dev-python/fritzconnection/Manifest
@@ -1,3 +1,5 @@
 DIST fritzconnection-1.5.0.tar.gz 71597 BLAKE2B 2c0d27cf91550a7b7f0d3c56f115dd174995af4293d6dd91ee6bbfaab2f3db7c8e4a2297d83a5d6a5219550ee9397c0b1122260234b6fab4589e15c34a381f21 SHA512 2fcf84c73af146d0422a9e32364562e4cc9d6992f487f40f27eede4a571c4dfa37c92a6bcd5ea49da144585657e382e648e0fd00a15f78646da5abb5060eea3c
+DIST fritzconnection-1.6.0.tar.gz 73672 BLAKE2B 25f6b876026bc70397dca171c90d863b4dd3af81f4f3f26bd9a34bed9241c716e98e1305adcbd87a1aa52a21fd6517eda21db0cd9d02d8df5db143ec0f60f5f4 SHA512 c4517774be0913f71e37e982dd87a7076efd81903036193ff37dc2ffd5530829f5f860b773c2b107ca6734ff1b04009243ccb8b2857261911b5a7bcf6e6a528f
 EBUILD fritzconnection-1.5.0.ebuild 763 BLAKE2B 37f9d065adead3e17392aed91e3ce95149a1cdcbf796f27d26a17acd9a4cc6a447738faeb2d87e113ec60fced37716dadf381f3eb0b4bdb5c28c0ae2ee957891 SHA512 44ad672a74f14714ddce9b6294a1d8a53a84a891a343bbeb850235a3f6ac6b6876cc3ac5a083797ae0cf30584a65bd5f6a40522f33d50421fff41fc2a1157288
+EBUILD fritzconnection-1.6.0.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
 MISC metadata.xml 455 BLAKE2B e2513423534902d6f8d5cd77a4db963d8dab38b971d53c97390cf7756658ead852f2bde5052f9027e8a2150b47e1fad4890dd3a9597275f00fdf31065c62073c SHA512 19ad7383a104fd22951f28079ea8913dd51417d1c696f6201d52e85785596dfb0ba9e1f372a9cc1d4363d90ca9075f3b9d9f4c814f6b65b32077fd1aec8f51e5
diff --git a/dev-python/fritzconnection/fritzconnection-1.6.0.ebuild b/dev-python/fritzconnection/fritzconnection-1.6.0.ebuild
new file mode 100644
index 000000000000..00eeb7787fd3
--- /dev/null
+++ b/dev-python/fritzconnection/fritzconnection-1.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
+HOMEPAGE="https://github.com/kbr/fritzconnection"
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 056b1383018f..e6c283c10e3b 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -3,5 +3,5 @@ AUX 1.37.1-cxx-no-gnu99.patch 1366 BLAKE2B f8dc0d4cbcf5868d74c168dc1103a4b89d3a3
 DIST grpcio-1.37.1.tar.gz 21678919 BLAKE2B ea1c9a1ce1d888d0e9aca27a9e12ebcaca5c79b6f70a282e4e9a12a4aba982c2cef3f755cc2e789de2302071ce3abf12c91f329febd04159b3c8abded96818d5 SHA512 e7697a6d0da40b7d63be7f4f31223d2314bf16fcab8887a41bc4750c844a58ad55fd27fca0a9f1016fc725076a16c3b2db5a9eb040a86a2acb9f45083835d90e
 DIST grpcio-1.38.1.tar.gz 21392075 BLAKE2B 92f1ad9e119fe346bc1f8f10ffe7067fb736c975ecd276eb8ab37a3b25d0a818fff76cec164db5745ac157ba7b94b841c6e66bb332d9f3b2c08974cab415a973 SHA512 c4f831ee654eec78f01c099fa5a6d9dc7e9551b1db5e5c89e3b8bd4e5c3bae622aee32cac9212bb60bc1baec98e4a49f8e18c0043bc90d1144729dee337072f9
 EBUILD grpcio-1.37.1-r1.ebuild 1298 BLAKE2B ef7cf673b021ded68d29c46f506d76cee781bd62ff03aabb8dbd03488c810032ea1369418bbd2800439642eebd2e327e5a7cf2153631aaef64497ca4a7bce4ac SHA512 28bddf5c20d4902166dc68c944f26699cfb85045bc3a7ee700486d2c1d6b55543d0383ee48ce188232529b3364048bafcee65f49ce313de767e2b496839ebafb
-EBUILD grpcio-1.38.1.ebuild 1265 BLAKE2B a0ddb704569bc2b7e7f1552eb2c5cadc00d86f342048c1edc7da2c103b9204403487fec4f7aadaebfb6d9cbfa524e29e1592ca7cacc72e327c29d6bb8cc0a65f SHA512 c1631b0479ab9b451f053f676e9c51e832d81611861bc3ea942901f5b8b53dad67453e4084c5481d688762cbae3178eac85593e04fa41bc41546750d7e4ea88f
+EBUILD grpcio-1.38.1.ebuild 1264 BLAKE2B ce658058c785aa5884656bd733916856010f36afa686c8ac3cc1d2dabf1216f4cf2f6b329ad67901ab59be1df5bc14588eb3569ca16fced565230a49124e31f5 SHA512 ad684f3e6d53413584d0defd55033cfc18c9045f4aacdfcae145d39b5ab6affed2546c25dfd21ed4a476dc3f325e1bbb4560054bac058692d2b5d93f1da37f14
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/grpcio-1.38.1.ebuild b/dev-python/grpcio/grpcio-1.38.1.ebuild
index 9260d4de4f68..1d79bf9a0481 100644
--- a/dev-python/grpcio/grpcio-1.38.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.38.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist(-)]
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 3bff7c675aae..d92cbfa86608 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -5,5 +5,5 @@ DIST h5py-3.2.1.tar.gz 368170 BLAKE2B 2c198d0cfbd988a8531284e16f563ae630afbdd0b3
 DIST h5py-3.3.0.tar.gz 380221 BLAKE2B 0fd44e780304f0d56e8fd8fd0f42142c80935fa7cc3e6c53ff68860f32755d3d5e576fc283bb9b21e9d7dfb905bdeed6656eeaa33e48cefd34de86fde3efa49d SHA512 f1ce944375da3db65829e8a9d667ee7ffa2f863e408aa4ccac0de9d999e0710ebcb1e116537616649fcfd05731cad3cbd968c9593f0ba0fd4348ee06c74d9dae
 EBUILD h5py-2.10.0-r1.ebuild 1603 BLAKE2B c1ec4e72f614eb760f020ffb04fbb5988c79019eb9bc233e9f1359cdc6376e0a9ba4e1a2c51134755c0df088c126729f235cdada2d4ed1f4e9faea05d3e5d888 SHA512 a115a6a1122c2af0ffdeac399a5dd330d456c71864b7848e35664bad2a7dde1f2482e5a9e46a8da9e2196018145ceed7338dbc1b02b78749616a70f0d27d18d1
 EBUILD h5py-3.2.1.ebuild 1651 BLAKE2B 996256072ab2696da939d080cc23b947981e978759ce82b487177bd103316d84a2682833fb8976d3ad6db73f87ad7dda2b500ffddf218bcaeee8e50983fe876b SHA512 3cbaa44da1679595ec0865103f445ee4cda16e6bc2b8a8560d8ce715e1c4e1cc37a2d9a6bb8c6c9cefecbab3c58bf8872f49298197dcdfab5409305f1519eacc
-EBUILD h5py-3.3.0.ebuild 1418 BLAKE2B 34b01b972fe5e9ef31bdbad6397094b36fbf394f90fbfc7519f4904afaaa5230240c5a97d977d051b99cdfbddec16be051a08ffc9e9ca0de9037a68aa6b23623 SHA512 f3ea76b04ab5e972f1b49dbd79c788ddcce0c813ade07c5a94951afd44741c22e83a5395fdc85260d18caacb9e6f6de63f26be89599c8084831f3776b7702b63
+EBUILD h5py-3.3.0.ebuild 1417 BLAKE2B 7c90cf6e5ccb4eb6b495c8a8232c5de4fd8ba0ca05d29efbceaa4c1d1dcb1bf1113921b86690580c7b1e884ba2909bc481d04d586ad63aab23456d91449c91b9 SHA512 02c39d36bef5b0d39f1373dcee5ab2d410c72436bcec3683a650c6b9cb872966b8ac63ed887ee03c2c580f380259ac2eeeb52f7aa32d04b1c66455f68327dce4
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-3.3.0.ebuild b/dev-python/h5py/h5py-3.3.0.ebuild
index c446eb58c665..903616019b46 100644
--- a/dev-python/h5py/h5py-3.3.0.ebuild
+++ b/dev-python/h5py/h5py-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 4fd6bc448415..65046af44fb9 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,5 +1,5 @@
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
 DIST jeepney-0.7.0.tar.gz 61236 BLAKE2B ec477ed0d96d7d82a256c7f62900eff0282ebec4545e30807fd62cffb419ed763fd8042bdd4d72c6cf43ac09d24af9cd86797b1baec61ad5965e51b3d669175d SHA512 b1fac480da0d8798b28eae30cb22ee97d4f73a11922f7b1bce86eebf938c2980414c2d026ef5a1cdcd95813724873700d348b04ba337aaac0706b2c8b38ea6c2
 EBUILD jeepney-0.6.0.ebuild 1038 BLAKE2B 2c7df2b5380f85a8f19645135db863eac3038e58a031065d2a5f491fd5327651a774e37e7e434f1846bbe49abeeec90229c6874081b6c39a5116b08860f4b1b3 SHA512 f6143bbffb239ff02ee46ef558ae5296b98abb3e0a8387abf49a8776d7acf131ec348ba98ae63bfc83b9bb0cc454e0637eeb8e5bd435533edb9277fbf87de9f7
-EBUILD jeepney-0.7.0.ebuild 1222 BLAKE2B 27408acabff65e66ba59ed00fe3ad21848272223cdd88fbc091af00bbe6857927a4c248b84555a33e40d54cf8fa95a8378da4f08a73d2311b63c511987c3d6c3 SHA512 4b3f4ef7784bbdd0ae264f5678f37ca325744aae3f3565590ca8425549485ba386bedeb6c83e0255ab132692f524c55d35d8d5db25a7146b09a3f0f8b471758e
+EBUILD jeepney-0.7.0.ebuild 1229 BLAKE2B e9f888c7e6ccbd40721c32c5da71726a2a17a3ac60f8737a12dc1b0ff6e71796eab0bf4d79796efe2f1634916206904d7a721fbc1efb8c45530f114758bb45a7 SHA512 55bea6c4be689fa66cda7ad9ebaff5a7d8dfb86232305dceafa8f728c3c7aa22d6234deaa0320e97785dfd2728cbc4b8d329696009c617cf05db348a21a74583
 MISC metadata.xml 456 BLAKE2B e597aacc0128f9cd06d21a03ca156343861a56adba6449e12127025265c6019308ba2e8f360d7a4f43bbca3f95a78789d964bdd3e5bd5fea7d21d7b8eb413c74 SHA512 6cb3b5fae02190cce838221a1d5269bc005f985d5935f77880b066999340818338a747a9e24aa5d39ab71f69c842747068e3b573dcf475c7d552af1bc9af031b
diff --git a/dev-python/jeepney/jeepney-0.7.0.ebuild b/dev-python/jeepney/jeepney-0.7.0.ebuild
index b09285f5ea52..188eaf1a6e25 100644
--- a/dev-python/jeepney/jeepney-0.7.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 4e62d7ac67a2..91bf148fcdf6 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -3,5 +3,5 @@ AUX m2crypto-0.37.1-py310.patch 3843 BLAKE2B e983077f9eda65ea63e34f73178429aea8d
 DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
 DIST M2Crypto-0.38.0.tar.gz 1241269 BLAKE2B 95433090e08ff72cd2b0779491dc38b89eca159b26812e763b5b8973e3d27249a96d5a2c983b59f414184f64beb8e455dc26979310378db89dd2081741d4d17d SHA512 b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
 EBUILD m2crypto-0.37.1-r1.ebuild 1487 BLAKE2B 13825020a0ab5d5203e238bd5d5cadf719d77c02dfa1b4be8fca51a79b1238360bfc52ae06500ff92c0caec2418c51db8c4c7016d77977304c80a5d6db2531b3 SHA512 2100ed3ca111b84ee5dfbe92f83218a1403981d63f906b49a7d80faddf46f8bbbbaca42da5ec03b304b91dec30dfb296622c9340499ad29c2a55e53b08e96ab6
-EBUILD m2crypto-0.38.0.ebuild 1493 BLAKE2B 575181f2898b4bab5b1612ff5a3fe4cc3fdcf48bbf71249edb17cc987c79f24863bb98f7a94049423f9d3c6a0dcb58ac99012d0db04f021feaf1218c09eae71f SHA512 111c87bd5c72f9d3c9ae6a9147b085a2891b02df483c27c8d8d2d1aff7858cd90a6315cc18629611e8db2c5b31eef7ce418c54983983067f73e9d9a7223fe67c
+EBUILD m2crypto-0.38.0.ebuild 1491 BLAKE2B 5562e114cc0c4bf55203989831d29386069eac1566a9b68cd39d7c95b619420c7b0826fe5c08e5a987f9f6c7ad9a6dfcc71907d78ce225d4a80949ad2b790f8a SHA512 e3981fc36668c519950cbd4a08cdf6d3f1bcdc042e02f83ba3d5b292b2ff4b0773a62b27ac27931fe562923eb7952fd894812df0cf51d03c670944e697952a22
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.38.0.ebuild b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
index 67ffb9066efb..2c80639e8951 100644
--- a/dev-python/m2crypto/m2crypto-0.38.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 5576f4c493c7..ddaa9edbb84d 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST mkdocs-git-revision-date-localized-plugin-0.8.tar.gz 364352 BLAKE2B cfd1709b5c9e1f99ca1a2d8d194634afde6d57aecaca1d2cb70edc21c28d0b210c3497a4214d6a95592bc5a7aad3b88d96b275427f3218aa198ab7b3ae8f364a SHA512 84f19aa13189b74f18f98433939935052f1d757f66972d4f1cc1bfd14b614f8fd57b0ac0dcf41fcb678eb8dddba93ddc78dc776d6a81977d096920128d31f58e
 DIST mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz 367301 BLAKE2B ac4d69117dea856a209d144e452cf408ee3d111eaa8a9825602b9f8d604a79143e96a51e67b74e430eecc6ee33335161e409149220a8b216f3b47f22e7a49f12 SHA512 11714323a6e300d0d8d05198f617019158dc48ba43e8a685f52702da7f52558f1358dfce294dcd421ba9d59131c17e4d6ea6ff483397055dee62dffb76032d4c
-DIST mkdocs-git-revision-date-localized-plugin-0.9.tar.gz 367850 BLAKE2B 0bf02b9de2b9ee8c4ae36548ffab85a9c880fc89dd5a4f39961093e36fc0b87b53dce8269400c804fed67f5a3a3a2ec45e6486ec80706be0651b9ceefe7de6af SHA512 488cd20e7ce8cd8df4c277f3626b8d628ce58090791a1b7e36efbdcacf6bf434bd4bc3e73f0402fdc8cb60767e6d63fac56a56b0dfd4728d6a49438caf5ad3d2
-EBUILD mkdocs-git-revision-date-localized-plugin-0.8.ebuild 1159 BLAKE2B 393def0c9eed9f7002691b5cca836933220ffacaf4f6faf783118e33a60e760a2dc3f482fe578a835a9e17bd01581f7f60992918ccfa15b74a46fcd409963af0 SHA512 a8c330aa29186821bba5061ad871896cc48aed48a9915a33c50108604d03d451725d220d8b3b24c54941da37ad11e80c5498e903e8e659e75bd7322dab094bd4
-EBUILD mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild 1418 BLAKE2B 44467533c6c6798a632954e55a6021c9e588a1e00cdc1451b70d1e73b572a0e186b0da6b85fbb7bdd9fbce6ea7ac55aef865c1082cc966cd4765d6482cc3f5fc SHA512 1b5f02b39038855dc7d006daff0e68115a3ff6c36c46794b4c82cc79d209fb8c0d9bd7e36a409c56bdc9084c92cab4e613f2789765a7012507b87dfe71716ba3
-EBUILD mkdocs-git-revision-date-localized-plugin-0.9.ebuild 1248 BLAKE2B 5e42b07bb574e864f91516ab0c7cbf7eb654a2c5a2ac2bbc1511b583d833c43fd5b20658459d10be5a32a2424cc54b1ab96c14dd228154400dee3a97538b94e7 SHA512 b384e200cc1416b14aa71ee9386399ffac59d7fe999a8eee780ea4de34cc57055e3ca452912631a8ed3507d4eac7c37a6686ae2eba000e4d979c542fbd603bf2
+EBUILD mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild 1416 BLAKE2B 8a1f5230ee1befd6ee7faa3b867f4bddd1de2b0d387c5d4875d95b93ab79f1c7a2211a735bdf6f7881d8095ecded6e8b226bab60ab90603ccffc587e7a88b00f SHA512 8ae55c9b5a36010a1918b316f83b9506e722bc4d52c8be57bb6983cb0ec381359dce554f94769206504f6ea6498c90a8a8c08dff5fe373dd64daf06b54321223
 MISC metadata.xml 595 BLAKE2B 930979c48f81e50af6d892a4c66f93851d862cf0e0562ad6e6f9f903b4aa6db3a3d989e7ac45ac1d5f5ebfce27bf718e143587eef5890695c86c08bd66050118 SHA512 58e5db1bd1f0e6c613ba2957fa4d2d6ff34c067ce29a67bf4171235f38a4cbd57c5d8cc5e5687176f6ac270798ee9694a20dc64a8b720fc03119b5964f8401a1
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild
deleted file mode 100644
index 3deaa70facc8..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="test? (
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/mkdocs-material[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild
index 55060a07791e..fbb93162a538 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild
deleted file mode 100644
index 6d56c59ced43..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index 6ea28320037f..1730630b279e 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,9 +1,7 @@
 DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
-DIST mkdocs_pymdownx_material_extras-1.2.2.tar.gz 40542 BLAKE2B 583b06830fc230e28b0a8ed465c5c2c69700aa0707dfefea33bedbf87c00265ae5ce4bf9e3789a34b4ec195aef85e370b1f01470ba80c384669abf225486a312 SHA512 3db8aa9b22d24d0e374e5ef298685bb35c0a6b6b1916be12c756d540daac6e482d60c0dc7ce9662a8a05a71c1c75be9b8e0c0b8e7a25f495e2d652d91556ee7c
 DIST mkdocs_pymdownx_material_extras-1.4.0.tar.gz 41238 BLAKE2B d30f4d90822298c82bf9d7c5467d2f022664adee9c910eac82b2b35a740b29a4b01e4e5b61677ccfa98cdd9691032f67b9004065a405712b1d997b70615fec23 SHA512 a3131052d2b2d5619a487edcc5ea8b7b5386a4671ac210028fa72525610a0e86117ccaf3b095f64d2438c49e135a721d8312cae1c44de16bb699822e54b958a6
 EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
 EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
-EBUILD mkdocs_pymdownx_material_extras-1.2.2.ebuild 561 BLAKE2B 086ee2f238c7cbcec3a4028cf7642387eda803de5584b128e96789cccb14727a8ca2d49554faf20b6ffbe992ee9e75acf12a3fda1a9d5bb2aee6238d1521c9de SHA512 7b72bc9630030ee807c7dc5aa6f3ea989899e40648c403e6f5e195fff34055d1616ed97b292b0225e2c55c6a1067d08707c23501f80b5ef13b38ffd6b93e201a
-EBUILD mkdocs_pymdownx_material_extras-1.4.0.ebuild 560 BLAKE2B 87b6a130990fde80ac940cc8a3af232b705fc0d29cf2d8b1d85542ccc2094d707201ff1d268bc3f5d261f0e28e5b7d52836be4b916f266eba8499f9e00bc5eac SHA512 805e7a4fe0675b4cfac9acba15ff762382fef062d16c78fc2e95aaeb9021cb233521038bbc5de7aa236b87d0e62b4083fff9ddd5d5246b430838dbeaa96b1762
+EBUILD mkdocs_pymdownx_material_extras-1.4.0.ebuild 558 BLAKE2B 60789c82ec65646db176dedfca740842626ffd980d87404b5c3e3a1d042090db26103da7b28ec83bd69cf66cdf0d16b78fde84b94a7706469fef8394ddd733da SHA512 b7369466156f837dce431611539c550d4e7a2f375291ef4a6130dde20ce1989c8d119b7b519c7e52407acf528c026f937d75f37425afc0c048ad2d05ec761ff7
 MISC metadata.xml 1166 BLAKE2B 7f19da6ad1ea3ddd412be73a28b2fb4e4c46f2fff047f404bed33fdc108d93008209110abd88843cf16b9572663a50c7ffb3be9abda9049318c5051205240e55 SHA512 37d55fb8a55e5a9a60f8b9771de181944022e691548c0f2fca52e0f343004369af4c7d4235587a943112f64e72ba34ce203f8ab81848fa86d523679b30cff424
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.2.2.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.2.2.ebuild
deleted file mode 100644
index a597da30c92e..000000000000
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Custom alterations based on Mkdocs-Material"
-HOMEPAGE="
-	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
-	https://pypi.org/project/mkdocs-pymdownx-material-extras"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
index 85a264cc6389..e712b7e56cb7 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index add5d9b93977..d2649e0462ce 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,9 +1,3 @@
-DIST mypy-0.812.tar.gz 2122474 BLAKE2B 3bfbfe3010798d49bcf00aa1d926ffa8a54be50fb2e88f4ffc3cde3edba80a9b74853de17126394dc1806c07b740b5f8e7775f2fe4b2312e0a85134b446a690b SHA512 ee89f56a7a01214540f9b727f153a075a097b161b7f654d926d1080ae540ec68303629a4fe691fcb53d37c3eb08924bf01d22cdf1c3761b414a3bc40af3363e6
-DIST mypy-0.902.tar.gz 2549241 BLAKE2B ba8bce0434b08c379907f96f22c030048ff8c45f426eb4a6b6951059974bd3f35b5e6bc759b9b6ff0237d43811d01181e58ea2cf919fda3e2649c37825d86134 SHA512 b896d5a614982d60dbeffadf56a5faff3d809c4d2af299fc658a67c09c3f36cab961d8516d38ea682227d9a06613a3aff7bb041ba1346354b81ec1187316d258
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
-DIST typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz 600241 BLAKE2B 2bf91ba7bfa2ed3e2369d70ab76ce152e00f321e79f36ef7c264d477e350579eaade222e8347b4105fb93b847d944ce0aa182466ce636649098a2df69c09ee5d SHA512 8497ee9719e162f84556407296d383e0b7e695cf6cd60bbf7f34c1d7aada3926fd5516ce7ea3863e11b3bcb87f12617733082f020718610e467877872f0b4487
-EBUILD mypy-0.812-r1.ebuild 1772 BLAKE2B 15065f178eb5205fc041b3fc49517f42f770ffdaefd688cfa54c7846232bcb2f1292f1a37c4168ca7962578add3b490a739a91f9133e592b7c64fd4c51a93f11 SHA512 608f51989f8ce28ccc3982c6b4206386a9d8fb31f496925a5311f86df871c2dafbcf2fd0b2a353d1b1b87014ce6a532fe9370e9c67320b845c8e5ab88e2c794b
-EBUILD mypy-0.812-r2.ebuild 1776 BLAKE2B fac9d47619894b63eaa5af03c7b59d8eecd431dff1dfdf851083098fb54ca32624c77d3dac019ef942099969da8680b4d832241eae2346ade8cabb7ee8b0b1cf SHA512 4058512f892c97959f5ab2d09c98cfd0f1dd5d5b13b605164126c4e0769b97281b9a8a0b1cca297c61be1884034449062952670a664a78a7c7c3fe8beff88156
-EBUILD mypy-0.902.ebuild 1545 BLAKE2B 04cc8108aa1efe1b760d96d64175e543c9762b826fe10425e3573905a13db0a7d2997d74490c69755252e23ad8fccf5391e3e9d18d8ad5146c639bdffdb59cb2 SHA512 62055af8581aeb6d6eb1a46bee126ce6bdb3fa605583d2d3a644f37ac65fb77005d1fd4fc1bcd47391a094c37d50c2bb1a93a3b93fae767bc4bec236eb3cbec4
-EBUILD mypy-0.910.ebuild 1644 BLAKE2B 2ef470e4effdbe0a48704eb2204f88f58ff979a32a9bfaa377182a4ad22a04f8ffa315a1e15aa57c42ac4eef0e4330ea0ffd34a51eb1f58daa091b855b1ff056 SHA512 1c814a8f81de30d2f3baf5b7fa3cf253c8b9ae693f23442d3170962924a81d8e55fd9cb28c41b1ced3b33b0ab38c6c98d8000ef500036af8281a611671198502
+EBUILD mypy-0.910.ebuild 1637 BLAKE2B 5ccc41bf6e8a204d842539864da26cfbcf0908dc73638aa7352e774a73182a686379a45848b93f6f7c065ba0a3ef463bac02e04cea844b6d32c041675d2776b2 SHA512 cac8c4c53d0ce8a96739f1926c75d4bb4def5259bd0677841cbac1e75a39fcb143723d10b9ecc03a71bac541a0becc9f4f5348c31a36f7a4a77e903efadfb7c9
 MISC metadata.xml 514 BLAKE2B 12e8ffaeeac0b2501560c015aed0707a75162182b00e899221c9600b78a2969dd6e24a7cb5580aaec810885cf1787882628b2fe550121dabd3737e4cb61d09e6 SHA512 83496ca98f9207accab51a98e3e52c0e68a5b290c6b4f518544e53ecf38cee8153372212db198b97c8a1c07d922cfd00dfcfa41c3d49a9d69eb4bc146633f454
diff --git a/dev-python/mypy/mypy-0.812-r1.ebuild b/dev-python/mypy/mypy-0.812-r1.ebuild
deleted file mode 100644
index e832e45d0282..000000000000
--- a/dev-python/mypy/mypy-0.812-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
-SRC_URI="
-	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/python/typeshed/archive/${TYPESHED_COMMIT}.tar.gz
-		-> typeshed-${TYPESHED_COMMIT}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	rmdir "${S}/mypy/typeshed" || die
-	mv "${WORKDIR}/typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed" || die
-
-	export MYPY_USE_MYPYC=0
-}
-
-python_test() {
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/mypy/mypy-0.812-r2.ebuild b/dev-python/mypy/mypy-0.812-r2.ebuild
deleted file mode 100644
index 00fcb2f38466..000000000000
--- a/dev-python/mypy/mypy-0.812-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
-SRC_URI="
-	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/python/typeshed/archive/${TYPESHED_COMMIT}.tar.gz
-		-> typeshed-${TYPESHED_COMMIT}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~sparc ~x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	rmdir "${S}/mypy/typeshed" || die
-	mv "${WORKDIR}/typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed" || die
-
-	export MYPY_USE_MYPYC=1
-}
-
-python_test() {
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/mypy/mypy-0.902.ebuild b/dev-python/mypy/mypy-0.902.ebuild
deleted file mode 100644
index de9539e14224..000000000000
--- a/dev-python/mypy/mypy-0.902.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
-SRC_URI="
-	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-# this requires packaging a lot of type stubs
-export MYPY_USE_MYPYC=0
-
-python_test() {
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/mypy/mypy-0.910.ebuild b/dev-python/mypy/mypy-0.910.ebuild
index 8c3b67f4e736..3d67ec726460 100644
--- a/dev-python/mypy/mypy-0.910.ebuild
+++ b/dev-python/mypy/mypy-0.910.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index cb6049240b5c..46412f2a1604 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,6 +1,4 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
-DIST notebook-6.3.0.tar.gz 13922153 BLAKE2B f24b03d4887b1e786da215a4ab10d83e4ae8391d1b88559f4bb35fcf7813d98e487447bf21a1772d502d6b3594c53e6e7b743b681cdb07b5118cc4808bcd02a4 SHA512 112bb0b176f7e6584ca0f09d74cb34fe756d0491320dcc23932f84236fd55b9f56f13a7057c89be073486637fc8c0cf2c44dfce18f27fa16ad0f9d15d2bcd5be
 DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
-EBUILD notebook-6.3.0.ebuild 3070 BLAKE2B 93ecfcfe269fd845b0d11a606c1fd0cd26ad890c809b038267790c1d1e3ed65e4992d68293d5edc77c22c0f35b969c803a8daabcbaf0af7328217c7af4676a78 SHA512 2b960b7aaf61855c1ff6dac7f51051958093d0b3022b133397688ba1089bd4524a4eb34adffb6f1a94fea67603c3f1610ede263ce0df39e2006ebc09d7518e97
-EBUILD notebook-6.4.0.ebuild 3237 BLAKE2B 7d39995566db07dedc099207e72555d1c56876f100728ac161a963e192af11f759aa16d75cea96f3563fa87654f667c46746aabb9c6a6ca14caac9f4b6a3a7b7 SHA512 59c76c86cb2fe893da3b1fd1145121d19ff971d5c5002f7013a5ac1d78993359f8800e2c251a7659b927439de4dc82064a1e53321ffe35fbc7a7004f73cc5da0
+EBUILD notebook-6.4.0.ebuild 3235 BLAKE2B a83eca348e5db25252af465ca499e16512ca91175b4b051f18196e3e3f60a1a657125b9fd7d1ec2119c096afa9d71f2a42b5edd9710bf248609f8298e75c89bb SHA512 78b4c658232dcf15124860d5fc6d3f394f9c2c9bde8de3cf8a9e05badb73cce17b4f4373fa64f079b12c4dc6a8169b66b89c50a13c992c96cf5a3c275d786bdb
 MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/notebook-6.3.0.ebuild b/dev-python/notebook/notebook-6.3.0.ebuild
deleted file mode 100644
index e54cfb2c99b3..000000000000
--- a/dev-python/notebook/notebook-6.3.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
-# a version constraint.
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# trash doesn't seem to work for us
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
-		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
-		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
-		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
-		# TODO
-		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
-		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
-		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
-	)
-
-	# selenium tests require geckodriver
-	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-6.4.0.ebuild b/dev-python/notebook/notebook-6.4.0.ebuild
index 4b4ee6821c95..411165084fd2 100644
--- a/dev-python/notebook/notebook-6.4.0.ebuild
+++ b/dev-python/notebook/notebook-6.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index 3725c604f79e..579aeb45bf35 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,3 +1,3 @@
 DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
-EBUILD outcome-1.1.0.ebuild 744 BLAKE2B 3d89e842c1157a56f4c9d8f77ef18c424fc6112642a5d41a59b885a04a986611da992a6938471099264016ca8444184568bc9303089d31c414b292569d929d7a SHA512 f2b65755315d0f0b219bc52ab8abffddfa3d2781a1dfe1d0e5a21a4729a7eca87260bbc48308c83a58416670c97bb3aa2a383eeba49ba921535d6b64532d7267
+EBUILD outcome-1.1.0.ebuild 751 BLAKE2B 0d569415a10d7d74856402b7563ac4f46546dc2425a63b36edd99b7f71b03f3cbb993bc213e19bd2fbf9aa926d8be5fb1075f4dac254c0a5966654f821d55396 SHA512 23ac423f07a75b07f2ae28ba066e6c672aa32e7a78841733d75c27e4dbc7faa4d1eb09e4f9c94246a8fd365154ecb446db729a0b010948365e10cc477f531733
 MISC metadata.xml 412 BLAKE2B a6981a62dd453c13e7568abd6842a1e800ac403566f6a719bde8eb2cf39e85d2d23790af491e44e00219937e8ceabda6203b9a9bb94ace8b42a3b1df9303607c SHA512 ac1240cfa6facb9a0703052eedad4b22c7176a7f1b6b191ddc52b80a9de4087c5edc910cf1c9906f5ffac0d74f4b6fac18cab8c34d5f478ce6146aa78768ad0b
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
index 5a68cbd75ae8..c6a626f6933b 100644
--- a/dev-python/outcome/outcome-1.1.0.ebuild
+++ b/dev-python/outcome/outcome-1.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 564a49f134ef..3517e0355b0a 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,5 +1,3 @@
-DIST path-15.1.2.tar.gz 48280 BLAKE2B 6dd6be743939d4ac1edd5caab18658473d7318eaf255140198db34cfb28c95322ed8ae05284683b18a0146f412ff8a2c14dae60d018740f8bb9cfda861b8ea20 SHA512 76f2a04800154ee8c7b7b9783bf7c63c544da74bb2f92424aeb437448a04dcdec008deab262d3b40d515404e6144bbad44e618d824974654ef10676878415ba4
 DIST path-16.0.0.tar.gz 44187 BLAKE2B 839c8a9d10cf4ac3f738a9e661fbfb1059554f965fc8224457c05c249578a18118129b69b46276fe569fc8bc33b398be1462d660bb20b905ecc6ab2b4db3f8fc SHA512 3874321d488543219a081adcb692739fcc4935cddaf563b58fe5a97c2cee4b5b683b2be52d220854b2f2224d15ec2bde054a53862352c249f14f1460a72d5e72
-EBUILD path-py-15.1.2.ebuild 1014 BLAKE2B 6292ac0a45c57935446c4c891f4794968c447c7f7011538497756ca333a4cc3d5a537d1e2e72702c02c8f9944605e2f1f3f48171bc534c382072aba885f177e7 SHA512 a2d31f30156ef22ba08a0fedb1f67248a369eb5a739f6517a3f60330beb613ca177d9919868090b1fb833af2cd55af864e224528869c841019d1d8448088cd2a
-EBUILD path-py-16.0.0.ebuild 999 BLAKE2B ccbe4489b241d7b46765e08caeb661564fed4b504530a426dd14fbdc5fde87b45f92f1ac2746608ad84fd1c155f4345ab941f76ecbfa6dff5beb3027834ddf9d SHA512 0dfc40b0672b7df937cac1b92b1bbdf82014326f6dff72e007eaa9169a180afb6a7b34694eace7eabca212ddf60d1c21802df814fe78230f6d94b67c4e28c847
+EBUILD path-py-16.0.0.ebuild 991 BLAKE2B a34423a4b0ff511cda1b8a151966e776003fb904133da0c9049828213b585ad505a611949e090bee441966b2941904383c1d285d3321c5740389657f1a8296e7 SHA512 0941a3669633d256d38a47f497032229f7590f25d87bf76c7daa43f58d5feb84025ec7fdf26faca12e0cc67b8b5b0bb373f8c773849f6233d56c87f185373497
 MISC metadata.xml 382 BLAKE2B f4e983fc27f8e9a578a8469a0b432adf91f622d9993bcdf9a0f25f2786680eb26a67d53d1c97deebc8bbbf7d62ac5b37b2d5a44b39c81f3862e0ffe2cbe2e577 SHA512 61909559eb0ad81e607bdd7b9b147f3e9c71e53721ddd99b1cc2afbe8e33ca7de2b9849ff3ff7468183c5f82f108b958ae0ce3042998972dac8eab6338040151
diff --git a/dev-python/path-py/path-py-15.1.2.ebuild b/dev-python/path-py/path-py-15.1.2.ebuild
deleted file mode 100644
index 1cbdcfd39800..000000000000
--- a/dev-python/path-py/path-py-15.1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-MY_P="path-${PV}"
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.org/project/path/ https://github.com/jaraco/path"
-SRC_URI="mirror://pypi/p/path/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	!<dev-python/pytest-shutil-1.7.0-r1
-	!<dev-python/pytest-virtualenv-1.7.0-r1"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# unreliable, not really meaningful for end users
-		test_path.py::TestPerformance
-	)
-
-	PYTHONPATH=. pytest -vv ${deselect[@]/#/--deselect } || die
-}
diff --git a/dev-python/path-py/path-py-16.0.0.ebuild b/dev-python/path-py/path-py-16.0.0.ebuild
index 05cfe7a2439c..b0bfdc1c94dc 100644
--- a/dev-python/path-py/path-py-16.0.0.ebuild
+++ b/dev-python/path-py/path-py-16.0.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index db48dab94270..30b623938680 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,11 +1,5 @@
-DIST phonenumbers-8.12.24.tar.gz 2257982 BLAKE2B b7fa2a29c1c9a4a1029013d7de3eed9998c764a12b41a9db2db8d4c9c2fcef1bff00167809f9cdffd484ba1c9d22ef244d45e7c21bb61899a37fc4d3cbb0b6d5 SHA512 1145c527e349436ecc8eaae5bf2dc2e10d25eab73d2ab3b566d7aaddc2cfcd9ae1ada4e3b9876f133f42f7ce023c74a91e48619df69d817f74964e429ebc20a8
-DIST phonenumbers-8.12.25.tar.gz 2257994 BLAKE2B 4bcd5e21819c1f42281fc684c97d41824a0dca1fc296b1968094e3a88ff235823d76cdd3b31da68bec677aea15021689ea40906b2c50363b999958029a05fcdf SHA512 24e6f1fb903d07214eed80eefd8f67e73dd4d66f0bb66308867453d05ea1b6272a8338e11bdb45395a37eb2ce8d6c3b80d90491763f843b3da4c131b43f5db73
-DIST phonenumbers-8.12.26.tar.gz 2257950 BLAKE2B 67d146b4c82691d2d4c481dd52ae23c8ec075af0b20e64947bc203aad538e5f45f63b0827458b8504679a8f5b84782793c3c11636b344c8cb4d21b418a7444b3 SHA512 12d5daaa9f82b0646bf22ece9d617971b21bfa5ac3a9731a2917bc33e6f790a7ff1423f49da14895a8de3004babf3a83b490397b0b7551c144f4f14776d1ab62
 DIST phonenumbers-8.12.27.tar.gz 2258133 BLAKE2B 73a295a464a0e4e7d32f3633a0a149504aed376a255453d3edb49137e979144645780777d988b1fbf5d7380b468ba9dd905f34e42f658f6ff8d0e0047d45ee35 SHA512 d177606bed9ca6f4e7f91ab695d9ae6ddfb2401f36c458907b2b6fe14e85a2ed188967da14971c15ec745b87fe794fc8ecca86679f01d3c8fb649224c2f75139
 DIST phonenumbers-8.12.28.tar.gz 2258298 BLAKE2B 02713540accf8c77c37acd7f69ffe3d1fe972124e4c8e82aa56f390d9906b10771c5a1a845c9b1adab602b041c38f4eeac6ee76d0e3382d542d64bcff5788fcc SHA512 49678b2b44038938733413d9bdd56904bb1a55bff9e1fa9a2636ceca18233c2ecdcc0fba8da5d1eb09e28c3c5d0eed61dcfcec1da729b7e599fcbc895ee47ead
-EBUILD phonenumbers-8.12.24.ebuild 434 BLAKE2B ca7366984b77d662a0d9239e2587005262270921ea388226c39aa9e8639a92957b3bb831b99df059a0dfc4ca68772ecc5f38a38f2953ca784eac1ae4c4e3c936 SHA512 269022a5fd237ec45e78bb73ac97dc90d7ae7b507225b8d7721d1aedc77344dff47adc5bc093a07b2fe7aa5e5e2e0a626b3477cb91a23e52d3d5c8f0b95615d5
-EBUILD phonenumbers-8.12.25.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
-EBUILD phonenumbers-8.12.26.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
-EBUILD phonenumbers-8.12.27.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+EBUILD phonenumbers-8.12.27.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
 EBUILD phonenumbers-8.12.28.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 412 BLAKE2B 3244f00cf537fc9f8129cb4c499963a121ce2b33ea1edf0c1cc3833afbfe22c9afd5442e532b7324ccdb13cbd6a25e64e312715b13fe31ec16cf8d12a4e218f4 SHA512 a527e1c4d9bf2446bb5ef628d22731a2647bd937260f015a7cdb02c42fe3ce8a9c3d6a27660f3ab2521bf0a1400575063682dfc3faed2187edfe3f531e8427ed
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.24.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.24.ebuild
deleted file mode 100644
index d3df65bbc910..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.24.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.25.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.25.ebuild
deleted file mode 100644
index 0a99481a97f0..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.25.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.26.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.26.ebuild
deleted file mode 100644
index 0a99481a97f0..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.26.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.27.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.27.ebuild
index 4df0c54c7011..b1997c3749bd 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.27.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 226e04c3cb26..fc7199355b19 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,5 +1,3 @@
-DIST prompt_toolkit-3.0.18.tar.gz 3034754 BLAKE2B 27334b7009fc162af67a1fa14bd30c76efed6a333c5c93f3100a2c9ad3299a1139c3c3cf530e7e048b5700c0dc4ec1087d1aecd5412785b09221ea2d55796008 SHA512 be2dbd72a1e08553c0e50453958b6085a7d743464acd02b303e5002e1174d672d2cadd7a992e71d0445aa2f2be7565411ae4d00c3677c275eca056a20ad9efc8
 DIST prompt_toolkit-3.0.19.tar.gz 3034818 BLAKE2B d1f0741931d4711952cfaabd992e64aa3fd252627c50f2a0ad8ad1aef5882bd4ae054c0d281b141595488fda6328c102f900445a42bc32cf018d37663deb2cb5 SHA512 0f3f7c5a2d12e03e06e900a4239f86f27d959fa7337d072dae8c79bbcd2ffd4c1026d1531210e34a4f4669d483b20b9d2f49c7625d0d7aa1fcb1e3f9f3894349
-EBUILD prompt_toolkit-3.0.18.ebuild 598 BLAKE2B e287f94484ff34e154da4a9a30c5d76303a0ef2292637e70fe4e88dc16102d8454dd89f2a4b1e8543a707e1231786215677963f99383037e46401826e9040b2c SHA512 4833b51a432cb17b2160c0c989e8f623254c7476bbb5d6f94e5319d1e2917dfe3bc51c449e6416fa145903eae67a3c286236b7bd3c92f8b87a2bd02b444c694d
-EBUILD prompt_toolkit-3.0.19.ebuild 616 BLAKE2B a509e86e5de45b98d31e0ab0d722806081a3ebb29fd7838e2e9a393d41d8071205885241254fdde3f1a9268bbe2b8ac03a70a5ef688e73a06d92203ddbdb0e7b SHA512 db2014b268513f765bafdab0b598cef114f31f8d1b0afb3d3dd1f9124dbac95cd3372794dca1af8d2d8820e5f66889d4092ca185c1820f3bb6184763968da88c
+EBUILD prompt_toolkit-3.0.19.ebuild 612 BLAKE2B df5de2b77aff12ddb7dd80d746931e589e5b2ba4afca55da906d504e8f73402fd7281f79abadcce8af4255bc1fa804bd54255e323871cf0e397adf72cd0dbc3c SHA512 91e0b16cb8d9e1cced54bd4342670d4a4eb86a7f27cd926dc016b893ae88db7d1f0af68ef787c6ce1d42664b43f3cde1ac1c13d11bab8debc43b6701f8c25a6d
 MISC metadata.xml 430 BLAKE2B e3e66ce24a2ac8bbe9d6f6c0bef07dc0bbc3222ca281cf374abb492898428de9f84404b5575b122cdd1dcea44faf395350a14f4fa985d1ba29681ac673560132 SHA512 259a53798ccc14411b01184139e72d633473e2539d7c93911cf71db94bbb01166de3b3abaa76fa32b51e1107cf0ffbbc84644d8c8615ffd3a0e95b95e1f4c5f2
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.18.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.18.ebuild
deleted file mode 100644
index 259c0af35af5..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.18.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.19.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.19.ebuild
index 1a3d2d6f58fa..1e7166494650 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.19.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 972128ca0a0b..eeb5128c4434 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -2,6 +2,6 @@ DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880
 DIST psycopg2-2.9.1.tar.gz 379972 BLAKE2B 89a05f0f3e2f426848641bdf07bee1846a5512dd248d7e4eb4723dbc4f7775b00d142217a5cc59e126eeae8e672173b63de3b1152e3bf14dfaccf5fe7149c88d SHA512 478eaeaad98e4521424a0a48d5f0fdba934bb3b682ba111cc37b833cd3c953ad5fbe2a2071d3a9b95c6a447e95de88887ceda5143b63a08703c388f96dd9b4ad
 DIST psycopg2-2.9.tar.gz 379805 BLAKE2B 4e34b9dc28d0922ae9e9f75dd734b961915a032eba0c4b5ea9c4fe82bff4d5d230b37b0efdb25b8423177fdd7e98e69d0ed6ae0eccd731dca212845966b9c0ac SHA512 9787d0d3bb163815a452139bc3fbde93c767431b3e31c77dd534b6a476d1c09a51e2503b0420ac7a3753ef7fa64c13e2643f4bf4aeaeb60f15ea4eefc3538bfa
 EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
-EBUILD psycopg-2.9.1.ebuild 1320 BLAKE2B 979571fb982c3f10bc2e372ca057f58dd5853c548b5f0c6f323fc21130bd28a0f63efa73185401b104ef7c7ecab9a02d6b1031cdb21a94d6efa6e77fc3e7b358 SHA512 80df76f557598a869ae34a7f917863de7c93ce1a66dc4202fa76eddf360360019f45e98cdd5e7e7b3029201d41602f5bb8f502c4644825bf5b2f87847e419e92
+EBUILD psycopg-2.9.1.ebuild 1319 BLAKE2B 20e2e26a3816f02ca6964d730a6ccec8943e539d7bbeb4527479bd824ddf24186ab0b4478ca8f8b9d0434fad21af334c922338efa31019ed5193d80b4b6b69ac SHA512 a1a73dd8eaa28f4ebb5a819d2e2f031f6edea10a3b0b7356f1a63b7b3e900e2b83ed1711ec2a46838efcab826157cb09bf2e257705faeecdbff8917ca3d4db58
 EBUILD psycopg-2.9.ebuild 1320 BLAKE2B 979571fb982c3f10bc2e372ca057f58dd5853c548b5f0c6f323fc21130bd28a0f63efa73185401b104ef7c7ecab9a02d6b1031cdb21a94d6efa6e77fc3e7b358 SHA512 80df76f557598a869ae34a7f917863de7c93ce1a66dc4202fa76eddf360360019f45e98cdd5e7e7b3029201d41602f5bb8f502c4644825bf5b2f87847e419e92
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.9.1.ebuild b/dev-python/psycopg/psycopg-2.9.1.ebuild
index 7a7e34f73507..8b69cf001c15 100644
--- a/dev-python/psycopg/psycopg-2.9.1.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index dcbdbb852642..6087935829f0 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,5 @@
 DIST pyglet-1.5.17.tar.gz 6448500 BLAKE2B c2e27d5525c1e8eb5203b935b6a901283521ed12cf08b1d18297bd2772b83ee4fd721a9aac4fc41b6249b140b36e70d060d3649f4d2eb30f1e6f1f8fd42aa314 SHA512 3bb9594c02894fc58937b9312187b7848843d591fadb8e46553602ebad7c4b2bfd5dc615cc5f5d0cc1f8b59f10afda8e5130a0dee3c2066decb7af3faf114dae
 DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
 EBUILD pyglet-1.5.17.ebuild 1249 BLAKE2B 29ce40ef1be1efb2440908367b279b0ac865b5e10a416bb43f8fffd4bb89622ca4e43279e50731662fd7ff4803cf220866bf45c133b1a94fda54f34606b6d91d SHA512 e851e9fe37b43f1e656e454377643500cddf4473fa52d91345d754d858d4a2b51c3e1e8f5d3b10d441568f9c2183bb5a23d074f24cdc6812b8a7eec248a683eb
-EBUILD pyglet-1.5.18.ebuild 1251 BLAKE2B 175f305393e1a2783fe20026b0db49f299356eeee833b91103f7c788e7df7378d06012fe7147e6873995138704e2890b7a847a89105534912fd71de975f6ac1a SHA512 33709cade0cf49e502f0a638582c626a26acb4260eae857254472260510fa65fb1defe0e80e12ff0c43850b1e6cddea9345c13c4921417a1f2c3b72644a77b0e
+EBUILD pyglet-1.5.18.ebuild 1250 BLAKE2B d9bdf9bd9d243d3c423374456c0609a2bbaf30f02cf87e0ee676422b199024c4770b7ab1248cbf62d2e10cdfef7bd22f5c9ca245531e01ae9c03b8df81768adb SHA512 5d947bf695300235902dda06acc7be85a3af28b6c23835023996a502d4b892ea977cd6e942415b84f073f0005486afe3cf75a8d56a8646fb692af64c12d0fe6e
 MISC metadata.xml 1036 BLAKE2B ad16f5e991753cf8e6291b5cbf19f791684617eb8394528c0b751d57c9091ebb73112f9a4439f9b78eb2d648d0980bdfbfdeaf0c6671bf5d0521bb87f19011a0 SHA512 efe3d7ff5ae120e037b0521c45b67833f4cb57802596793704fee556b36e2a6f6797bd948254fb1ad50122a2927bea7bb5bf6b715caeb09648e7d4facaa6734b
diff --git a/dev-python/pyglet/pyglet-1.5.18.ebuild b/dev-python/pyglet/pyglet-1.5.18.ebuild
index c2c0bfc5865d..e533e64c024f 100644
--- a/dev-python/pyglet/pyglet-1.5.18.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index ccd5fd333620..423959c60e9d 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,7 +1,3 @@
-DIST pymdown-extensions-8.0.1.tar.gz 642787 BLAKE2B fe25fd828633bb1a653430431de9fd2f9abc881ff457d2c630befd7c094a147f4d4883088488a66c601190794c15fdfb8297a3252ba3b070412b2f18872f6126 SHA512 3f85bfe9128dcdc63cea4c2eb4d55173d697ae9d112559a74527ed64b3bd63f67eee119b81a54d0ac927bc21b6eb8411c03dc7afc77673739a81772c10ebe62a
-DIST pymdown-extensions-8.1.1.tar.gz 650451 BLAKE2B d72b4ff60747a5f2142b778d75ba438757f35e1bb45d1cf005c9ec7b187b8c6aa1e890ca1bf01b3a202dfd38c8f813c928041870a30bb2e0fc035e2a5ff9809e SHA512 a1472858b6afeb9b582cf97a4471e09e25dddcb0504d58f8aa703802fe0c075a0af2fa8e1895f02b48b5959297c37cd1feee789741d93a1739f9d19c3341b108
 DIST pymdown-extensions-8.2.tar.gz 766818 BLAKE2B db14bcb0e7bf572e97c6dc7d7ebb00780ce081f9006a0d067c98c369433c147e42b93eab0dfaddfed6f93030ab32f0ae1c7c0ac3c08a1f7f07fee15a1be1a398 SHA512 220465b2a2d0f9563c119dae61d2527207a4f3a1d24ea1b1585997c9c23c4a7c0bbc23b4dc7c551e533ac3af20c7852cb7b8cce6dd3908844aafcd801d20e14d
-EBUILD pymdown-extensions-8.0.1.ebuild 1555 BLAKE2B c16c2095c8ef9b6f279474c62c9f931257f30d1eb0a98b0cb9bf3120d18ad6171fa225ba3ddce9ddd158798850eca5e0f36253105b7aeedfb8abe9b33be67bf9 SHA512 83c34fb23bc4652ef28ad6290944081bf554663d5ea881f6699f373cc9e34f72ea08542fef2365d439c137329baecd44340df67d20397a34733626b5c45a9b2c
-EBUILD pymdown-extensions-8.1.1.ebuild 1185 BLAKE2B 42b00568115874f4cc6a7b0ba2dae3f34ecfe2463217f1c0283ced41f0140dd829eadacbcaccecec83a2aa0ebeeb27bf995de77027b5694a299b88e84a4c84c0 SHA512 e6a1fad2389362f42133bd54c13b8efa76f58db17c8aedc23b34538c2731433707117d88153b4ac914896ccdc08ef3d595478ce1e3ae55ef13f7ad8f9d60ea3f
-EBUILD pymdown-extensions-8.2.ebuild 1186 BLAKE2B c6b96e35f20edf2cc4739d8a48c3b5841da2600db2cf89617a9d8182ca2b87566278cc95e5e47b00e1baf28b87509462453285390d5db553846b3d4aea9f8686 SHA512 cf453c3792b8d8d9bda0713d24aece7e855797f42190d8d7f2e6df5046570303ac12f5447291e8691791ee1131fd29f6807b610e1fd100bdb555d955ca041353
+EBUILD pymdown-extensions-8.2.ebuild 1184 BLAKE2B 920432540f70db5fc8b30c1c4ccec75f7c679001ab63a32f244c7d1130e381a5a8d196f55c0154a0b6e4198f731c2f8a8165983c6f9c6a5088d906580c6ef9a3 SHA512 ef5a74a229e0e70cd28ce36ed1c01f28da92aab14541cf90eacaf3017e23098e255a6c6994fbd34a4bb33b31f4334d9b3a98e487ddc3befdee1381967af15357
 MISC metadata.xml 535 BLAKE2B 59f4bfe8eb59bcd482ed28ccb76baf82c3fb3ce15a3cf4fc342dc5ca8d0a0c47af6013a7c5d7888e93c1be22eaa326488580f3ff7764629081b754a2c650fb23 SHA512 a34f70e7d2acb37cd2aeed47b3b0d39899cde7c52450c83970e1b3b54575d32b621601783b6f29df8231985860d3ee9d59e9b007fc69f3cec4f2a2db1cfecd00
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild
deleted file mode 100644
index bb8e5e1c5cae..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown."
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions
-	https://pypi.org/project/pymdown-extensions
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
-
-BDEPEND="test? (
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Fails on whitspaces
-	rm tests/test_syntax.py || die
-
-	# AssertionError: False is not true
-	sed -i -e 's:test_no_pygments_linenums_custom_class:_&:' \
-		tests/test_extensions/test_highlight.py  || die
-
-	sed -i -e 's:test_default_override:_&:' \
-		tests/test_extensions/test_superfences.py  || die
-
-	sed -i -e 's:test_tabbed:_&:' \
-		-e 's:test_tabbed_split:_&:' \
-		tests/test_extensions/test_tabbed.py  || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild
deleted file mode 100644
index 53d62a8818eb..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown."
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
index 0c4df7459996..88dd4421eb87 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 51c3ddd3c77a..ad2ae308508b 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,7 +1,3 @@
-DIST pyproject2setuppy-15.tar.gz 11796 BLAKE2B 7fd7176fa611e293d35db0cb91a029c0896921947252ffba51ba25599fab5ebe7d4a5c2f65593ec83bfcc180983de6e2022053bcaa3583c3f6cce9640e57c5f6 SHA512 dee048eed352ebf178981fdf9fd69143a72658d9161e2d65257001b3ee6773bb7040d12145e79496cf141cdf86aa5e5eeaf4de7023c4e721a3d978f9eb267374
-DIST pyproject2setuppy-16.tar.gz 11902 BLAKE2B 13b9188d46064644ec5c549bdfaceef1a3df2da0d333cec37e593231cdcbf9277c81b32a95a2d2355a995feaec605bb0bb4610e51b1c06c1c3b50b3c9a73e1ca SHA512 e8e13644e5c88cfcc9f06ee9ece5c715ac1917d1eac9ba0d7a68a71d78ce84f50229890442c5c41e766083c302ae59f67bd20736e502615006cf35c41c2d3a9c
 DIST pyproject2setuppy-17.tar.gz 12191 BLAKE2B 5be19c9e70abf37d776649237581b1cb281331585c6ffa312f63e50bd2fd8104972861b38958272d5eced086b2a60ed370437807d1eeb382e4ad0cde5f03b0db SHA512 0291f9ad1c3059a4ccd366d8f1078ffd57de89cc128e996126f62a92ac4dded9c7da25be1325ca9f660062ba3a65fd01d62d4ffb22084cec7f4aba79e552ae2f
-EBUILD pyproject2setuppy-15.ebuild 781 BLAKE2B d403d6dd98399d391ef1ddb3201fb950f1cc99efb8e2f4761be7ad2b3b1b09254d86d19473b838b7c9e2a7fd0d359a6434174f0d123fb3bed848d0dbf4d62028 SHA512 2abbd4d0bed4683738b352b7f32629069bc29892077e72209dc591ada05e5276f36f2ee6f551a39ccb3158738e9270c59452e7c2ea46336158385c18334093f2
-EBUILD pyproject2setuppy-16.ebuild 789 BLAKE2B fe0e00600f65bd19118748c645d47c6bdc820037a301c847ea5070e7d6d73e469130fd9fbabc01facf39bc93dfe3edc7ebcc5c2c9511bda969eed68d03d228e5 SHA512 2e839ed0a1bd1e69ef9d505c0e2ff0236e093d76bb1018908f08207cb9830bb018c2d1ed8f511e6ac78f9525b533c1a86708b74f2e69bb0dcf3f2277a41a9293
-EBUILD pyproject2setuppy-17.ebuild 789 BLAKE2B fe0e00600f65bd19118748c645d47c6bdc820037a301c847ea5070e7d6d73e469130fd9fbabc01facf39bc93dfe3edc7ebcc5c2c9511bda969eed68d03d228e5 SHA512 2e839ed0a1bd1e69ef9d505c0e2ff0236e093d76bb1018908f08207cb9830bb018c2d1ed8f511e6ac78f9525b533c1a86708b74f2e69bb0dcf3f2277a41a9293
+EBUILD pyproject2setuppy-17.ebuild 781 BLAKE2B 7777a59955f823ae46991f592da9815467690ea129b0c68449e217700f8e5af25de53407c486245367ecb104a1e8ba570237881de37f9e569a7090ebd5e78386 SHA512 35d001fa3ba56ca4ce3748741dcc1c0761385f1416bef7f8d246d62ded57b94b38c5b2c12343d1635198d9dd1114286952f26e93e3a0bf947487750a84cc8f94
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-15.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-15.ebuild
deleted file mode 100644
index c8e912120f47..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-15.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-16.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-16.ebuild
deleted file mode 100644
index bc478cc41369..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-17.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-17.ebuild
index bc478cc41369..3c9e175ff5df 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-17.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 0bfc3e9b5aad..aae763d92a96 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,5 +1,5 @@
 DIST pyscard-2.0.0.tar.gz 148326 BLAKE2B ea9e3fbe404dedd7e7290743da4dfe51196beaa7db7ce69ad47316c70afe044cbf3e32666d32786e0d68f225cc6d552b7bb5c79fc62132c6fbee502868d3a205 SHA512 cf2cda96cdbc8f1abc20f969355a9c07698c7c13d826482170f7114962cc683b3c9b8a39aa19b76b6ae1e6c6e8875407bb9fa04908a0b22c96d0b3cbd234fe0b
 DIST pyscard-2.0.1.tar.gz 149193 BLAKE2B f140e3e62635634de8125d88c69e4ac3657468eef04798b4ce5b20d73905189ced71f041ef7742233a185aff8b28cc0fcda5af175d6dff21afeff84f062afcce SHA512 c9292b9616f150e500b308c47b0d6ed6f869f2022149c99a7789f8fef8c145dec4db84d35b6df30fa31d4007dffff75fcc21c9846693eccd9bd3bc8ec77fce5a
 EBUILD pyscard-2.0.0.ebuild 692 BLAKE2B 44c43a4eb72492a5ef29faa069ede7c51aa12f47a308054e241e1ae56f8dea35147df2afbbcfa0a3d7b80f1a56fc19d60a76a7a5b1fe1f2ffa5f16c0f7445a77 SHA512 a4b4aa1f9b94266f4ffe3551eba2de405253fa663ae7d35f7912e88aca30e168e70a2a473b9622acd0dde4c4c6448509503cd41d305ef3a6c73c0df5f1d4647e
-EBUILD pyscard-2.0.1.ebuild 691 BLAKE2B f7f4be5d9bdbebcab94de1bdac4723f46f705e20068159aeaa4d0759bb57353c7fea1b7498ff89bc60def4f1a076c523421f96fc64d02831a6e13c19c02c7fd0 SHA512 af3bca14731a7008a7374438808bd0ba2dfa067e815e8d7ae2fa54bd2e5f928c5cd2ed1c23470aebf947bc644e96cc28ac1d3a4c077f020008b4c83429a298e9
+EBUILD pyscard-2.0.1.ebuild 690 BLAKE2B 0fcdea4ad433dd3fd9cf2efda3aad417e3b0f43be27ec7b0239807fbc1d8c7e1a989474e16ea3c6a025c415487f2d09808633f7dc145e2e1cd23b7e1445a4ad3 SHA512 54534ea020b12bc6ece1e596f8c53b60abfed0e04ead29ee770df033c720ee3dc074549c57654bda3a79e97b041396daf03ca138f376320bb5782ce3b2556a42
 MISC metadata.xml 425 BLAKE2B d08b4263a97d671761cc9d5ba2084ce7ecef3d10031371ec4bf5deb4d43d840dbc34787d69c353ff0b2acaade7e50c512c15fc41cc7ee6a14d295a7ccc9f3019 SHA512 75d4e0a2023ee036c4b48f3fba331c9b97dafcc53cc9d071196bf08a5bef4e51c254eec6a1d7258b5bf5b14b93860ff5f16262983cef7b7cfbec9e05f6a806dc
diff --git a/dev-python/pyscard/pyscard-2.0.1.ebuild b/dev-python/pyscard/pyscard-2.0.1.ebuild
index f40381afb5e8..ec6604b6a15f 100644
--- a/dev-python/pyscard/pyscard-2.0.1.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND="sys-apps/pcsc-lite"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index e6466507392d..d5e809a9a7dc 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,7 +1,4 @@
-AUX pysimdjson-4.0.0-error-types.patch 1867 BLAKE2B 3c3383d29890363a3d16547bac57884b12ecae899b587ffaa78599f144a32f2cbc5978ee0b831e64933bca0a4caf2d670c03ca4827212c5ff5eb2d439ced79f6 SHA512 2b92745019144113f85171c8964056c0d56cd59f82da4af962cf3891b6056caa7be9601487414523854f03cc5e60c7b977a99ae23bdc83cd69e5fb1dcb53ee4d
 AUX pysimdjson-4.0.0-unbundle.patch 2582 BLAKE2B 2005c989186247775a8929b81fe5cf4ac2d7d7e83b6b4b3116f00456ad03cc2e9d6e554e624a129ef6e62e1e3310cdc57b97dbd5452d984865401ae88b057b07 SHA512 49a47e18b7da306bc347675fa1b1a822e9365ef3a5b9d4f3eccdef5b32d6bab9f5d110b93dd90c65075e6b21027d07e93ac6469388d6609b750ca9d72121de19
-DIST pysimdjson-4.0.0.tar.gz 3738787 BLAKE2B 744d6bc53511e03e8e716d6c65771432c7bf8f7876bbf8c78d09459a8b170d3d396f9cc8996894f67110f4b7389526d454dffd687b1fda22df7f76f027af44db SHA512 8b3040ce44bb5042b70a14d9f67c312a375d1a12ba7a66466935a48ad0f8def9c21e200c8c93aa755110a674e95920fa7d0567c4f584be5392b70719994a2213
 DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5
-EBUILD pysimdjson-4.0.0-r1.ebuild 925 BLAKE2B 9aef9bac15f86da401c3f2bbb2f53b7aa298bd8029ce8c91f5ceca7a5833b7ae0b9f3aca640cafefa746c408238fc53171742700fb668a3cff8648ed324e04ea SHA512 b22a40c50398deba7963732ea3360e967ff3bafd61b241cc12e1336f2c96da2fc91050f233689909c269247918213df2e0be932663a7f1e0f4d8dccc97da7ce4
-EBUILD pysimdjson-4.0.2.ebuild 876 BLAKE2B 3550d2f007405e291529f831ee7302cde9d81256ab19b6f9df45edb6f98547246888a3c899abea294e6332dd7d1df3bee8045d5793e746a0d229d8df593f6665 SHA512 f0b347a610eac7b6e21c1fd8b33798441694d69169df39c206d410c387c985b47d87552ca3dbd15c79baa2476aae34f2bc7194f5f53e46a77370557af913d152
+EBUILD pysimdjson-4.0.2.ebuild 875 BLAKE2B c3885af46c512f68eae0b2605368a09272dc2b61fe416e841101e6363191e574715fcca104c34f6c13f42dce61ba2b9e9e0230300eced63e3937555e36e6fd30 SHA512 92d93fdc48c43748f4e8359beb026b33899aa7cc71bae32196309fe5291ccf1d221af862112b376215ac275631c092ed4708633be4c25e2c5db11215a82cc680
 MISC metadata.xml 423 BLAKE2B 06f368507ce8309c6d7b2e2695fdfea636bb503444683450c76f8bc6f8ad7da8b7a0fdcf8ca478445dba7148bc2faad9a5c9f66026777be2c408c3765bf22267 SHA512 b24e60e618e2b4c74ec4a755e99faa0966156ceb188ae5c97feedbfc1d7c19fda73913632b977fe9a5f2ee4261c55b1c0df3488fe7303fe3b9e581cf57979f2b
diff --git a/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch b/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch
deleted file mode 100644
index 34b8f4aa9e29..000000000000
--- a/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 1145be6cac70ed065f2053977d470f3f771ac6a0
-Author: Tyler Kennedy <tk@tkte.ch>
-Date:   Sun May 23 15:55:28 2021 -0400
-
-    Empty buffers now raise identical error to empty bytes. Closes #81.
-
-diff --git a/simdjson/csimdjson.pyx b/simdjson/csimdjson.pyx
-index 095a183..c278e08 100644
---- a/simdjson/csimdjson.pyx
-+++ b/simdjson/csimdjson.pyx
-@@ -478,6 +478,13 @@ cdef class Parser:
-             # type-specific APIs, but gives much greater compatibility.
-             data = src
- 
-+            if data.size == 0:
-+                # If we were given a completely empty buffer, trying to access
-+                # a stride in the next step will cause a (potentially
-+                # confusing) IndexError. This isn't a very good error message,
-+                # but it's identical to the one simdjson would have raised.
-+                raise ValueError('Empty: no JSON found')
-+
-             return element_to_primitive(
-                 self,
-                 dereference(self.c_parser).parse(
-diff --git a/tests/test_parser.py b/tests/test_parser.py
-index 88e7207..d3a28c7 100644
---- a/tests/test_parser.py
-+++ b/tests/test_parser.py
-@@ -1,3 +1,4 @@
-+import io
- import pathlib
- 
- import pytest
-@@ -32,6 +33,19 @@ def test_parse_str(parser):
-     assert doc.as_dict() == {'hello': 'world'}
- 
- 
-+def test_parse_empty_buffer(parser):
-+    """Ensure trying to parse an empty buffer returns an error consistent
-+    with attempting to parse an empty bytestring."""
-+    # Issue #81
-+    with pytest.raises(ValueError) as bytes_exc:
-+        parser.parse(b'')
-+
-+    with pytest.raises(ValueError) as buffer_exc:
-+        parser.parse(io.BytesIO(b'').getbuffer())
-+
-+    assert str(bytes_exc.value) == str(buffer_exc.value)
-+
-+
- def test_unicode_decode_error(parser):
-     """Ensure the parser raises encoding issues."""
-     with pytest.raises(UnicodeDecodeError):
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
deleted file mode 100644
index e2b6c28fb206..000000000000
--- a/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for simdjson"
-HOMEPAGE="https://github.com/TkTech/pysimdjson"
-SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-libs/simdjson:=
-"
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pysimdjson-4.0.0-unbundle.patch
-	"${FILESDIR}"/pysimdjson-4.0.0-error-types.patch
-)
-
-src_prepare() {
-	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark::' setup.cfg || die
-	# force regen
-	rm simdjson/csimdjson.cpp || die
-	# bundled lib :-(
-	rm simdjson/simdjson.{cpp,h} || die
-
-	distutils-r1_src_prepare
-
-	export BUILD_WITH_CYTHON=1
-	export BUILD_WITH_SYSTEM_LIB=1
-}
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
index 936ee8de2d36..aea670752664 100644
--- a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/simdjson:=
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
index d4944b5c63ff..bf56235f825f 100644
--- a/dev-python/pytest-trio/Manifest
+++ b/dev-python/pytest-trio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-trio-0.7.0.tar.gz 47784 BLAKE2B 59b28df45e87804e0b6eb557a0cf259fdc3636cc7a03d78248fb814d55904ed01d00a530b194b2bfe93ccfb9de528d70a372faf1f6db24531c230319122db2e5 SHA512 547036c94f33cf8e755c88d608c5fddfa5c583fdaa7e604598d470e250a006c571702a81bac4f273b74450a8c10e4be404bad74d4104403fe1c9c70e872dff53
-EBUILD pytest-trio-0.7.0.ebuild 1101 BLAKE2B 28bb8ffb9091eb3c837df4f67e37a534f819df97ecfb5325c9f1470a85d1ffba597c389e1962c205dc37812eabb28154d96900442260f242f5e2cc71a8fe268c SHA512 4c407e6a2a8f4611aa3bcac144baf4189735798f7b5d47c6210a1e4389b4be43ce2898968a1c82a05d9b1904b6c49f52d78af3a60386750cd73f84b7d2a0aaff
+EBUILD pytest-trio-0.7.0.ebuild 1108 BLAKE2B cbf0050f27df6fbbb8f13d0db490b2482548b825ffcef31e1debaeb29452e63186e383e2223f21de664acfb15625d7ee7cc00bf4bc905bae49aa2ee01ce96c66 SHA512 b8f569da05df2ee80f0a42f2bc165f8f1106c83a2eac63023d9575ea66a10779ebb55250160f7b1d20540a290984e68ad700a3145883de49b08eb2c31da33a1d
 MISC metadata.xml 419 BLAKE2B e4bf5b235b2b851e2677e138ab488308deb5265d00afa1c5ff2760e817c7a8c9fdbaeb095bf63ad6c9ff0a5dbb60df5c047b6ab9564c590becb7da76a3258db0 SHA512 1d21a7481afb771ee6507f6475f9460bd0f8441de68987e2a31923091b33bba4a9fe5d6a8ec0b313d8277942656388c1ae6fb9b7cc0de601655762b66b111e0a
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
index 11892c344258..7b70309d75c6 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index c78ee9eea028..19baf106f327 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,5 @@
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1446 BLAKE2B 1b3c5fcc7ed94944772eaebd2f3b6441e0287a5b5216056209f7a584a38028423441ace3bd0b33afcbc3fd0f07ea4b7ebcabb2d2d911d2afe1b98de4130fb1a0 SHA512 e694429e3b585d35189324fce551fa4ed1ff1863b897ff759a95eaa6743b663c659ceb401fd35dab173160ea7f9c6d7317e24cd60df23e0ca6bd91e72ca12077
+EBUILD requests-2.26.0.ebuild 1453 BLAKE2B e073858423408b53e0c89db0c31445c60507a43d6670966060e931026cd27787b2b84691a8fb405036cf7dbd0c2c8680024b55dd8d6768da03bec373b15f2b40 SHA512 c3e83705eba56f4c3d08c3a9a1158c80f5c7f5bae22528209d40bc8e7c2a0027f8cb0d371c0cc268be19baed19bd1e55262289c7fcc34dd1d7bba23e24e23d44
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 9f732a314f7b..4436fee0e52c 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x86"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/sphinxcontrib-trio/Manifest b/dev-python/sphinxcontrib-trio/Manifest
index f71ba49be7bb..5f7a11dff4fb 100644
--- a/dev-python/sphinxcontrib-trio/Manifest
+++ b/dev-python/sphinxcontrib-trio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434
-EBUILD sphinxcontrib-trio-1.1.2.ebuild 979 BLAKE2B 8564e8ee80e444728259dd7761141c8972292ae7aa7a23e27d8612e4c63e0f65668ba0974f5abca8dfadda27bcdbeba702619ba5b2a16a69d317434d833fac3f SHA512 562169728184180e4fed07a34c5e72c7b00123cb469ccc91e4e9a1c177254ae1d25d6b9d0afd436fcc3108d540b1f13d597c14db70130c758757d359c94f12c9
+EBUILD sphinxcontrib-trio-1.1.2.ebuild 986 BLAKE2B 2ad2e1f3e2f7649adafcdbedfa9a5b89274a1536599e337c4d1a556fb802a66858039d29117912f5652e5455b2e22ed8317be2293dab36b2edf4ea26ef61784d SHA512 b71c09e2594766e577ac878062d07d7de9a3de7767c971ca26decac1a870e6a7d6196cd58993acfeed67a1ad041764409014d5f9acaa7a329baf586441528f81
 MISC metadata.xml 1117 BLAKE2B 947c7c2b888c24101db258e47efffbc6db4873c99cb9dd5c2076dfc25d25de04736db46d9fff88667f57f8f09f01c17f2937b2d7f641a8b7cb5baecf9d3d2b2e SHA512 57341896ef4194b5ddab0485e46bd8567c4514518c02e1049db21e9174c420175e47644d948c9c1a6dc03bd4248f235d2d811c6252be7c67f624e0b2883ff2ed
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index e192519714d9..2d42134bee53 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 37052c7a3d74..38f53201a7ef 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,3 +1,3 @@
 DIST trio-0.19.0.tar.gz 486036 BLAKE2B 052cadb8d251960b20349659b92f4d26c5b65128cbbfafee21a4a4b90463e43d9c9db6b35f3659d2b062c7d0b8b8914b31b38d2faed6c9d948c0ccbe85a0a250 SHA512 5297a3f48b786eac05b686f1e8bb0603a9c0133d6c4872a307cdc8f1e37aedb57d668b61c2568c82b7d1058b6604a22d2c5c2298f13d13f0daf8e9259aa76d7c
-EBUILD trio-0.19.0.ebuild 1460 BLAKE2B b84e95bbbd38381127ed4d2143768cd2f526b37315973017c14eec294eb277598b78e82778b22c9ea27115ddd451bb9668c93b3ff0cef9ef2967cc2d22d8d401 SHA512 dfdc72c7d6976b4872cc2e96fbe556d02c734dd7d270d5705b31559e41cc3400b56e1bc5b95153289260517db71fd478466aed6deda2962c0218dd51c1c715c3
+EBUILD trio-0.19.0.ebuild 1467 BLAKE2B f1236a3d6858ee521ba95a445d121eb331e9e4368135413f431061c4486b0ccbefac5552ecd2912d44e1615a24dbeb36abea7be0387b7f8bfbe8b84d988d4aa3 SHA512 7caf5982cfdb1e40dc4a52c9fb10ad86e92bcf4e01f840aec91cde974fa6ecd8e925d7911d99ca0678798ce479a5ae1539261bdee619037313c9e800db8c8a4b
 MISC metadata.xml 1958 BLAKE2B 303fd88e174740b04b8a3f5f7c4b55fb6279c54d7682dd455835a7071edc66c46b31833cef66f4880e4c047c783b928af81a1e8e9fd1e4f9303cee337bef103e SHA512 e916d2dcaf9ac82be7a1163d67017640c227e707589e830072f1af17328f77d3b721bb6014b99c53dff575a6c7448767056b436f50438c9ad04f820d1b292de1
diff --git a/dev-python/trio/trio-0.19.0.ebuild b/dev-python/trio/trio-0.19.0.ebuild
index 14c8b8b5850c..47262298800e 100644
--- a/dev-python/trio/trio-0.19.0.ebuild
+++ b/dev-python/trio/trio-0.19.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 5bca054ffd80..e1b45b85d6f2 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,6 @@
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-EBUILD wxpython-4.0.7-r1.ebuild 2310 BLAKE2B 83770d2ffd159ef3bd344fb8ecfb51e7039962ca305443bd307d91b7bc738bfa4abe48c89275ec980e80be8dec8486153fe6d34a4cde5d039a92be4ffe9477e3 SHA512 b09cb313c1359b196187901a1c34560a25d674f532d00f3ecc0fd8a71cf17c2760c35a5c35de1cf90683aca16bd00ef635f38304727c7ac3ab29e16cbb6ad97a
+EBUILD wxpython-4.0.7-r1.ebuild 2309 BLAKE2B fb39bdf1f58b27e9d0c55be6f6ea6faca3f6ef63f62ed56da59cad29469b263b22a8932f9a273fbd9b075f4723606578d06654b376add53bbff92119685893aa SHA512 baef30a3b16b016776ab77c46dfb080255a969e6f12ad9baf1abc4829a9b69dadfcc047294076486a82ec79717d773f52b7798165fa77ff1551387e03ed904bd
 EBUILD wxpython-4.0.7.ebuild 2273 BLAKE2B faf2c0361be73a32f7a27b5010e4fb66c0a7cfb899046f34373bf3c30c344317226bd0c12f1db0c71194084368f8bdb59eaab675fe91153ffc32d52eb169aa21 SHA512 52fb7e58b05874e3f878a23f1c7a27ce7795f89d58ad11bddfd50a30106191d0af034ad0a99826b6303a2de265c16b2a1334e5bdf1b65f1016e20e76d9889ed5
 MISC metadata.xml 490 BLAKE2B b268c95de8e09d5027a6dff7413f8e85030c64610f0f5739321bca1c66892981e2e4273e3e4fc92f3edbbcee1d2ede23a366dfec9ffbc17c8b015b784847755f SHA512 a33e6390e4cfcedbe7a2e950b1f447195f439747e37acfa6ad234b58fd449d80b16d342213e5190fa3143c71a5e95861f11daff1b61fcb5015c3a5255a27cadb
diff --git a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
index 46eb5b0e1ccf..a0ca6036859c 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 44ed7367308b..345a7b20eb9c 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/ice_nine/Manifest b/dev-ruby/ice_nine/Manifest
index 1546ec83f3e7..054ff9e64578 100644
--- a/dev-ruby/ice_nine/Manifest
+++ b/dev-ruby/ice_nine/Manifest
@@ -1,4 +1,4 @@
 DIST ice_nine-0.11.2.gem 17920 BLAKE2B d70aee3ba5d82719936e355bacd0c157fae262abb494c8d584e8530928218fb3c8a736e15903cdef2acd421fa5d08eafda11a0544651389e8b4b791299f1afca SHA512 e75237d901235dadeea159279b324982c6288d7c200ef3363eaa09340a480d5d94b8977915341218e6e2e6e439d40364f8569d757cdf47175bdc69ddb8d959ac
-EBUILD ice_nine-0.11.2-r1.ebuild 512 BLAKE2B f257d18de28ccd963ecd1c47c6e5bdc7ff4142eadedcec39be201de35bfc5d82327fc9a11408f56670b15a83050d09f82616f1715c1e7cb8b3632d317389c1b2 SHA512 ded4616f0d60ca7a2e3ef725b9a1be5094b196ca2de76b2c78b2253ce755440f456bb1f4b67a4d0ae5acee7280a0b68af747e166ac185060ca0dbac25e6aa308
+EBUILD ice_nine-0.11.2-r1.ebuild 519 BLAKE2B f39ba15b2d485ec5c13c6c21e1db34f4bcbbd016c62449d411ea348493cc4b739062945ad854b2454c072c530238f557ca658fe6139fabaa0c5a0eaaefc63cc7 SHA512 4b5222de91b4743635fe735e96a6a4f9a30f2d39a396691c25c52b32f4480cb6a59e907944a26e08abef2daa496c1fb2f3e059926acc2be6b5195ef38a8c653b
 EBUILD ice_nine-0.11.2.ebuild 482 BLAKE2B f82c6d3f77d67f3625d762095f13d41b2286bd5dfee0524dfae92c5e8ba9480868b10589316f5c27e97f652a2bdf7a8642231cf5cfdf925f362816585d914cd0 SHA512 375acc105766abd661058257f73b0a1d7e1389c7e6babc722f7cbf5ffc4574f0d85a82942dbdd989e4e7ea3dd4008cfc8808a59ac0cb3d0fdfe598fdf08f6d61
 MISC metadata.xml 392 BLAKE2B c266b687f07d70619208ddebacab2982db31ddb32360e98ee1ac693ccb561cf29288429a4f563b0dc03b0d8ca3d80adb8df8a2c24da351138dbf124b8f3b73a9 SHA512 9af884bfae6d4066b734267f544edd4b9cb82ec6ff01ba510cf404abd198ddadc626812978cfd3ee9c66015fe602f806d49535fa51c72df9d5a88973b32984ac
diff --git a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
index 714186ccb68d..ca379ff71f55 100644
--- a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
+++ b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 408702479471..4a611f4dfda5 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -3,6 +3,6 @@ DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9
 DIST regexp_parser-2.1.1.tar.gz 89399 BLAKE2B 7632b1e65e929f610e6bedc7954f81ca080f4f290794da617dbaeaae324186581a6e0ab78fb8d7311c33876b8cce090fdb6d4b868eeb80b82fa8461da5d82bfe SHA512 809b8c5f7bcceb0c31e97256d5a40a04bb7919cfa0a139e972e90a72ba15eee6dce8ac1f8e65f5e8f7a5f992a2fab91d6ae19f27a1f5ec7795fcc082ff037e13
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b111490dc0291dd4b050c2e0015ab6c77ee845b5b8dc0e34c4b223737e983a259dfa46a5c43cc0b10f825f8bb170e5e3168b SHA512 6ae591ed9ffa40bb8440cd05cec581a9a5126a2fe85768a0805d2c2e5b152aef482426a18836d2076e5cef313ce96484c686ab982ddaeb7f2a6f038ff55498d5
-EBUILD regexp_parser-2.1.1-r1.ebuild 927 BLAKE2B 20fddc1727e88c9389a8503610d4c8feef747bc990577f9ba78ba71d6c4cfa1670c34ddbbb14dc4700b0e69095c3bc7c9d05f2923f02e7b8b0d6bacce44368b8 SHA512 25c786962cfed96b84920e48c04198d3fc578fc8048d9a7c5a9f44c1d298126fe611449eb35944da998fe6f43d228ba9e177ee8e1a1369c1a348cd70111eecc6
+EBUILD regexp_parser-2.1.1-r1.ebuild 934 BLAKE2B 11397f326343c5484a4baa03a3358708c42104be6095721505cd70b6bbfef15fd791b53ece19a1646a06329c92edd4bb8ea2e3f32a089dd6fee9990977b42a12 SHA512 04be2a9d3793897efc063e6168b3252d4dc0070e42851313fe687194cb4e41658ffb59702ff2462c5cdaf00650a440451c8a8f99b7faba3bd192151ae6362a68
 EBUILD regexp_parser-2.1.1.ebuild 907 BLAKE2B 6bd68f31925a8eaca632e9e15c2863a080d0b0c81cf2ee09f6a96f30f8b54e6ce41b3a0be4ce45b7bc01713d952028245e9b08aa42cd197d710677cd6b4ecd85 SHA512 a9d499694fb8da3f72c5e306c266d43d55e12fb6e093c93917fa46ec624ad2d4ce8c9e1487f3d3b6b61b2f479d8a1426620c179efcb212b4e22b228b1382c1e3
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
index a4803be95fe8..0f263eb3ac9d 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index a371861e690c..f9e1770f8dd7 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
index ea81d1591223..31e87b7d9db7 100644
--- a/dev-scheme/guile-git/Manifest
+++ b/dev-scheme/guile-git/Manifest
@@ -1,3 +1,5 @@
 DIST guile-git-0.5.1.tar.gz 305077 BLAKE2B f1dd4dade424045f992f9df9fb6c0c6e010deab26d77b32c6a7febda20e03192c91a5ec024bfdf05ea9585c7be307610c1eea6d569a5a97b90d5eedf715e5c59 SHA512 b5a07fc3e2a6c8d6277b3a2d6c2d47461e76441573dcf02c046e272853e3d46266adb2025e15f203d590b751def21c026eb55ed66a6f81795c1409ae5d6aa3c2
+DIST guile-git-0.5.2.tar.gz 305493 BLAKE2B 03fa85e1943fadc5e7e2da4bed2b6476e5a275856ed087a1730815defc17586f43eb2006bc3970d6f97d42822bcf83ef3d57a74c9a7ddb2fb877f5f0f8237a49 SHA512 4ac55c04c555f1a343f842bbda80d54314697d5bbc28bc3967edfdfacb8afa07c673ef7fd651388a6c55b6977b041174732cde14359a0127f0b931364a7eeda9
 EBUILD guile-git-0.5.1.ebuild 1326 BLAKE2B c846b257e729e7c41fb7f59281373ede6d96321612d7a2b1582a1751ead68e8a5d671d4a70e28e0f4c71f08d29acb7a0b940992478d9138cfeebb09ed7ec2798 SHA512 642614d2c1aed98a302e9ee0283863724cc77af3554b2db387364ebc12fa619f8f4503eb97436e62238828fcc1369abc25327d4288da27e74429ecbaa8892b30
+EBUILD guile-git-0.5.2.ebuild 1592 BLAKE2B acade8b6015e3b7613a717feb2d83a8023c918853c938b4cc1446cc2b735d41d0500e3a47bf654db33554295c7d43b2de76269ec161b9626ac266b635de057da SHA512 b802a99d469cd7e7f53ba537877fd3e1d4434ce420625ccbd048220ffa45da27efda7e24da3436905d0be24048a72980b3bb0f916495fd76aaf20ef16b77864f
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-scheme/guile-git/guile-git-0.5.2.ebuild b/dev-scheme/guile-git/guile-git-0.5.2.ebuild
new file mode 100644
index 000000000000..bd0165fade55
--- /dev/null
+++ b/dev-scheme/guile-git/guile-git-0.5.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# I extract those manually from https://gitlab.com/guile-git/guile-git/-/releases
+# from 'source tarball' link. Is there a better stable link?
+UPLOAD_PV=0.5.2
+UPLOAD_ID=6450f3991aa524484038cdcea3fb248d
+
+[[ $PV == ${UPLOAD_PV} ]] || die "${CATEGORY}/${P}: update 'UPLOAD_ID' to match ${PV}"
+
+DESCRIPTION="Guile bindings of git"
+HOMEPAGE="https://gitlab.com/guile-git/guile-git"
+SRC_URI="https://gitlab.com/guile-git/guile-git/uploads/${UPLOAD_ID}/guile-git-${PV}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Works without sandbox. But under sandbox sshd claims to break the protocol.
+RESTRICT=test
+
+# older libgit seems to be incompatible with guile-git bindings
+# https://github.com/trofi/nix-guix-gentoo/issues/7
+RDEPEND="
+	>=dev-scheme/guile-2.0.11:=
+	dev-scheme/bytestructures
+	>=dev-libs/libgit2-1:=
+"
+DEPEND="${RDEPEND}"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_FLAGS_IGNORED='.*[.]go'
+
+src_prepare() {
+	default
+
+	# guile is trying to avoid recompilation by checking if file
+	#     /usr/lib64/guile/2.2/site-ccache/<foo>
+	# is newer than
+	#     <foo>
+	# In case it is instead of using <foo> guile
+	# loads system one (from potentially older version of package).
+	# To work it around we bump last modification timestamp of
+	# '*.scm' files.
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_test() {
+	emake check VERBOSE=1
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5f405f6451a5..be7a1a075881 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index c7956d5e3d4c..1d89e1ba5a3a 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD gdbus-codegen-2.68.2.ebuild 2182 BLAKE2B 741ec8a0d0b2d882043adab8f0e1226c6aff3414ab29b8b4ec8e321fcba5cbdd242e02e8a20d6538c3b7fca3672b2f5aa6d44f09debbce61d6442a377e78cfa4 SHA512 4e5ae6e7b0afadf83abee18973a71e0c0801f8cfded55df24baeda5bc182222f77935eb4a44cd881d6271c14f6972be097e9567c956a152ef15bef967922093b
-EBUILD gdbus-codegen-2.68.3.ebuild 2184 BLAKE2B 21ff29a3015f753d8ac4c0a8d7fdcbd77651a18195efc9666c9de47cf25082bf25b6e882c1febf84cab2ed60243947f3209cd8049b3b2aa624f175aa119a85c3 SHA512 1dc4d23e495ca2bad46af51f8bd6466dd2357cbc02877bb7d1f92af7d342bf4084399972fcaf6a4d9244f18a716ed70ed1e788709ec4c2edfcd75bcfada51efe
+EBUILD gdbus-codegen-2.68.3.ebuild 2182 BLAKE2B 741ec8a0d0b2d882043adab8f0e1226c6aff3414ab29b8b4ec8e321fcba5cbdd242e02e8a20d6538c3b7fca3672b2f5aa6d44f09debbce61d6442a377e78cfa4 SHA512 4e5ae6e7b0afadf83abee18973a71e0c0801f8cfded55df24baeda5bc182222f77935eb4a44cd881d6271c14f6972be097e9567c956a152ef15bef967922093b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
index 0ca0060ac287..bab5d3bdf855 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index a1dbbb83db6d..b06a00d4c812 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,5 @@
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD glib-utils-2.68.2.ebuild 2324 BLAKE2B 14053ce23924b454e18751045fecaf44fab2ddfeae9c92c94d51c4330c4e8e011481fdf36f0d3900f2df8db8fe6300df4b72fd806ddef79c0513e84dcdd18bbd SHA512 e9d496fd828a32ef852877913fbb1fc855fce580ed135e175644220429a4d49421278e7f6e4adcaf1474ed390284d287b3eb00ecbac37e6d585beaf70d6d641b
-EBUILD glib-utils-2.68.3.ebuild 2326 BLAKE2B 23d09fddb8357ce1e14abebb09740ce76b7229d3b29529ed8faa585a1429e83b06ea48a7c1c6fed671e1e4f3aff31f44fff5033d5d6a117261912bba3ee7ff42 SHA512 d1ede0e5b98364c0d5bb6d3e9220b21dd449c2a09b6821eb251fc1a7e000bd1dc6e0fea48011970ee9d3f70f43cb083a334085cddba840a7a31ab14832ff1117
+EBUILD glib-utils-2.68.3.ebuild 2324 BLAKE2B 14053ce23924b454e18751045fecaf44fab2ddfeae9c92c94d51c4330c4e8e011481fdf36f0d3900f2df8db8fe6300df4b72fd806ddef79c0513e84dcdd18bbd SHA512 e9d496fd828a32ef852877913fbb1fc855fce580ed135e175644220429a4d49421278e7f6e4adcaf1474ed390284d287b3eb00ecbac37e6d585beaf70d6d641b
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.68.3.ebuild b/dev-util/glib-utils/glib-utils-2.68.3.ebuild
index 30b73e45a7dc..b34e2c06e0e0 100644
--- a/dev-util/glib-utils/glib-utils-2.68.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.68.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
index 440f980a7c2c..06ea6b64389d 100644
--- a/dev-util/vbindiff/Manifest
+++ b/dev-util/vbindiff/Manifest
@@ -1,3 +1,3 @@
 DIST vbindiff-3.0_beta5.tar.gz 134192 BLAKE2B 9a7437833fef8db4316fd2c67a781868f6aead5ae47c7abc05683545bb3990950a465b1665ff5bc2e7d298465b3b1a427d6d67b43f59bd7dfb112143c9b52d2f SHA512 e6abd5cb93beffa3bc55455dbfbc98f0effc2a6667c8b9c721792c4a274dfe6f35ef121d27506fc9c951a1decb0e69886775fcf092a5f47fda82ed75ef760a74
-EBUILD vbindiff-3.0_beta5-r1.ebuild 401 BLAKE2B 38e7c29f7596a430c21c36ad43fdd9560e53fc4909c1244219b8bae8d7ab6f7bccce502775e592bf1c264f6ca00068599158a02cb3a65e23933d8c39c4fd75a7 SHA512 34d678418a60d7fafcc35ac7799c936462e506ec9cbbfcf14859eda9f9b2e05099aac45828b3cf7bab93430d0083e2374b09057030329288e009a8e5343d8d70
+EBUILD vbindiff-3.0_beta5-r1.ebuild 399 BLAKE2B d40a08d253d9cb5a442cd825fce66f519315b0796f2c464c610ec771bf78b789aa88f3a31cf24be2d5c8defff115964b2c9c99b21f4561a0081ed5f9f97ad0c4 SHA512 586b880e304af6a85060d13741087606abfb10449ffd7822ec87a3f23fa7a6eff333962521ba96820f8c26a16bcecaa077c34ad6805854a4e521e1107ff1ec96
 MISC metadata.xml 331 BLAKE2B 62db8c95752ea477fec8b7a7bb76c5cd7c6075f8d2618c476f8da83917cd893e6878ed63bc5f8ef039d7c32fd3e1dc8cf9418a454b94adfd889d7445198de023 SHA512 99149387b18568a36c5057f0b19d1a467632ffac30cd1917688ff1d590f673ba700e16ab42d3b5b2a214f5f933b4ff0c666bbcd7d2675608ca9368f334a9904e
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta5-r1.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta5-r1.ebuild
index 1057d7970744..b46d507eff62 100644
--- a/dev-util/vbindiff/vbindiff-3.0_beta5-r1.ebuild
+++ b/dev-util/vbindiff/vbindiff-3.0_beta5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mrdudz/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 3b0ccec0e2bd..5d6fb77447ec 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 33e9c900604f..c9b574e3a1d8 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -6,5 +6,5 @@ DIST librsvg-2.50.7.tar.xz 22224148 BLAKE2B 323d8125d73c9e72fefe7a868783f16332fb
 EBUILD librsvg-2.40.21.ebuild 2535 BLAKE2B fb7707a26b24f05ef9afe464f036d205e72243fe0b411ddc17b42a3f73bfd35e4a92b9236c12218d4bffb8edc825813f3b08cf164faf6cd1f96e689b76ac2970 SHA512 0ae92c01878ed45cd2da511bca6bcb86465723d3f71752168d5764b56d366544bc6bce1fce2d93ad497c901af8758db11bf3a53ad79389bcf54b16210bb18da2
 EBUILD librsvg-2.50.5.ebuild 2589 BLAKE2B 4b332cd6a04c97908a61a30d18591eb3e1b7e6901637abf9aea07b93b6da06f7f6df33bcc3e3a0663a48355271779643382d9065784a3356d2ea535bb5e87cb3 SHA512 bebb2c340fa684c2d0f86d140e919423a89a787ddc3256e28ef49a5a150f1836534348bb9d1da4521760b8532e537f50f4107dc6b509063fe00787c2a1586fc5
 EBUILD librsvg-2.50.6.ebuild 2577 BLAKE2B d1f7f58b9d597ec468632c9317dd98d049f25828f701322a97ff7da5d48b29010543291c95b69d28cbbbf5dd5abf74faef01ed99cbcf7b038806e6db358be7ab SHA512 a2f73a752c007ee1e29f75b8dff78c0526ed3a724cb6be025dccf72d4dadb65680e7c8fca97f496c9676e2e03719529bacb37a0580412804ed77d0618e6103c6
-EBUILD librsvg-2.50.7.ebuild 2585 BLAKE2B 0f84955408dab36e5ee976f87dfa6e96452b6aaf1eeef05a01e8b592688c08341c700978779379331d59e6b210fc53b25d663e94f4e57c8ae0f2dd7d8b9355d7 SHA512 5cdb07d70fc66118a91780fe18e0378d4b3574ffd4f1be27266b2bb1b5570c113a2396184095d632eeb133054754ecd319099bd7bbf2a77d58fc6480286301f6
+EBUILD librsvg-2.50.7.ebuild 2584 BLAKE2B 837696ae52e658d5a2d8332ef9cbbfc18002cceeae65264c82cf2828b3296ba989d8cbf0292a5829730d1fce6bf925fbb09350fc2b6bc97c2c448b78557a4abe SHA512 4e7b7fbf31a66cbda799da85320f72edbd9c44c7838e50623357be7ba87081134369183512145be44c66494abe657984d4af9669c91aecd99be4d00c0f6c4849
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.50.7.ebuild b/gnome-base/librsvg/librsvg-2.50.7.ebuild
index 2e17a1ddd2bb..17c60e5ec412 100644
--- a/gnome-base/librsvg/librsvg-2.50.7.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 05c4a7ed42b4..08d72a194b98 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index c8e472403569..10356f49694f 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -3,6 +3,6 @@ DIST gucharmap-13.0.7.tar.gz 1919890 BLAKE2B c90b09f2e52b27ea652a32c4a502a57767e
 DIST gucharmap-13.0.8.tar.gz 1920107 BLAKE2B 247b6683358e1fcbba02cad8146b8b1e7a4ccd5e56d3f9c6e597b47bcd38d11759a02e60d5635c3f2e26defe166b6e4ded696b5d1f6e1be6564d6139e3ed1ab8 SHA512 15eacbf351c8b2357e59913e5b4cccd279aed7a492351c42101dd26020658f2f4d7aaff2a3b95ca340a73606592f47edf9645c93234afb1a086362ef32904bcf
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-13.0.7.ebuild 1506 BLAKE2B eceabffc13dd3bf5c5fc3e0b0fec03de5a469a97a79143a5c8de9fd87ee2923b173c73b33bee6e575c4f23ca7f2dde1c430edd02e0b64821a25c821b033acaa2 SHA512 58561877f38ca9d8b66a599cce704e04e04b698f42440266bb52c9c98bbc4da83b2b0e0f855a513cac41c547f71913b3a1d0314b63789a936ae5cbbc25373f34
-EBUILD gucharmap-13.0.8.ebuild 1508 BLAKE2B 82de0d5e3d9a168407a2d991726708d18095f1c2a2a2cd3d2413e6cd9548cdad9f5eefa5a809cd8b1f0ec5081bb2e192c4a68f09aba7dbfb2ab0a0ce444498af SHA512 5bb18883e939bfdb65c9d34e78ec542d6d74ff942791bb0cc618dce5731a20aab8ba754d7d1ed88cfca02abd34dad25a8585350442c51bdf90c3f59c3e3616c6
+EBUILD gucharmap-13.0.8.ebuild 1506 BLAKE2B eceabffc13dd3bf5c5fc3e0b0fec03de5a469a97a79143a5c8de9fd87ee2923b173c73b33bee6e575c4f23ca7f2dde1c430edd02e0b64821a25c821b033acaa2 SHA512 58561877f38ca9d8b66a599cce704e04e04b698f42440266bb52c9c98bbc4da83b2b0e0f855a513cac41c547f71913b3a1d0314b63789a936ae5cbbc25373f34
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
index 53075594e24c..c5ddaa9831f1 100644
--- a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 UNICODE_VERSION="13.0"
 
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 347d1b9aca35..f7feadd9e8e2 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-40.0.tar.xz 660148 BLAKE2B 3f53c568358a4325ffe36fbd3df71c39f638e1757f9a684d6d67b252463be867b66e9f20c115df3053becffe9baf5f9bf44aec32cf7aef1887ee3a8eb4c93b4c SHA512 50ada34e76bc3b14940e7ccae368ef60802b8baf354ac0784260fd4408dcecaedf08697f249226e3236a54b487b86d7e00bffea6845adde42285f10d2a8f8e4d
 DIST yelp-xsl-40.2.tar.xz 660556 BLAKE2B 1cc5605f8a272c968b1deff85917e755d6ae13c826ccb21b8a14f8e6d2d21ea2d5ce5781350370994ba1f84009fea15789389b392f8ce111e67e3f948d042b42 SHA512 d365d6d873878a640244053efa9f2b9f7330a8bbca1c47073f0617c1f9150f58e91b48ac7d28e5b65fd113d612afd65b5f9c3d16a6958a957130f85d2f866483
 EBUILD yelp-xsl-40.0.ebuild 561 BLAKE2B 4a655fc2d410531316481bd762b2b7f2ee6ca4cbbba77dfb4b5152a9b39a00d669f9aed1aa33b83202ef9d825db7eb2cd9c65662d9f4f09b9ba05b0063fb90e6 SHA512 5cd83a4655215478ad72cbe3f9d38439084dbdcee9ef52d5254c1dadd5e1661bef5e9122dafd3658ff61a03399d2933de50765870126c9ce99cfdcb5f3585c2f
-EBUILD yelp-xsl-40.2.ebuild 563 BLAKE2B 08583fa7b45251b725facd0c07b0003e6c5456f5b048b4467ed4e9201d1ca9d2a4de73ba27647b7d70db0f6bad2e4ac4f57fe5be8e4568c27282dc3ea029d18a SHA512 704d786a017d67f155ce787e9f02ddc29dbd48ad41ddbc8ac68cc72efeeec51934755830c99c1a8dbd7cb8acdadfb4f0e9770d26406f299b1e312c20dbe8bcb2
+EBUILD yelp-xsl-40.2.ebuild 561 BLAKE2B 4a655fc2d410531316481bd762b2b7f2ee6ca4cbbba77dfb4b5152a9b39a00d669f9aed1aa33b83202ef9d825db7eb2cd9c65662d9f4f09b9ba05b0063fb90e6 SHA512 5cd83a4655215478ad72cbe3f9d38439084dbdcee9ef52d5254c1dadd5e1661bef5e9122dafd3658ff61a03399d2933de50765870126c9ce99cfdcb5f3585c2f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
index bf092fccf8bf..7ac0da7d4694 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index fd38f0b2e162..abac5a192c37 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index c6b1e30a6411..8de3f1daf9c0 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,5 +1,5 @@
 DIST libhandy-1.2.2.tar.xz 488508 BLAKE2B 1b764c90710de8a7960308b6441657799e6c3a12de9688f720748ca57653f6592fb4ba9f75841d76ae477af7c1709dc4f303658cc543c8de3f6f64d1de7d03cf SHA512 2135d3e15931fa143698de9200803c90e93c87b82c96b4fff90b75075c218a8ef2f69a26210bda8c10fb7195f115b11b804bb6de0b2f65cd464a7cefe35d0af4
 DIST libhandy-1.2.3.tar.xz 491024 BLAKE2B b15e4b12135230ce6e588e005f55edada001abaa3fbdcf2f05b5e05f364beaa8983239f3a562b8600fc07edd6b6b7e834d42a06ec1ec626d7a43d6634ba93d0e SHA512 20ed6708bb517c81d9b8520c522555d7cdaf36f19dd29603a4f86d6d47ec2552af8874605b1866eb634d25afd0a2c18690cb1be6eafce81cac7857890388799e
 EBUILD libhandy-1.2.2.ebuild 1245 BLAKE2B 54b5828a1d8a93caf902fb91b0398bc315e707e12ac211f4f9541bb3fe008f7d1701f3bfec9d841306df9b93b3998be3b1e82f284e05b8bacaa0526e81221328 SHA512 c0a3d0e87fb45b874271695706d5680e2d8f6f521fb62a3896929deda2d810fa094f8e79c62a9f22d14aeea8f74d1d5b0a1dbafc2fa54861f0476f30ad182e0e
-EBUILD libhandy-1.2.3.ebuild 1247 BLAKE2B 071fce1a5906628b0a40e326287628c1fa2a9e2c0d9b71e1671601f73833b43054656c3aa4b0af5a68d0224453f30bc9c5cb1801e73ff7996f65dd5c2415eec1 SHA512 d49db8606c70cc79b425b2ef553205901543e4715fedca7b9122ecb86933ba3b2f2393fcddee584962c23d36218efc303c734247907ca13b1bab03dfee39861b
+EBUILD libhandy-1.2.3.ebuild 1245 BLAKE2B 54b5828a1d8a93caf902fb91b0398bc315e707e12ac211f4f9541bb3fe008f7d1701f3bfec9d841306df9b93b3998be3b1e82f284e05b8bacaa0526e81221328 SHA512 c0a3d0e87fb45b874271695706d5680e2d8f6f521fb62a3896929deda2d810fa094f8e79c62a9f22d14aeea8f74d1d5b0a1dbafc2fa54861f0476f30ad182e0e
 MISC metadata.xml 353 BLAKE2B 7857afbafa45ea4d3230afa20992cf7196bdd23430ba09bd032b5965b3ce6b7ebadf8122b412549a84d798107adbce3f0b1d6ed79975f315889f7a7700187504 SHA512 f54a7b013a4b5f2e94efda2de95f8063a8755fb2162262a2734ea561fa10cd48be737ddbc3ab7ea93f5d1cf3f59dd91c70da25db5d331828aa74194109c5d36f
diff --git a/gui-libs/libhandy/libhandy-1.2.3.ebuild b/gui-libs/libhandy/libhandy-1.2.3.ebuild
index 2e4925e780a0..4caad0a11e8b 100644
--- a/gui-libs/libhandy/libhandy-1.2.3.ebuild
+++ b/gui-libs/libhandy/libhandy-1.2.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
 
 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 IUSE="examples glade gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index db2ce0104c24..f374f4c5e289 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,5 +1,5 @@
 DIST libwpe-1.10.0.tar.xz 52004 BLAKE2B 3088cb103b99ab626a74c37910d91fe8abdb07d14d0846bd202716fa1a7d8087e4095e65977e25d9a6f2b97bdfcef664f3872abd8de447ffe3e841a613ebc116 SHA512 b5634dd71cca70eb960f3c045ad109346ab6ce6b01aa8c8bc8f326d232eb16ac1600757896a4b99720af3c77084351ea4f69e2e2c81b9c32cc8bc12a5c66ba3c
 DIST libwpe-1.10.1.tar.xz 51984 BLAKE2B 8afb81e85d134a525a9f7cf0156632ea72a72ab94fcb06c411a11d5304b510cb711a1f2f948cb448bf1ac54c4734cce7a2eaa1ca34c2207c6155d4ab5c350139 SHA512 be1f366ae0d23326ceaab0fe4cdbaea4b50ab822c0e9e7315120fa665113d5eea43f5a23c8e5068f041322d3139cd4de75cfb0f03613cb40586fece1467afbca
 EBUILD libwpe-1.10.0.ebuild 576 BLAKE2B 3e5447e1a681f826dfd81eee38a8dbac24549e6eab817cc8accfc872a2215973fa28e98aaf6a801f35524f51e3079dc916bc3804d0299b5714638eb9c6e10b6a SHA512 29a9e522f8fdc3cd94262d2dd40c68aaee5f92cfbc7c97d9a562ceddf1ab0d60cd7f74c0208036a4d8da19dbd3e7dd8a564d0d949814af18b367cc67eee34671
-EBUILD libwpe-1.10.1.ebuild 577 BLAKE2B 84f3609f2cdf3c3fc3e5debac746dd74f0a08252cd66355ba326ad1c725b940473cc88184f5eaabeccc688d5e95978f59f8122535a0e31be0e0f6436a247efd9 SHA512 bdd557d543018bc6c92af3e9cc30c4f3f15f3095220e342dc0bf3bd990b57213c045443c7a7d02093b849e75385e28507f2a466bd47f89ecef8068ec04737171
+EBUILD libwpe-1.10.1.ebuild 576 BLAKE2B 514f93774c1acd01bf913ac6dc434023d5336a88d33a6ce47fbb0c1717e135abd2fc4fcf9aee08dfb8d4177c82ac7785ca0c63562a9c7e294fb852df07e122c6 SHA512 ee6163f2e7cbb6a50008de3689a64583a003bf2370580f2f477ad2efdeb21c090ebde0981045a9270de08d88c848b2e1042fe2984df432f8e8a5ab76684be84c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/libwpe/libwpe-1.10.1.ebuild b/gui-libs/libwpe/libwpe-1.10.1.ebuild
index 8bad05aa4bc4..32a2637fec72 100644
--- a/gui-libs/libwpe/libwpe-1.10.1.ebuild
+++ b/gui-libs/libwpe/libwpe-1.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index 3766221df8ee..896daf87b32b 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,5 +1,5 @@
 DIST wpebackend-fdo-1.10.0.tar.xz 38484 BLAKE2B 6b2cb4d4b1321245dee13d33ad58ee8d31aa4f5a25cfc2cde2bc2a67db15e9835de59f1b0550b7a205502b2e201398cf8032a0f235ae01f74e4568874cb47620 SHA512 50e65d1560b943ec85b80449c838b61d7ab3baf96844542cce06028bd934b1145319f3fa07a3dc629d2a7896b95ab388edbe853b7e377cf0ff02fb66291e1ce0
 DIST wpebackend-fdo-1.8.4.tar.xz 43276 BLAKE2B 03973e94ea19db6f9a3e8e9855d970d6b2bdc546a5a69e5e80d07aec3c2aa48739653c596138c798f766816fbc4b1df4da0a5ed5bf42969812a87b4670db502e SHA512 a92fea7e16b48c89789ffa35427f716900071d4e65d7f06acc94d28f49688f3ff344623cc4801d4f5b7ebbd740a8349cce064467826c41a7983cc90811805a64
-EBUILD wpebackend-fdo-1.10.0.ebuild 657 BLAKE2B b436809e8006eec6fd36ecfa7dbaf5d946286daeb48fa053c05440925a9b03eefee907a791573530f616c15bc9766d5879e61b0fed942c3d57bdd036505c6f11 SHA512 92fff51b337bf50a71c6def7709a047fb0a6dcf80848a590c4e5f156d94a5bbda3b4a8e84d8e773fd5a0f857e73c598809669cfa6026b25b79b4edad98b09922
+EBUILD wpebackend-fdo-1.10.0.ebuild 656 BLAKE2B 476bc19ad4fae904968f6c248a24f3b46b2130cad2254ece5c17e1d64cb2d8670254c8c11f80747726c303c1d776562ebaef8ff9f0d4c72e1ba44aeeeb1f1e2b SHA512 9f0854d6c3a5159a13de306880478dc10905fb7b3edd5cb9a8c025e649ae1dfa77976637a86f83304c6e1bdd8d4a312126e9af6d44a7359552a6947972be594e
 EBUILD wpebackend-fdo-1.8.4.ebuild 632 BLAKE2B e378d5bc2552808dfc7b86bfdfddf0d4728f0836d7bf8041a4d0891215c187a35db3e398334db7879bcc5e8fe08c9e91c7cdfcd810e7f44cea5acef477b8d003 SHA512 2621f6ae818bb841c755d7cf0cfafde23cc40b87f2fe62b84387f0211081a9eea1dcf20b6a3b0ca780ac2602c1d07f987b6c2afe39cafdaded2ef84b17135d5c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
index e15da8d795a4..d02a9804988b 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	media-libs/libepoxy[egl]
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index ac7b9d7d640e..07fba9c289d4 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 38b731d76c36..0634af17e386 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -5,5 +5,5 @@ AUX nullmailer-2.2-disable-smtp-auth-tests.patch 2383 BLAKE2B 07f2fc7517df280fac
 AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70c6aedbe0471f042c2c2e611eedf768071715b7f42a94b2b41e814a87dd87777810cbb823d20138d40f6aa3aba93ebaec89ebb6d9e2f3 SHA512 10873e538dbc89e8899047e732515d30108b25fd0ff6bb2fc695f5790a94ac32629f41c470a2fec951357169fead36ee4512f543ad0e02c52f09799334b815c7
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
-EBUILD nullmailer-2.2-r2.ebuild 4272 BLAKE2B 6e4f807fa141733459c4200f647d5fd070b690de23007e7e421bdf980b163c76a44fd6dad94cea5fad8bc8db40bed032fb13945563b9e1b23cba3de85a76cd27 SHA512 3b328fbdea13c38d9611b1c61ace247611da138eeb888535fe4ea3907dab55d6697a521875df09c9c810debb98883e3eaf4fdea78a10f2ffe8ff7c496836105f
+EBUILD nullmailer-2.2-r2.ebuild 4279 BLAKE2B 0f2e399e92a484037fb23f2a1207300d7badc0de1ae86235294666eb1044dc8fe6b666e9e7208e765da3ff5432974a8ab5d5fe3a6586e9b5ac528f65ef2637b8 SHA512 14fbea561658b5a61b2c2e32700b92cb4713745f38adeaadef0dae3d2a8d5c6a7e6671ca3ce13881d17ec6a7238069d0b03fd2da60f08412a3970455636fe585
 MISC metadata.xml 342 BLAKE2B ac05adbff1c06a41efb8b6c01995d7061302e3e829fa07008538aef00de9ef00e8e665a2d45e51e0886d092a9f492ac1cb194f9ab614b944147f9a8235608c71 SHA512 bde55b4d0d452321cab14b1f38dcf2f27caa6586acc1748b9be1cb6981c0e4e90e909129d3700f49a7405f8baba80c3182d6ce84c75260a87019e8be593bc091
diff --git a/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
index c2c537a1e4ce..f063565fe0b3 100644
--- a/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86 ~x64-cygwin"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86 ~x64-cygwin"
 IUSE="ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a05137d8eb50..feb0c5d202fd 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index d0ff029868a8..3cb180649869 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,6 +1,6 @@
 DIST glu-9.0.1.tar.xz 434632 BLAKE2B ed624b107a97ac84517cd0fa740090746ab93c77498135bf6dae3ee488e04afc93b0d239aba15533de8ab407d3d3d5e7cb5086b29985d93037e78753b249741e SHA512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018
 DIST glu-9.0.2.tar.xz 436176 BLAKE2B 90485938e4809ce7bb56da25bd60be9f3f7b7f40d511ea6635e40d749e519d1dca6241d891224d3cf331b911f545df4ef9aa2101baf4e3b18df69244edbcb8a4 SHA512 2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64
 EBUILD glu-9.0.1.ebuild 1010 BLAKE2B 078af9acf532164d49b0a31a3a3da31d6c7ee3dbe696a8113eb29fa0a1943915b0aacaf3d082688c4cb34ef046edd67f8dd9be4ae3517460a9d527b122b08fd7 SHA512 434aceecdf7108304d26b077e50978064471acf01399a72384c0d7e682ee996ba3aca1262a7edd0a82e26525c22798e0c6fce84b2af74cc0f4a1a96c0b9bfc31
-EBUILD glu-9.0.2.ebuild 897 BLAKE2B 45dba9f9239273f10ef184aea1be13db4ee88a72727301758ca82b5b5ccab651ea35bdb2a97b968f2ee6b4b76783cc9ad993ec78a2faf4120b0e824fdfaa557f SHA512 31d333b7e83280eada99a79ae5f45de1b6e5c54bebc3393626252d7784821f284966c0848478eac2ce6aa003b4df0a56ec90843f7433f319b57084a3cfbe2e18
+EBUILD glu-9.0.2.ebuild 895 BLAKE2B 9f8553bd91c8c3df44e2345b0522e52c0eb2626b14136cacdaafcc3cd72ad6a61eb33bf7e1e6d1216e0483cec12410a75b8f4f58047e028cc68e90d0612cbc02 SHA512 e9bc3f91126c03f13e71cda597d6c9feb56c9ecde35e99c12b5ed7c70cb9ac323a1d12458eedbc1efca5d4f7bb491d4b8ff3e85de0f892cfa1635ee7394bb766
 EBUILD glu-9999.ebuild 901 BLAKE2B 2377cc6c78fd9bca5a1c31e2ad14cb30e5f97cb0e7f9be7d2900874e6b1d8481766afd939a6c312f98a6e55d3d35cc7eb30ed1f971e4ea5473f4572fa3b01f85 SHA512 4bc9bd397157b3bdc2767b75537650829502a278276479d8b5d153649286c32e39504ba8dbddfe79cb090f3d874eb730cb959af201374c89b7af3fb0aae8da0d
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.2.ebuild b/media-libs/glu/glu-9.0.2.ebuild
index 61d7a20c4368..022b44953c0e 100644
--- a/media-libs/glu/glu-9.0.2.ebuild
+++ b/media-libs/glu/glu-9.0.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
diff --git a/media-libs/libldac/Manifest b/media-libs/libldac/Manifest
index b0e9b1cedf98..a46b025aaf31 100644
--- a/media-libs/libldac/Manifest
+++ b/media-libs/libldac/Manifest
@@ -1,3 +1,3 @@
 DIST ldacBT-2.0.2.3.tar.gz 75708 BLAKE2B 9f9ec1aa8a9603927067cd01058745db615a89652d16e870d9eb0a4db270a4076b7bb70ba091948249969087e5b26b86e22656314e3d26e43311fae982472347 SHA512 0e42723a1e7d748b28b13d73823fd5378a64100d5e27ae90cf3214494f3e199c526e219efd1329b2ec2b3195e1a6b3c98c8210ab7e4e6b98077199ef0f64c02e
-EBUILD libldac-2.0.2.3.ebuild 606 BLAKE2B 6151a6c99671886fa09e5feee6b1c47aa5effd97ca5aaf33ad424c08ae20d73c8d95812867fb0c5850254be7e06784c1be9ea2f805de17ba626c0c6e2ab3d6f2 SHA512 ecf7a9e606c72c76d26bc15634cfbc0d195c3fa0474698a71e4e4e0e4df9e50281a4635ac2044c179bc86658caec71262e38c20ebdad080bbf49d230cfaef858
+EBUILD libldac-2.0.2.3.ebuild 605 BLAKE2B c0cb28fd56abad676b9a63d30df7d4a4ba274998d756c534ebe9612d089c52268c8f208a2c42f9f01e31c0cc68d45643cf9d87e360c0fb9024fed9723cb9812a SHA512 ffd141c5082b0068f8cf4057b56f94d5422c96eef1a31f759807a5a4e05f20d99b4e22abc0755f688db949ff6a38401daede1be355658ed499b5a252b8ec0892
 MISC metadata.xml 294 BLAKE2B b538426aee9fd5b62c00e4ff45c2ad8f1debc01fd47c73888f00bc8af07565f0d64adcaab29836efa44dc78ee286bdca31302230fb3de99e48bfcfb91be3ae8d SHA512 a0446763cd8f9d5650a05beea3fc24712565c60585b70d2f1b704bc606f9fbb62a8905da2bd392b45c0b6f3855c23d4eb6139a58c005c705aecd64212a7fd47d
diff --git a/media-libs/libldac/libldac-2.0.2.3.ebuild b/media-libs/libldac/libldac-2.0.2.3.ebuild
index 539bc249a444..3c8da7116322 100644
--- a/media-libs/libldac/libldac-2.0.2.3.ebuild
+++ b/media-libs/libldac/libldac-2.0.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/EHfive/ldacBT/releases/download/v${PV}/ldacBT-${PV}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/ldacBT"
 
diff --git a/media-libs/libopenaptx/Manifest b/media-libs/libopenaptx/Manifest
index e15da47b8cbc..0a9dea3b4248 100644
--- a/media-libs/libopenaptx/Manifest
+++ b/media-libs/libopenaptx/Manifest
@@ -1,6 +1,6 @@
 DIST libopenaptx-0.2.0.tar.gz 27797 BLAKE2B b178a9aaf78796c9219d9e7066ff985ce9f5dd86a6926ae22e373f2822090ad313efe04d5cf607940f1042bd27ddf5484d7e8298dfff91a8ae5596cec7ad5fa9 SHA512 d57e5084b398eec2ad49c9893baa496651c139abfb95692c834a4691bc4bb951d0b1afdd499a8b67c84b873407b584965d3a045d8ef3d9e62b3ccf45de22809a
 DIST libopenaptx-0.2.1.tar.gz 31575 BLAKE2B 531a1b4e8f4a711bf1b36dfea2424b23821dd4f0b50cc367e1298fc7a41f32ec494fdb25907173d1e2685bd0af74d3ebe5a7a3f221f2e57e92bd6d6e2b8b80c8 SHA512 7c7f515585ed41cd276cd3141037ce21e3ebdb713dc932bcdb33320d9910c734bc81e581e2c09b3399b3516c789e5da7128fdab5ab6b5e4f42a86b6ac6d3f28c
-EBUILD libopenaptx-0.2.0.ebuild 1047 BLAKE2B dbe9c841082b67a52acdd1984cba4c44b21f18d2fd36fc3912c4160766ea87d84873900b1dfbf91e9c38999b8295bb1cd5f52f5210fe48ba64e8b8140cd18d4c SHA512 a3eb916ed066267a9020faf08b76b93a0297a30bbb830a596f4f88b079a561658290e27220dd23004286cb53977ca562ff3b509aa57affd4a07a2018cab62ef6
+EBUILD libopenaptx-0.2.0.ebuild 1046 BLAKE2B c6b661e613d2a65a4187423f01495b4b41359edd0e1a9c599c2a9414f3b78a31f748e3e0974079093e31fc8c9c43e0f6113daf48282d9b6fd7239694af61ffe7 SHA512 432b08421a315e28fec95f7f5ced2ab617c58abf1d0cd764072dea88d933c3fb42a6ff2ff20099dd7a9a25dec8c400363ab784b8792507361a7ab0628203eb87
 EBUILD libopenaptx-0.2.1.ebuild 1005 BLAKE2B cd47a46e7e6ca06e1007e2f10a0da8000bddfc0eb4b8d6242816e387dd88d6c4242875fc9c1546753651fca17c495b1485f59ff1ba7541046584531f3e1944b8 SHA512 0aeac424ce3c78db1c5d8853c35b39fdd2748cef984db7c5e20ca5dd298506a508712e2b09274ba6e23fdb5f604305dc84d30b06d22fc1ac6f951205697a5fc8
 EBUILD libopenaptx-9999.ebuild 1022 BLAKE2B ed3d85400142cf3d3fd9de1bf37e2cda897a952f07d2168252c575b0701d5a9003846f4b5605690512bf42f76c69b1f25c9e3a8ca2f0e52943dead7930504179 SHA512 4e9477a48a0cf0d4daea89bef6819b23eefbd8e619cf0973554e56306a450090a3ee7d723d23cb6be7b02c901136cff38c6be8f72844a01c76104b86f34992e9
 MISC metadata.xml 475 BLAKE2B ce3ccc5f113c6178230b372c55e9992731ff55477bdde2efcca199b73d7b2ec66419dcba89c3f368ff9b7ef54011bd92c6cecaf9b3cd64b5a6ab8ea2e0b0d1ec SHA512 7bde88afdf7a137ea5ec1b491dda467eec36d2897f0bd009ca22066614db64531fe5b343cdb426b1e80ef6cf8011db1c43a0a525b9b302496e04cd7d2e97dbc0
diff --git a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
index a7298efb98ce..c187ac0fc1ae 100644
--- a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
+++ b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/pali/${PN}"
 else
 	SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index aff0f08412f4..0f7ed1789d49 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -5,7 +5,7 @@ DIST mesa-21.1.5.tar.xz 15286704 BLAKE2B 3cf5577e3c47e07ad52460383843e2f9147b761
 DIST mesa-21.2.0-rc2.tar.xz 15599008 BLAKE2B 546ea33262b5349f3267ae68f9e2dfb636573ef962c636669241c904f0756187a4caf8cd4150307d2d7243f7bf3e0aa723571f36b7387635fe717363f62d105d SHA512 1701489fa56731170c9ef1ba209498f5c6219cfcc6a1a55c3c387497df997c089d17c66ce621609f6346bfc1b3b3c836280f448a3233ac35eef60b4b5a48424b
 EBUILD mesa-20.3.5.ebuild 14915 BLAKE2B 73f85b8bbbbbbfba3be499ba55ffa2bcdb5e6f860049819502957e803c2760edf3e45ada1f103f58752e77177065ad12d81ea72c36f96c19c6ebc87d1fe03ab9 SHA512 0b1dd3fad90392be514da0d347efe19b35fe82d13ca02d959f56e625d00a9beb917c83c678e7d6ad419dc81b6fc32e0dd8ca6f95f5fd77484872af464f9ae52b
 EBUILD mesa-21.0.3.ebuild 14826 BLAKE2B 1c9793f1dc8b7769406d49d02fcf152c2b21a446972fb754871ec5103ddab1eb93bfc52aed895bbc74b9c7a6743c360d5cbcbc0d1ede2cd28307eb243803a77b SHA512 3b5db1497b6b99412353134139bfd2abac642989d1570d4c8d2172dd82e63aeed6ef1bc1d7ce0c2653288a6c7bd8a6315494ed152deb627fc3eb304a6d5f9be7
-EBUILD mesa-21.1.4.ebuild 14936 BLAKE2B 8cd4c9305cab8084015db25061a5098f1e686e83001f75d25eb2aa9dae82f2c545d3c43d36aa769e46dbd85a555c23b103fb148b2af5957334bfea4435be45eb SHA512 e8a8255ba66aef51e74de4a2490affd4bdf75db8d0e94452d7df2e3cb47052d35f6b4f9865fe3236328a9d8679712277fb3de9ff5c0a6c7f1a895449c4da8b96
+EBUILD mesa-21.1.4.ebuild 14934 BLAKE2B f08ed9cfd27d68a019d1bc03cea4d52363498b1096336c1cdee1b7a87bc815d43783010f1d5a3920876fb2a3a03b848926b6c31bccd1abeab055f67785ed30bb SHA512 4203df3c7c16d752dfdb58531179e5dbd30b0801989f94ee9f4c7abd704fcda97306611432e5558c170a54e169f598dd09fa15dad09ed0eafcefd274ce6e5050
 EBUILD mesa-21.1.5.ebuild 14940 BLAKE2B 9f807ce55721b04414263282a07b055520f4dc6f56da01271ae2c9f3e8f837f6fb056f4ac1073cf382ff2aa713d0782d7b60f9217f424f593dcc76e447c33efd SHA512 ab0dc007520319f7cc591b784d59e315785691ab081d00a1ae5e8658011e2e1fe293cacece60850217f13a1493dd49d83e8ecb71cece3a6790025f4d66f3a392
 EBUILD mesa-21.2.0_rc2.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 EBUILD mesa-9999.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
diff --git a/media-libs/mesa/mesa-21.1.4.ebuild b/media-libs/mesa/mesa-21.1.4.ebuild
index df605cbfa7ee..90224c1377e0 100644
--- a/media-libs/mesa/mesa-21.1.4.ebuild
+++ b/media-libs/mesa/mesa-21.1.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4ce199282049..1480cb5b31c9 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 3c49aa49dfe9..587132c28e5a 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -22,7 +22,7 @@ EBUILD pipewire-0.3.26-r1.ebuild 8742 BLAKE2B 112df615c5e4549c2d3d44e19f45d48eb1
 EBUILD pipewire-0.3.27-r2.ebuild 9303 BLAKE2B 692ca1e00160f1c07f9962e1b9c22ba6185e4d97298084ef295b5688b79fa1d9b573f675c7d2a25e28001cd0ca6becba2da4e71243354dfdd41b3f97d364bc18 SHA512 128349b662a3f25159f072d998f14291db8185e3d39dfd1c5f081eb54b55bb96204cb34ad478e6f4568df3ea86b0ad68f1fd4673ab776dd49a85351bfa4cb7f4
 EBUILD pipewire-0.3.28-r1.ebuild 9375 BLAKE2B 8c48d0a74514ffb887696a078c20f8c52f583b7ad376b8493b796a5a173bf179c2927f7c04ada6a37a1e8708e3137680b958779652b475b43ae26e56d8adf98f SHA512 7961c80768d42f41a18c814cac91b36504a68f21940b30795e3eaf26b49039f43a64a30855b1789cd35f04fe89ed337fa0828f68dad68e1a9b5d67ec7c3bc1fd
 EBUILD pipewire-0.3.29-r1.ebuild 9394 BLAKE2B f14cffd0a50e2405795c56ad277c53e52e1b2b0121f4c0c207246b69f0a3029c67632b664438f15c34cc2f71681d9f8083e2a420d2c2018198d3b61eb127cc43 SHA512 b32f48d64b899a99a6fef1c7fd8045ffda792588950607c568ad14df18ae52731f001bc96c88c6da66e7c8d3ec3615a15f3da4136fc166e2958633514fdbe9aa
-EBUILD pipewire-0.3.30-r2.ebuild 9677 BLAKE2B 62e6ec28bf67661acc51f067e298f451ec6331a445ff8963307ea85c08b87dbb596ae16432405d5273bf561f2ed3afe87164070a5ec36dfd7cb16e0d1b6f3c4d SHA512 5075db1140d524776ae7e8503298c10eaea0bf3e5b8bf81dd9c7f34a142072d7c294363eb67f21481697c6487ebaeb6c45882bb25f9d73b7ff363a50cfc46711
+EBUILD pipewire-0.3.30-r2.ebuild 9676 BLAKE2B 0a830a07130fbbd97fb0e34ed02acb848e9dd1c6edb7f5e90f3b0f67a6fa9cf270ba914cb1b3db2439519f22b71ff63d78293589a68437610bf70855ada8ba25 SHA512 c5bab51ec5659176738b79ff2299794f84010cedfb6280198ee4c709f76d9cf8dc1b91bec70a132cfcbe074967b254098418b27e2dd9228445cf33b9e507140a
 EBUILD pipewire-0.3.31-r1.ebuild 9681 BLAKE2B 539e8528f06605c1874194f9e01d92e6a1e35550c9f177964010a5b39a80ffb027adba89b2aa6ca8a2f59c419e0ed383c96102e62368fa1a9402dfa55a70dabf SHA512 595f83d2f06fc36d5fe83cbc054da9c20f555a28eb443ae40d0b49ba07ad73b0608abfa638285b015117c09d0024760b6493a6c7b2dc435e17412d8326dfbdd8
 EBUILD pipewire-0.3.32.ebuild 9594 BLAKE2B 3e0195e9aeb8e4c2d8c9258d3597c575eb4e7d4a6812fc5479ffd8007bf3eaf8faccd58013fa3e59ba23d7843094e2ab72feb89ce2c4ced6f24ac8e1b887ab2d SHA512 829cbdde885e5d0a72f2a30f2d69058308bdee8ac79c0b001775d36efcbf616c347c0c7b555c5966883fd5fdc4a60303d0ff6ba42f0026eaeabde509a4fc6ba7
 EBUILD pipewire-9999.ebuild 9594 BLAKE2B 3e0195e9aeb8e4c2d8c9258d3597c575eb4e7d4a6812fc5479ffd8007bf3eaf8faccd58013fa3e59ba23d7843094e2ab72feb89ce2c4ced6f24ac8e1b887ab2d SHA512 829cbdde885e5d0a72f2a30f2d69058308bdee8ac79c0b001775d36efcbf616c347c0c7b555c5966883fd5fdc4a60303d0ff6ba42f0026eaeabde509a4fc6ba7
diff --git a/media-video/pipewire/pipewire-0.3.30-r2.ebuild b/media-video/pipewire/pipewire-0.3.30-r2.ebuild
index 4017b4dbc693..b9e8cc5883d7 100644
--- a/media-video/pipewire/pipewire-0.3.30-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.30-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 736cbbbf3c95..bfee06646c0f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 36c501de0268..e287d533e2fb 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Jul 2021 10:38:56 +0000
+Sat, 24 Jul 2021 18:08:57 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 2b69c03a9c4d..203e42c43283 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 517807 BLAKE2B 2ecdb63e9cfe1a1b71d23ab4fe58b057928be5a410ab9012b87ec1e7c917af227099229248e5b2c7dc5b25edb96e4adad920259d956349d0ecbb204178f8da2c SHA512 4ca9cc06a8ae7d4eefdd8a435b92f1f4e675295b618afdb11cf1d7f45b49f0fd5137f7f0c81b60933a8b942fe25de9928a9f4ffe0d5968bae8eae39c95a7da50
-TIMESTAMP 2021-07-24T10:39:00Z
+TIMESTAMP 2021-07-24T18:09:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmD77cRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmD8V0BfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDkyBAAmRqjylEIbuXdVXNAAONSpgaE5SdtjXCcN9xG0Co4IaUqqD6nTxme8Urj
-doE5xAKmxII/K1T1knbbo41gqantFqcZe7KTGBiOvheDs0Y9r6EGQy0AQkYpKAhc
-1WOp2sBU1YTeFZjVwPfPeeVKdUtbk7r3wRltHyy0hmEWJCnii2J0xFBYOlDvD/H6
-gft4/FzuYu3ddBmTnEpoeZL+p2pKWbE1bwbrraRNKSKgrA9WHvKKZ6KnX3i1UyMA
-HdKGD7IyEKo16OMvIz6JC1gjpW/15PEf0sh6CS8/k4L6Nz/AwIl5a+GSmqAwyoJe
-VDHDEx93w7k7qipf34c/rnSoGM5o7RxNnoINKNmjdccVNMAAPremPiEigtHEqm3y
-EzLMmHcCOF8ozP0krArbEsivinB35mYSbOdr5/Axs9ziBodh5aHJXFNdc4v+PtZx
-KL57ok/lo54B0mNTRe7YFcGUSK3ANWYc8wWIYXj4LnUzKrdnVGYGSZkHvGmvA2Z7
-NO3ig8iQImG7QdzwUKo63xBfFyT1r3rQO0F51C9w/sY5JW7dhucGZIwyi+C/XaNn
-7YArDP4VOvjFHOGsTFkCDEco1IqKI0pE2gezJhG0ScVPvPPnwEeEmVxEQsdD/Ffi
-fCgZ/yKXdgMb5uhNEVeRSETxUiwKp54NuHEtIP0evHELNT2tI9Y=
-=XN4T
+klDZAg//f/RnYNY3kr64VJTgWiRw5t+CvxzDykZa0eYZm7CpVuh7HdI0UcH5osdK
+uIEG57GkTMso43sGgHoKw0t6Lw1ABGFFgtGPXEcM2J0CEZahUhvXJKmDSJzB7ai4
+JMMs274wXzaySSBH1qdlhf3lPwaQfjvPT8qZslLvf8paZ4YhZ+ytPxi0Ce6KEp6f
+9ZN/DuJskZwx7uAntEeX6NwgFW/5UfurhTPBzok6nGI7WyloAj7DTVzfuv7fI8ik
+mnuV2/pSdjGsmSlbCMUnKNg6FwSca6x3KVG0ryMXvGJqAmDc5lGXrd4hYAo741wq
+WvsqnQv83pyZ/OgU+0PvzZRxyh32olmDpORdRTFHlRbC+uFNgINNABYQrL2UpX3s
+sPUTKNT7+ByuiuQ6r+3UfD1nFhODNPHyFKi76mQxNMLHQfzqklTRgdw0PEU2GDNp
+f+eMm5aVJkDh0NHEi655/SEsjKT/GNF9nWkneVVko79Wd22J8DSlYoo2nizeOn1u
+EWvze/gFbe5VcezaDTFuMaibuJDtV7GBK3iBJ/9UH/XUlxw0XosxLBDFjJZPXc5M
+a1mS5w3yA6wQb8lqRyhXBgGngae2Ll9EddRLvPk7mfPVZahv5eW0yNvAhLAqoLWy
+SO5ZK20n11sflDTMmqNtgeYoOHy598G+E+1SHHOMFaImNWU2qpo=
+=31rE
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 36c501de0268..360999900e20 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Jul 2021 10:38:56 +0000
+Sat, 24 Jul 2021 18:08:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 138804654ae2..a0306a3cc89d 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index e1c0b5273c39..6a5060b17557 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2
index 5f036ec59980..c3493d8db90b 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2
@@ -5,7 +5,7 @@ DESCRIPTION=D-Bus accessibility specifications and registration daemon
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core
 IUSE=X gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.62:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=gtk-doc? ( X )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.40/at-spi2-core-2.40.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ff0a732eea301ce4e73ff874072e7ab3
+_md5_=ed4acbf62def31bf2024bfe9c4c52e9f
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 0961535ea267..94c794d462e1 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/swtpm-0.6.0-r1 b/metadata/md5-cache/app-crypt/swtpm-0.6.0-r1
index bccb7a710510..cae8880430ae 100644
--- a/metadata/md5-cache/app-crypt/swtpm-0.6.0-r1
+++ b/metadata/md5-cache/app-crypt/swtpm-0.6.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Libtpms-based TPM emulator
 EAPI=7
 HOMEPAGE=https://github.com/stefanberger/swtpm
 IUSE=fuse +gnutls seccomp test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64
 LICENSE=BSD
 RDEPEND=fuse? ( dev-libs/glib:2 sys-fs/fuse:0 ) gnutls? ( dev-libs/libtasn1:= >=net-libs/gnutls-3.1.0[tools,pkcs11] ) seccomp? ( sys-libs/libseccomp ) test? ( net-misc/socat dev-tcltk/expect ) acct-group/tss acct-user/tss dev-libs/openssl:0= dev-libs/json-glib dev-libs/libtpms python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanberger/swtpm/archive/v0.6.0.tar.gz -> swtpm-0.6.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cc1e04b886866a8293196fdf1562a680
+_md5_=cb827b5b31c00a46841c6cc561f38a1b
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 62fb2e0d7cc5..22072d1681da 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/containerd-1.4.8 b/metadata/md5-cache/app-emulation/containerd-1.4.8
index b0af5cc42364..26ca0c6f2d7d 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.4.8
+++ b/metadata/md5-cache/app-emulation/containerd-1.4.8
@@ -5,11 +5,11 @@ DESCRIPTION=A daemon to control runC
 EAPI=7
 HOMEPAGE=https://containerd.io/
 IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0
 RESTRICT=strip strip test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.4.8.tar.gz -> containerd-1.4.8.tar.gz
 _eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=787170963c6d5909141127bdf4e1cff9
+_md5_=3aa0dfdf222646aec160c24e2042719a
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0 b/metadata/md5-cache/app-emulation/runc-1.0.0
index 89336a5794ae..d8c0ee242590 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.0
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=runc container cli tools
 EAPI=7
 HOMEPAGE=http://runc.io
 IUSE=apparmor hardened +kmem +seccomp test kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD-2 BSD MIT
 RDEPEND=seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.0.tar.gz -> runc-1.0.0.tar.gz
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=196e5cb279951af7ffb05aea88dbf93e
+_md5_=becb146e1b4c8bf336cbe4e07e796e6a
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 8ce8909a7e0a..32521f553b53 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/enchant-2.3.0 b/metadata/md5-cache/app-text/enchant-2.3.0
index 250967fc3bc8..9b62c37976e1 100644
--- a/metadata/md5-cache/app-text/enchant-2.3.0
+++ b/metadata/md5-cache/app-text/enchant-2.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Spellchecker wrapping library
 EAPI=7
 HOMEPAGE=https://abiword.github.io/enchant/
 IUSE=aspell +hunspell test voikko
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) voikko? ( dev-libs/libvoikko )
 REQUIRED_USE=|| ( hunspell aspell )
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.3.0/enchant-2.3.0.tar.gz
-_md5_=3cff348ab950cc74db0bda01db75b1ee
+_md5_=7451cecc14c27dab27f5360cae588e62
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 665b12ffb93d..200073958906 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.3 b/metadata/md5-cache/dev-java/dom4j-2.1.3
index a35f9793c63f..4d13fb4fdb1d 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.3
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=flexible XML framework for Java
 EAPI=7
 HOMEPAGE=https://dom4j.github.io/
 IUSE=jaxen elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=dom4j
 RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 jaxen? ( dev-java/jaxen:1.2[dom4j] ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz -> dom4j-2.1.3.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=f3c9e97cfeafe63a346c27f37a160131
+_md5_=23844043cf6a4044eb2ce032550c6256
diff --git a/metadata/md5-cache/dev-java/guice-4.1 b/metadata/md5-cache/dev-java/guice-4.1
index 28fa935399a0..7a51d11ed6d6 100644
--- a/metadata/md5-cache/dev-java/guice-4.1
+++ b/metadata/md5-cache/dev-java/guice-4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A lightweight dependency injection framework for Java 5 and above
 EAPI=6
 HOMEPAGE=https://github.com/google/guice/
 IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/cglib-3.1:3 dev-java/guava:20 dev-java/javax-inject:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/4.1.tar.gz -> guice-4.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=280e009d0e788cb2c20b13e4b57cbca8
+_md5_=1131efb770813c2c0e9dbcaab0c66eef
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48 b/metadata/md5-cache/dev-java/jcommander-1.48
index 8d63c8f47496..23482ebcbe32 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.48
+++ b/metadata/md5-cache/dev-java/jcommander-1.48
@@ -4,11 +4,11 @@ DESCRIPTION=Command line parsing framework for Java
 EAPI=5
 HOMEPAGE=https://github.com/cbeust/jcommander
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.48.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1d42990a88c54b9a16ce747edbd9d151
+_md5_=c850ffa696e430a788ecf243d5565d15
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1 b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
index 7b0dfad979cc..dd25bc6a275a 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
@@ -4,11 +4,11 @@ DESCRIPTION=YAML 1.1 parser and emitter for Java
 EAPI=7
 HOMEPAGE=https://bitbucket.org/asomov/snakeyaml
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz -> asomov-snakeyaml-b28f0b4d87c6.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=3348435bcbdd84326968cb82ca5d95bd
+_md5_=11f8c667e48528867d7f3c7d2673387c
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10 b/metadata/md5-cache/dev-java/testng-6.9.10
index 634fcdff1828..ab0b7fab0f46 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10
+++ b/metadata/md5-cache/dev-java/testng-6.9.10
@@ -4,11 +4,11 @@ DESCRIPTION=Testing framework inspired by JUnit and NUnit with new features
 EAPI=5
 HOMEPAGE=https://testng.org/
 IUSE=test elibc_FreeBSD doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0adf9a0eea080b4c37da91f8d62a46ea
+_md5_=533552959c837beb161598a3e8135656
diff --git a/metadata/md5-cache/dev-java/velocity-2.3 b/metadata/md5-cache/dev-java/velocity-2.3
index d96bb249cc14..9268a1a865d0 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3
+++ b/metadata/md5-cache/dev-java/velocity-2.3
@@ -5,11 +5,11 @@ DESCRIPTION=Apache Velocity is a general purpose template engine.
 EAPI=7
 HOMEPAGE=https://velocity.apache.org
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lang-3.11:3.6 >=dev-java/slf4j-api-1.7.30:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz -> velocity-2.3.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=d2d3036b00c3ef4b87cf6469386172fd
+_md5_=2c82ab5fb11466d44fda112e10441119
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3c2daf226f38..9d5efc3e33d6 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/vala-0.52.4 b/metadata/md5-cache/dev-lang/vala-0.52.4
index a4a8eaa93e2b..9aae6ddc4d79 100644
--- a/metadata/md5-cache/dev-lang/vala-0.52.4
+++ b/metadata/md5-cache/dev-lang/vala-0.52.4
@@ -5,11 +5,11 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.52.4 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.52
 SRC_URI=mirror://gnome/sources/vala/0.52/vala-0.52.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d087969615f2f1f1089bfa1dda7b5641
+_md5_=c3af053b9c60e7bdec358c54ffacff81
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4ce0f3fd2934..b61eba45b5f1 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/glib-2.68.3-r1 b/metadata/md5-cache/dev-libs/glib-2.68.3-r1
index 4a8f76dc9a22..f525af9df3c9 100644
--- a/metadata/md5-cache/dev-libs/glib-2.68.3-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.68.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.68.3 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=94d4447d1db9a56f3f8cc4f1264e8929
+_md5_=212a3f33c032c9fc337cdb4368e9e2e5
diff --git a/metadata/md5-cache/dev-libs/libbson-1.18.0 b/metadata/md5-cache/dev-libs/libbson-1.18.0
new file mode 100644
index 000000000000..5f905f2dcf9f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbson-1.18.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/sphinx
+DESCRIPTION=Library routines related to building,parsing and iterating BSON documents
+EAPI=7
+HOMEPAGE=https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson
+IUSE=examples static-libs
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.18.0/mongo-c-driver-1.18.0.tar.gz -> libbson-1.18.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=eb4958fd5252d727b8ed9f20df30980b
diff --git a/metadata/md5-cache/dev-libs/libinput-1.18.0 b/metadata/md5-cache/dev-libs/libinput-1.18.0
index 3db0deb07a3b..800fe91cb737 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.18.0
+++ b/metadata/md5-cache/dev-libs/libinput-1.18.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
 IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.18.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=47ea8a3ddb01bb60751a78fda9df9674
+_md5_=e3f8dc1bf8dbe10a63418084fbced406
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.8.4 b/metadata/md5-cache/dev-libs/libtpms-0.8.4
index 30f3fd38403d..47af2ce58c19 100644
--- a/metadata/md5-cache/dev-libs/libtpms-0.8.4
+++ b/metadata/md5-cache/dev-libs/libtpms-0.8.4
@@ -4,10 +4,10 @@ DEPEND=dev-libs/openssl:=
 DESCRIPTION=Library providing software emultion of a TPM
 EAPI=7
 HOMEPAGE=https://github.com/stefanberger/libtpms
-KEYWORDS=~amd64 ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:=
 SLOT=0
 SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.8.4.tar.gz -> libtpms-0.8.4.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6dbd3d11255161b7466724a0903b386
+_md5_=1ae3b5b17f3cee7d9b79c980e04f8369
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0
new file mode 100644
index 000000000000..aab97426a094
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/snappy:= app-arch/zstd:= >=dev-libs/libbson-1.18.0[static-libs?] dev-python/sphinx sys-libs/zlib:= icu? ( dev-libs/icu:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) test? ( dev-db/mongodb dev-libs/libbson[static-libs] )
+DESCRIPTION=Client library written in C for MongoDB
+EAPI=7
+HOMEPAGE=https://github.com/mongodb/mongo-c-driver
+IUSE=debug examples icu sasl ssl static-libs test
+KEYWORDS=~amd64 ~hppa ~s390 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-arch/snappy:= app-arch/zstd:= >=dev-libs/libbson-1.18.0[static-libs?] dev-python/sphinx sys-libs/zlib:= icu? ( dev-libs/icu:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=test? ( static-libs )
+RESTRICT=x86? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.18.0/mongo-c-driver-1.18.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=88da4ec5c9b428ea3ef5f8caf287ffee
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.52.4 b/metadata/md5-cache/dev-libs/vala-common-0.52.4
index b8efbee0a6dc..7e73d7f88e72 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.52.4
+++ b/metadata/md5-cache/dev-libs/vala-common-0.52.4
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.52/vala-0.52.4.tar.xz
 _eclasses_=gnome.org	b5c48cddff1da36a205d924d722b28c9
-_md5_=2a457de4200015893f4b4a6ed9197615
+_md5_=eacc0b535e5d941c48c801d1ebfe2090
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index ac01eda8c00e..86eed8875d2e 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
index c5b2ac70e863..61dff1e6c966 100644
--- a/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/ocaml
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= dev-ml/cppo >=dev-lang/ocaml-4:=
+DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= <=dev-ml/dune-2.9 dev-ml/cppo >=dev-lang/ocaml-4:=
 DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
@@ -10,4 +10,4 @@ RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdline
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=57ae99f6f4a1ca77d192e95698c80e0c
+_md5_=7b8d53c1b598a64da79f850222bc3589
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0 b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
index ba6595d6f994..123324fef92b 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check for the presence of a compiler
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/ExtUtils-HasCompiler
 IUSE=test
-KEYWORDS=~amd64 ~riscv ~sparc
+KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-HasCompiler-0.023.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=a5d9e73d52f58f456b51b13c30d5c22f
+_md5_=e1c1306ea6ad028a3b65496d1470fcb5
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 4dcc58164be2..630418905570 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-0.390.0 b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
index f0d780f21498..47e0bc83948a 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
@@ -5,11 +5,11 @@ DESCRIPTION=Routines for manipulating stashes
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Package-Stash
 IUSE=minimal test
-KEYWORDS=~amd64 ~riscv ~sparc
+KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Getopt-Long >=dev-perl/Module-Implementation-0.60.0 virtual/perl-Scalar-List-Utils !minimal? ( >=dev-perl/Package-Stash-XS-0.260.0 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.39.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=3e3ed44319a63785aee403d6d3b2c16b
+_md5_=13f618c42155816579a84a1901403d7c
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index efcf3a1ea359..52620b9b841f 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.5.0 b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.5.0
new file mode 100644
index 000000000000..1019579cdd4f
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare test
+DEPEND=test? ( dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.2.0 dev-php/phpunit )
+DESCRIPTION=Provides an easy way to perform HTTP requests
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/HTTP_Request2
+IUSE=+curl +fileinfo +ssl test +zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.2.0 >=dev-php/pear-1.8.1
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pear.php.net/get/HTTP_Request2-2.5.0.tgz
+_eclasses_=php-pear-r2	4a7c293febeea04349068d5716ad29ff
+_md5_=77ba34c071b406ab61fd5a858260b970
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.5.1 b/metadata/md5-cache/dev-php/pecl-imagick-3.5.1
new file mode 100644
index 000000000000..63aab847923a
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.5.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=PHP wrapper for the ImageMagick library
+EAPI=7
+HOMEPAGE=https://pecl.php.net/package/imagick https://github.com/Imagick/imagick
+IUSE=examples test php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/imagick-3.5.1.tgz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	php-ext-pecl-r3	aa1126f832eb58d6b04711a39840710d	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=702d75e251a68186c877b4f75e9dd0de
diff --git a/metadata/md5-cache/dev-php/pecl-mongodb-1.10.0 b/metadata/md5-cache/dev-php/pecl-mongodb-1.10.0
new file mode 100644
index 000000000000..52c5d3e2cf34
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-mongodb-1.10.0
@@ -0,0 +1,16 @@
+BDEPEND=php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] ) php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] ) php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] ) >=dev-libs/libbson-1.18.0 >=dev-libs/mongo-c-driver-1.18.0[sasl?,ssl] dev-libs/openssl:0= sasl? ( dev-libs/cyrus-sasl ) test? ( dev-db/mongodb ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=MongoDB database driver for PHP
+EAPI=7
+HOMEPAGE=https://pecl.php.net/mongodb
+IUSE=sasl test php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] ) php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] ) >=dev-libs/libbson-1.18.0 >=dev-libs/mongo-c-driver-1.18.0[sasl?,ssl] dev-libs/openssl:0= sasl? ( dev-libs/cyrus-sasl ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+RESTRICT=x86? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/mongodb-1.10.0.tgz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	php-ext-pecl-r3	aa1126f832eb58d6b04711a39840710d	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a4edb5905d0f5acbd1e9bb97077a7d7f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f033816ad562..faeeadae87f2 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/astor-0.8.1 b/metadata/md5-cache/dev-python/astor-0.8.1
index b2bb8fc9838a..bf656a3b996b 100644
--- a/metadata/md5-cache/dev-python/astor-0.8.1
+++ b/metadata/md5-cache/dev-python/astor-0.8.1
@@ -4,7 +4,7 @@ DESCRIPTION=Read/rewrite/write Python ASTs
 EAPI=7
 HOMEPAGE=https://pypi.org/project/astor/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.8.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8d357a15f5ce7b1680f872f142f40664
+_md5_=f1ea6d468fb6fae82f1fc8ad46c3270f
diff --git a/metadata/md5-cache/dev-python/black-21.7_beta0 b/metadata/md5-cache/dev-python/black-21.7_beta0
index 7bbd321bdf92..6bbbadda0b24 100644
--- a/metadata/md5-cache/dev-python/black-21.7_beta0
+++ b/metadata/md5-cache/dev-python/black-21.7_beta0
@@ -4,7 +4,7 @@ DESCRIPTION=The uncompromising Python code formatter
 EAPI=7
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/21.7b0.tar.gz -> black-21.7b0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6ac5aeb0ddfe7f4a618ed46f19193f7
+_md5_=529ff9ee7d0080eb5cfe15a9d8104be3
diff --git a/metadata/md5-cache/dev-python/blosc-1.10.4 b/metadata/md5-cache/dev-python/blosc-1.10.4
index 331a8fe80c14..249c7c7b8296 100644
--- a/metadata/md5-cache/dev-python/blosc-1.10.4
+++ b/metadata/md5-cache/dev-python/blosc-1.10.4
@@ -5,7 +5,7 @@ DESCRIPTION=High performance compressor optimized for binary data
 EAPI=7
 HOMEPAGE=http://python-blosc.blosc.org
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/c-blosc-1.19.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.10.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2ebfd28712241885adf358c9c59f05b1
+_md5_=c38d77b817cd0ff221bbef131a1b760d
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
index 6c9d928ea316..c7fec1b04b25 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=The Real First Universal Charset Detector
 EAPI=8
 HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.3.tar.gz -> charset_normalizer-2.0.3.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5e4dbab2b5203e002e2295425d1e994e
+_md5_=43239bc4a1d586d0a9d84febd84a552b
diff --git a/metadata/md5-cache/dev-python/configargparse-1.4.1 b/metadata/md5-cache/dev-python/configargparse-1.4.1
deleted file mode 100644
index bc14338a3e5b..000000000000
--- a/metadata/md5-cache/dev-python/configargparse-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Drop-in replacement for argparse supporting config files and env variables
-EAPI=7
-HOMEPAGE=https://github.com/bw2/ConfigArgParse/ https://pypi.org/project/ConfigArgParse/
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bw2/ConfigArgParse/archive/v1.4.1.tar.gz -> ConfigArgParse-1.4.1.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=821af873c8080765eeb20a014bb52c3c
diff --git a/metadata/md5-cache/dev-python/configargparse-1.5 b/metadata/md5-cache/dev-python/configargparse-1.5
deleted file mode 100644
index 9fc990c604f0..000000000000
--- a/metadata/md5-cache/dev-python/configargparse-1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Drop-in replacement for argparse supporting config files and env variables
-EAPI=7
-HOMEPAGE=https://github.com/bw2/ConfigArgParse/ https://pypi.org/project/ConfigArgParse/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bw2/ConfigArgParse/archive/v1.5.tar.gz -> ConfigArgParse-1.5.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9631c68e9cde829ccc05915189bbae5d
diff --git a/metadata/md5-cache/dev-python/configargparse-1.5.1 b/metadata/md5-cache/dev-python/configargparse-1.5.1
index a0e40a0284a2..55e15ce9ddb2 100644
--- a/metadata/md5-cache/dev-python/configargparse-1.5.1
+++ b/metadata/md5-cache/dev-python/configargparse-1.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=Drop-in replacement for argparse supporting config files and env var
 EAPI=8
 HOMEPAGE=https://github.com/bw2/ConfigArgParse/ https://pypi.org/project/ConfigArgParse/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bw2/ConfigArgParse/archive/v1.5.1.tar.gz -> ConfigArgParse-1.5.1.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fedaff5ebaeb0e37301d25f6b81f4665
+_md5_=d33b74e0a009d26c6a88748823c871e4
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.23.1 b/metadata/md5-cache/dev-python/dbusmock-0.23.1
index 3b2912b81b99..4c6e71377019 100644
--- a/metadata/md5-cache/dev-python/dbusmock-0.23.1
+++ b/metadata/md5-cache/dev-python/dbusmock-0.23.1
@@ -4,7 +4,7 @@ DESCRIPTION=Easily create mock objects on D-Bus for software testing
 EAPI=7
 HOMEPAGE=https://github.com/martinpitt/python-dbusmock
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/python-dbusmock/releases/download/0.23.1/python-dbusmock-0.23.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06c16ec5ef61c65ada87c3090b8746b1
+_md5_=902c11dae3a67a50a43b4ae0ae5cc987
diff --git a/metadata/md5-cache/dev-python/dill-0.3.3 b/metadata/md5-cache/dev-python/dill-0.3.3
deleted file mode 100644
index 906becfab1e2..000000000000
--- a/metadata/md5-cache/dev-python/dill-0.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Serialize all of python (almost)
-EAPI=7
-HOMEPAGE=https://pypi.org/project/dill/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/uqfoundation/dill/archive/dill-0.3.3.tar.gz -> dill-0.3.3.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c2bff3392808260244fa2c790d10a0d1
diff --git a/metadata/md5-cache/dev-python/dill-0.3.4 b/metadata/md5-cache/dev-python/dill-0.3.4
index 9871aa2749cc..58e7d87a2b0e 100644
--- a/metadata/md5-cache/dev-python/dill-0.3.4
+++ b/metadata/md5-cache/dev-python/dill-0.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Serialize all of python (almost)
 EAPI=7
 HOMEPAGE=https://pypi.org/project/dill/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/uqfoundation/dill/archive/dill-0.3.4.tar.gz -> dill-0.3.4.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=416b20ff39e4fb0bcf74dde439343392
+_md5_=c0571618b9926ac59421d77a3fbf91a9
diff --git a/metadata/md5-cache/dev-python/diskcache-5.2.1 b/metadata/md5-cache/dev-python/diskcache-5.2.1
deleted file mode 100644
index cf27806bd25d..000000000000
--- a/metadata/md5-cache/dev-python/diskcache-5.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( <dev-python/django-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Disk and file backed cache
-EAPI=7
-HOMEPAGE=http://www.grantjenks.com/docs/diskcache/ https://github.com/grantjenks/python-diskcache/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~mips ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/grantjenks/python-diskcache/archive/v5.2.1.tar.gz -> diskcache-5.2.1.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=64c74788507e9293c1f4f3f940f7fbac
diff --git a/metadata/md5-cache/dev-python/diskcache-5.2.1-r1 b/metadata/md5-cache/dev-python/diskcache-5.2.1-r1
index f137e6dc9ffd..c67bfcc73e7e 100644
--- a/metadata/md5-cache/dev-python/diskcache-5.2.1-r1
+++ b/metadata/md5-cache/dev-python/diskcache-5.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Disk and file backed cache
 EAPI=7
 HOMEPAGE=http://www.grantjenks.com/docs/diskcache/ https://github.com/grantjenks/python-diskcache/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grantjenks/python-diskcache/archive/v5.2.1.tar.gz -> diskcache-5.2.1.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77254a873a4acbfbe9c83b720a1aed7a
+_md5_=86b3630b8c83a196ca5d9de9825dd821
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r3 b/metadata/md5-cache/dev-python/docopt-0.6.2-r3
deleted file mode 100644
index 8c2f362b24fd..000000000000
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Pythonic argument parser, that will make you smile
-EAPI=7
-HOMEPAGE=https://pypi.org/project/docopt/ https://github.com/docopt/docopt
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed6c432e2340fd1d439c63bcaf075353
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r4 b/metadata/md5-cache/dev-python/docopt-0.6.2-r4
index f1d834214ac3..db074d1dce3e 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r4
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r4
@@ -4,7 +4,7 @@ DESCRIPTION=Pythonic argument parser, that will make you smile
 EAPI=7
 HOMEPAGE=https://pypi.org/project/docopt/ https://github.com/docopt/docopt
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1353883efca34cd3d814737b5c9154de
+_md5_=82db43cae165c89abf0f5d1f4d1e56fc
diff --git a/metadata/md5-cache/dev-python/elementpath-2.2.2 b/metadata/md5-cache/dev-python/elementpath-2.2.2
deleted file mode 100644
index 439306ca44c9..000000000000
--- a/metadata/md5-cache/dev-python/elementpath-2.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=XPath 1.0/2.0 parsers and selectors for ElementTree and lxml
-EAPI=7
-HOMEPAGE=https://github.com/sissaschool/elementpath/ https://pypi.org/project/elementpath/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sissaschool/elementpath/archive/v2.2.2.tar.gz -> elementpath-2.2.2.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e7d3f2885449fa30db4148d96154500
diff --git a/metadata/md5-cache/dev-python/elementpath-2.2.3 b/metadata/md5-cache/dev-python/elementpath-2.2.3
index 5d2654b20efc..6df96917cfb6 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.2.3
+++ b/metadata/md5-cache/dev-python/elementpath-2.2.3
@@ -4,7 +4,7 @@ DESCRIPTION=XPath 1.0/2.0 parsers and selectors for ElementTree and lxml
 EAPI=7
 HOMEPAGE=https://github.com/sissaschool/elementpath/ https://pypi.org/project/elementpath/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sissaschool/elementpath/archive/v2.2.3.tar.gz -> elementpath-2.2.3.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a2d50e95384219ef5aa4101bc06545c9
+_md5_=d21901b11ea74fb7f0bc32b9ab6f6988
diff --git a/metadata/md5-cache/dev-python/execnet-1.8.1 b/metadata/md5-cache/dev-python/execnet-1.8.1
deleted file mode 100644
index efaf00acdf4f..000000000000
--- a/metadata/md5-cache/dev-python/execnet-1.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/apipkg-1.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Rapid multi-Python deployment
-EAPI=7
-HOMEPAGE=https://codespeak.net/execnet/ https://pypi.org/project/execnet/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/apipkg-1.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/e/execnet/execnet-1.8.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bdc42056a4b474c89bcb3d54c2119df7
diff --git a/metadata/md5-cache/dev-python/execnet-1.9.0 b/metadata/md5-cache/dev-python/execnet-1.9.0
index 53695803787f..554722168ca4 100644
--- a/metadata/md5-cache/dev-python/execnet-1.9.0
+++ b/metadata/md5-cache/dev-python/execnet-1.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=Rapid multi-Python deployment
 EAPI=7
 HOMEPAGE=https://codespeak.net/execnet/ https://pypi.org/project/execnet/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.9.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=444a9093604a88785fb3bf41f9622aae
+_md5_=785f248bf5e36aa62d030c82e8e6a989
diff --git a/metadata/md5-cache/dev-python/flask-compress-1.10.1 b/metadata/md5-cache/dev-python/flask-compress-1.10.1
index e73b8de99fa3..99a0bcf208c9 100644
--- a/metadata/md5-cache/dev-python/flask-compress-1.10.1
+++ b/metadata/md5-cache/dev-python/flask-compress-1.10.1
@@ -4,7 +4,7 @@ DESCRIPTION=Compress responses in your Flask app with gzip
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Flask-Compress/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Compress/Flask-Compress-1.10.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2521c392c635fdc2251e9b33b4e41017
+_md5_=bfbfd0d7ba84a3dc0a5709ae0ab59526
diff --git a/metadata/md5-cache/dev-python/flask-compress-1.9.0 b/metadata/md5-cache/dev-python/flask-compress-1.9.0
deleted file mode 100644
index 3f50f3cd87d2..000000000000
--- a/metadata/md5-cache/dev-python/flask-compress-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Compress responses in your Flask app with gzip
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Flask-Compress/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask-Compress/Flask-Compress-1.9.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aff411f1e84ad7efcc682649166b2770
diff --git a/metadata/md5-cache/dev-python/flatbuffers-1.12 b/metadata/md5-cache/dev-python/flatbuffers-1.12
deleted file mode 100644
index 1fc5fb5fbd25..000000000000
--- a/metadata/md5-cache/dev-python/flatbuffers-1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=RFC 7049 - Concise Binary Object Representation
-EAPI=7
-HOMEPAGE=https://github.com/google/flatbuffers https://pypi.org/project/flatbuffers/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flatbuffers/flatbuffers-1.12.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5e3f25a59131bb48ae60567e2a3eee82
diff --git a/metadata/md5-cache/dev-python/flatbuffers-2.0 b/metadata/md5-cache/dev-python/flatbuffers-2.0
index 51321e7fea3c..f37c3f3237b8 100644
--- a/metadata/md5-cache/dev-python/flatbuffers-2.0
+++ b/metadata/md5-cache/dev-python/flatbuffers-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=RFC 7049 - Concise Binary Object Representation
 EAPI=7
 HOMEPAGE=https://github.com/google/flatbuffers https://pypi.org/project/flatbuffers/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flatbuffers/flatbuffers-2.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5425d3e0ba1484784997f0feae442cc0
+_md5_=5e3f25a59131bb48ae60567e2a3eee82
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.6.0 b/metadata/md5-cache/dev-python/fritzconnection-1.6.0
new file mode 100644
index 000000000000..7d07ccadacf0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fritzconnection-1.6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP
+EAPI=8
+HOMEPAGE=https://github.com/kbr/fritzconnection
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kbr/fritzconnection/archive/1.6.0.tar.gz -> fritzconnection-1.6.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4aa0ac40bd3d783b4d15c27fbcf52c4d
diff --git a/metadata/md5-cache/dev-python/grpcio-1.38.1 b/metadata/md5-cache/dev-python/grpcio-1.38.1
index 7156fcc63d29..e607a347fdaa 100644
--- a/metadata/md5-cache/dev-python/grpcio-1.38.1
+++ b/metadata/md5-cache/dev-python/grpcio-1.38.1
@@ -5,11 +5,11 @@ DESCRIPTION=High-performance RPC framework (python libraries)
 EAPI=7
 HOMEPAGE=https://grpc.io
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist(-)] >=dev-libs/re2-0.2021.04.01:= >=dev-python/cython-0.28.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-dns/c-ares:= sys-libs/zlib:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio/grpcio-1.38.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd6e8258c7a4d0d5226065fe8d9d0fdc
+_md5_=205e9205083b397014bfb7756f9371df
diff --git a/metadata/md5-cache/dev-python/h5py-3.3.0 b/metadata/md5-cache/dev-python/h5py-3.3.0
index 6d88035e2cba..ab08255a4853 100644
--- a/metadata/md5-cache/dev-python/h5py-3.3.0
+++ b/metadata/md5-cache/dev-python/h5py-3.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=Simple Python interface to HDF5 files
 EAPI=7
 HOMEPAGE=https://www.h5py.org
 IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:=[hl(+)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-3.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=badb629880b71f04a616335d3809a6e3
+_md5_=fa80f74323aca202d6d1cd869a8d25f7
diff --git a/metadata/md5-cache/dev-python/jeepney-0.7.0 b/metadata/md5-cache/dev-python/jeepney-0.7.0
index 1d9c368e7293..c6ec955c4857 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.7.0
+++ b/metadata/md5-cache/dev-python/jeepney-0.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level, pure Python DBus protocol wrapper
 EAPI=8
 HOMEPAGE=https://gitlab.com/takluyver/jeepney
 IUSE=examples test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.7.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a0370f365ac6a488c0a2b86926b51b75
+_md5_=ac74324cc9781badcfbc6b955b3961f8
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.38.0 b/metadata/md5-cache/dev-python/m2crypto-0.38.0
index c9126b2f4358..8d3b29e98628 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.38.0
+++ b/metadata/md5-cache/dev-python/m2crypto-0.38.0
@@ -5,7 +5,7 @@ DESCRIPTION=A Python crypto and SSL toolkit
 EAPI=7
 HOMEPAGE=https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/
 IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.38.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=32f94dc583907fdf9adc0ad74c6598a0
+_md5_=f022d989471e172517c2a6b5851fcc04
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.8 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.8
deleted file mode 100644
index 25109274b04c..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mkdocs-material[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( >=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Display the localized date of the last git modification of a markdown file
-EAPI=7
-HOMEPAGE=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin https://pypi.org/project/mkdocs-git-revision-date-localized-plugin
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.8.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.8.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f643bfa0ab42e51118ee89b1f7d7d3b
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9
deleted file mode 100644
index 1531a7948858..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mkdocs-material[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( >=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Display the localized date of the last git modification of a markdown file
-EAPI=7
-HOMEPAGE=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.9.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.9.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8b4b5a14a8b1314830df52e69c9d2ff
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2
index 3c4a8c86be32..e4d30ef1941f 100644
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2
+++ b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2
@@ -4,7 +4,7 @@ DESCRIPTION=Display the localized date of the last git modification of a markdow
 EAPI=7
 HOMEPAGE=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
 IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.9.2.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ac0b10b4508b9fbcbd99f24a9ca616e5
+_md5_=d8089f0e98f506c34f9816eb7e696915
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.2.2 b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.2.2
deleted file mode 100644
index 760e8ae18ea5..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Custom alterations based on Mkdocs-Material
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/mkdocs_pymdownx_material_extras https://pypi.org/project/mkdocs-pymdownx-material-extras
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/mkdocs-material-5.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/mkdocs_pymdownx_material_extras/archive/1.2.2.tar.gz -> mkdocs_pymdownx_material_extras-1.2.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58a550828bbcc3dd1dda70cc248a936a
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.4.0 b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.4.0
index 25769f204ed1..c6f68467c085 100644
--- a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.4.0
+++ b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Custom alterations based on Mkdocs-Material
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/mkdocs_pymdownx_material_extras https://pypi.org/project/mkdocs-pymdownx-material-extras
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/mkdocs-material-5.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/mkdocs_pymdownx_material_extras/archive/1.4.0.tar.gz -> mkdocs_pymdownx_material_extras-1.4.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=729006b43f51b6a2280ca421494aa034
+_md5_=60a3a2674bc07e007bbb6b364fd79a86
diff --git a/metadata/md5-cache/dev-python/mypy-0.812-r1 b/metadata/md5-cache/dev-python/mypy-0.812-r1
deleted file mode 100644
index 4ec3342ae10a..000000000000
--- a/metadata/md5-cache/dev-python/mypy-0.812-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-6.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-xdist-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/py-1.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Optional static typing for Python
-EAPI=7
-HOMEPAGE=http://www.mypy-lang.org/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python/mypy/archive/v0.812.tar.gz -> mypy-0.812.tar.gz https://github.com/python/typeshed/archive/add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz -> typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2086aa3c7aaa47420488bd7aa3df2a32
diff --git a/metadata/md5-cache/dev-python/mypy-0.812-r2 b/metadata/md5-cache/dev-python/mypy-0.812-r2
deleted file mode 100644
index 84ce986b213d..000000000000
--- a/metadata/md5-cache/dev-python/mypy-0.812-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-6.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-xdist-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/py-1.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Optional static typing for Python
-EAPI=7
-HOMEPAGE=http://www.mypy-lang.org/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python/mypy/archive/v0.812.tar.gz -> mypy-0.812.tar.gz https://github.com/python/typeshed/archive/add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz -> typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6897de28e245fe8fe0f28d5c2e95de07
diff --git a/metadata/md5-cache/dev-python/mypy-0.902 b/metadata/md5-cache/dev-python/mypy-0.902
deleted file mode 100644
index 4f934842670c..000000000000
--- a/metadata/md5-cache/dev-python/mypy-0.902
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-6.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-xdist-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/py-1.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Optional static typing for Python
-EAPI=7
-HOMEPAGE=http://www.mypy-lang.org/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python/mypy/archive/v0.902.tar.gz -> mypy-0.902.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c9f0b3967682149c7d0995bd643ae27
diff --git a/metadata/md5-cache/dev-python/mypy-0.910 b/metadata/md5-cache/dev-python/mypy-0.910
index 9aef7e19b4da..6b78b0d1270c 100644
--- a/metadata/md5-cache/dev-python/mypy-0.910
+++ b/metadata/md5-cache/dev-python/mypy-0.910
@@ -4,7 +4,7 @@ DESCRIPTION=Optional static typing for Python
 EAPI=7
 HOMEPAGE=http://www.mypy-lang.org/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.910.tar.gz -> mypy-0.910.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20176c5830fe3ace148744b7f92c5c9a
+_md5_=e5aa9b6c06f62aec4a5ee71eac0b12ca
diff --git a/metadata/md5-cache/dev-python/notebook-6.3.0 b/metadata/md5-cache/dev-python/notebook-6.3.0
deleted file mode 100644
index 0ced349b8709..000000000000
--- a/metadata/md5-cache/dev-python/notebook-6.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-unixsocket[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DESCRIPTION=Jupyter Interactive Notebook
-EAPI=7
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/notebook/notebook-6.3.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd1085e4a69ae41d37ec0817343533a7
diff --git a/metadata/md5-cache/dev-python/notebook-6.4.0 b/metadata/md5-cache/dev-python/notebook-6.4.0
index aa66f98f47b4..63fc01c30a71 100644
--- a/metadata/md5-cache/dev-python/notebook-6.4.0
+++ b/metadata/md5-cache/dev-python/notebook-6.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Jupyter Interactive Notebook
 EAPI=7
 HOMEPAGE=https://jupyter.org
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-6.4.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=31399ddf223e16e80ed3c1b48194366f
+_md5_=ea8b67fefa47f746375a856c23bc9eb4
diff --git a/metadata/md5-cache/dev-python/outcome-1.1.0 b/metadata/md5-cache/dev-python/outcome-1.1.0
index 1a574319c1e7..05c4a0d3727d 100644
--- a/metadata/md5-cache/dev-python/outcome-1.1.0
+++ b/metadata/md5-cache/dev-python/outcome-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Capture the outcome of Python function calls
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/outcome https://pypi.org/project/outcome
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/outcome/archive/v1.1.0.tar.gz -> outcome-1.1.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3c006e868b7c0adecca004b77e53334f
+_md5_=04d02b51b86b4f41b04c3f370dc1dd0c
diff --git a/metadata/md5-cache/dev-python/path-py-15.1.2 b/metadata/md5-cache/dev-python/path-py-15.1.2
deleted file mode 100644
index aa23c32fd1da..000000000000
--- a/metadata/md5-cache/dev-python/path-py-15.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-shutil-1.7.0-r1 !<dev-python/pytest-virtualenv-1.7.0-r1 >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A module wrapper for os.path
-EAPI=7
-HOMEPAGE=https://pypi.org/project/path/ https://github.com/jaraco/path
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-shutil-1.7.0-r1 !<dev-python/pytest-virtualenv-1.7.0-r1 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/path/path-15.1.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=86e095add04b262956799dc572c56a76
diff --git a/metadata/md5-cache/dev-python/path-py-16.0.0 b/metadata/md5-cache/dev-python/path-py-16.0.0
index 716bab6aaca1..062337f43c2b 100644
--- a/metadata/md5-cache/dev-python/path-py-16.0.0
+++ b/metadata/md5-cache/dev-python/path-py-16.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A module wrapper for os.path
 EAPI=7
 HOMEPAGE=https://pypi.org/project/path/ https://github.com/jaraco/path
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-shutil-1.7.0-r1 !<dev-python/pytest-virtualenv-1.7.0-r1 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path/path-16.0.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=062527994a2dd7ef271c761e8455ce6e
+_md5_=6af7d82aa3599ead3b240474855c5814
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.24 b/metadata/md5-cache/dev-python/phonenumbers-8.12.24
deleted file mode 100644
index d0758aec26c0..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.24
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of Google's libphonenumber
-EAPI=7
-HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.24.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9d622c21672433a18aed7abe678314bf
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.25 b/metadata/md5-cache/dev-python/phonenumbers-8.12.25
deleted file mode 100644
index 192b4cdffd65..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.25
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of Google's libphonenumber
-EAPI=7
-HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.25.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=82dcb08d5372fac07af85c04bb5929e9
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.26 b/metadata/md5-cache/dev-python/phonenumbers-8.12.26
deleted file mode 100644
index 9c65af79b19b..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.26
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of Google's libphonenumber
-EAPI=7
-HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.26.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=82dcb08d5372fac07af85c04bb5929e9
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.27 b/metadata/md5-cache/dev-python/phonenumbers-8.12.27
index 356b2f0a3446..ebf01406d13c 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.27
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.27
@@ -4,11 +4,11 @@ DESCRIPTION=Python port of Google's libphonenumber
 EAPI=8
 HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.27.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f70b6d8f0abc35acbb5be565add89672
+_md5_=86370fd56c0d768a3d1a7719b82ab43b
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.18 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.18
deleted file mode 100644
index 65423674d0fa..000000000000
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Building powerful interactive command lines in Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.18.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1db9fb3a968680c02923df3213617070
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.19 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.19
index 6c19825160e5..bdb0427a2fde 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.19
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.19
@@ -4,7 +4,7 @@ DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.19.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=72ac4da5349f885a0bf7d260b8892847
+_md5_=b8efe18d8d56dd411e93aea105c18d91
diff --git a/metadata/md5-cache/dev-python/psycopg-2.9.1 b/metadata/md5-cache/dev-python/psycopg-2.9.1
index b4be34599863..31d4d8ae7b99 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.9.1
+++ b/metadata/md5-cache/dev-python/psycopg-2.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=PostgreSQL database adapter for Python
 EAPI=7
 HOMEPAGE=https://www.psycopg.org https://pypi.org/project/psycopg2/
 IUSE=debug test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-3+
 RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.9.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eb6378cec2908948c1e3d0963ecb66ed
+_md5_=d90e361d6f329fde56316ab088b9cc40
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.18 b/metadata/md5-cache/dev-python/pyglet-1.5.18
index 88a647fc3196..867f6bcd2aa8 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.5.18
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.18
@@ -4,7 +4,7 @@ DESCRIPTION=Cross-platform windowing and multimedia library for Python
 EAPI=7
 HOMEPAGE=http://pyglet.org/
 IUSE=examples image +sound test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.18.tar.gz -> pyglet-1.5.18.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8ad5f8c76553688c436ef56c2fc6ec9d
+_md5_=0ffa0334f4ab01804248942247b6cac9
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-8.0.1 b/metadata/md5-cache/dev-python/pymdown-extensions-8.0.1
deleted file mode 100644
index e86ead170b1b..000000000000
--- a/metadata/md5-cache/dev-python/pymdown-extensions-8.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/pymdown-lexers[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/pymdown-lexers[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensions for Python Markdown.
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/pymdown-extensions https://pypi.org/project/pymdown-extensions
-IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/8.0.1.tar.gz -> pymdown-extensions-8.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bce9167b76aabaa60b831321b3bf89b6
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-8.1.1 b/metadata/md5-cache/dev-python/pymdown-extensions-8.1.1
deleted file mode 100644
index c3ad83df7436..000000000000
--- a/metadata/md5-cache/dev-python/pymdown-extensions-8.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/pymdown-lexers[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/pymdown-lexers[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensions for Python Markdown.
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
-IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/8.1.1.tar.gz -> pymdown-extensions-8.1.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9aaebbdea7d1176e40ae1dbddc1ba179
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-8.2 b/metadata/md5-cache/dev-python/pymdown-extensions-8.2
index b88a34423190..19ac2f9c933e 100644
--- a/metadata/md5-cache/dev-python/pymdown-extensions-8.2
+++ b/metadata/md5-cache/dev-python/pymdown-extensions-8.2
@@ -4,7 +4,7 @@ DESCRIPTION=Extensions for Python Markdown
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
 IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/8.2.tar.gz -> pymdown-extensions-8.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e01a14045d7e0b7d71c0196e9fc00c5e
+_md5_=071e90a2d4c1a1ea3d232b42de82364b
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-15 b/metadata/md5-cache/dev-python/pyproject2setuppy-15
deleted file mode 100644
index 3db9a06e856b..000000000000
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/pyproject2setuppy
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v15.tar.gz -> pyproject2setuppy-15.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=307754bca7e7186e4c8d388c9cc03a66
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-16 b/metadata/md5-cache/dev-python/pyproject2setuppy-16
deleted file mode 100644
index a2e40e39effa..000000000000
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/pyproject2setuppy
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v16.tar.gz -> pyproject2setuppy-16.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eaee79367605c7be244b4d686ff87fe9
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-17 b/metadata/md5-cache/dev-python/pyproject2setuppy-17
index b4059a3b9d19..a4713f66b70b 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-17
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-17
@@ -4,7 +4,7 @@ DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/pyproject2setuppy
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v17.tar.gz -> pyproject2setuppy-17.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eaee79367605c7be244b4d686ff87fe9
+_md5_=ebc3bed0c37c36db53f4017e220dd241
diff --git a/metadata/md5-cache/dev-python/pyscard-2.0.1 b/metadata/md5-cache/dev-python/pyscard-2.0.1
index 0f22c2e70024..43bf92b851af 100644
--- a/metadata/md5-cache/dev-python/pyscard-2.0.1
+++ b/metadata/md5-cache/dev-python/pyscard-2.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Smart card support in python
 EAPI=7
 HOMEPAGE=https://pyscard.sourceforge.io/ https://github.com/LudovicRousseau/pyscard https://pypi.org/project/pyscard/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyscard/pyscard-2.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a75ddf38afffa760f0a8edbd51598d7f
+_md5_=3c42d3f77666372bafc1a9dae8bddc97
diff --git a/metadata/md5-cache/dev-python/pysimdjson-4.0.0-r1 b/metadata/md5-cache/dev-python/pysimdjson-4.0.0-r1
deleted file mode 100644
index aafabba0f5ea..000000000000
--- a/metadata/md5-cache/dev-python/pysimdjson-4.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-libs/simdjson:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/simdjson:=
-DESCRIPTION=Python bindings for simdjson
-EAPI=7
-HOMEPAGE=https://github.com/TkTech/pysimdjson
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=MIT Apache-2.0
-RDEPEND=dev-libs/simdjson:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/TkTech/pysimdjson/archive/v4.0.0.tar.gz -> pysimdjson-4.0.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f97a2c5b51404dfb0866afb67edee593
diff --git a/metadata/md5-cache/dev-python/pysimdjson-4.0.2 b/metadata/md5-cache/dev-python/pysimdjson-4.0.2
index d9f06309ed12..e546b9bad159 100644
--- a/metadata/md5-cache/dev-python/pysimdjson-4.0.2
+++ b/metadata/md5-cache/dev-python/pysimdjson-4.0.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for simdjson
 EAPI=7
 HOMEPAGE=https://github.com/TkTech/pysimdjson
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT Apache-2.0
 RDEPEND=dev-libs/simdjson:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TkTech/pysimdjson/archive/v4.0.2.tar.gz -> pysimdjson-4.0.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=718564ab67ef99979bb08f3abf89e924
+_md5_=25391fbc23797f25695dc09b710af0ff
diff --git a/metadata/md5-cache/dev-python/pytest-trio-0.7.0 b/metadata/md5-cache/dev-python/pytest-trio-0.7.0
index 5b2dae1e5464..f6c413f96395 100644
--- a/metadata/md5-cache/dev-python/pytest-trio-0.7.0
+++ b/metadata/md5-cache/dev-python/pytest-trio-0.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=This is a pytest plugin to help you test projects that use Trio
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/pytest-trio https://pypi.org/project/pytest-trio/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=dev-python/async_generator-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/outcome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/trio-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-trio/pytest-trio-0.7.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=572fbade9029a927366d512915b223ba
+_md5_=9f2f296deaa3648fc731b35078469ccb
diff --git a/metadata/md5-cache/dev-python/requests-2.26.0 b/metadata/md5-cache/dev-python/requests-2.26.0
index 59e461fa0f34..5e73a4e37c20 100644
--- a/metadata/md5-cache/dev-python/requests-2.26.0
+++ b/metadata/md5-cache/dev-python/requests-2.26.0
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=8
 HOMEPAGE=https://requests.readthedocs.io/
 IUSE=socks5 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.26.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c9c8f7abfb056d3e1873594f136625d5
+_md5_=ebd606f2e5e4d66779046a91acc45764
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
index d2d42588b994..3818883abe03 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Make Sphinx better at documenting Python functions and methods
 EAPI=8
 HOMEPAGE=https://github.com/python-trio/sphinxcontrib-trio https://pypi.org/project/sphinxcontrib-trio
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fc1307acaf5cebc865b3a074d9143886
+_md5_=4699feb6b13de190050f027408a54590
diff --git a/metadata/md5-cache/dev-python/trio-0.19.0 b/metadata/md5-cache/dev-python/trio-0.19.0
index 37797404b1d6..d191f010d410 100644
--- a/metadata/md5-cache/dev-python/trio-0.19.0
+++ b/metadata/md5-cache/dev-python/trio-0.19.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for async concurrency and I/O
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/trio https://pypi.org/project/trio
 IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=>=dev-python/async_generator-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/outcome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sortedcontainers[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/trio/archive/v0.19.0.tar.gz -> trio-0.19.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9ef232448b2083b7f46960e92270d08b
+_md5_=5a97acbf36c8420efd09d43ea0a93cd5
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7-r1 b/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
index 87d473ae4283..25c4e0e674dd 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A blending of the wxWindows C++ class library with Python
 EAPI=7
 HOMEPAGE=https://www.wxpython.org/
 IUSE=test webkit python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=wxWinLL-3
 RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=16cd098da78b7df6239724e9e798aab5
+_md5_=65bac69843b867ea9f3d5e5c82653cc2
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 623b13251e17..c8621b7ff9db 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1 b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
index c1e1452fd2a6..f9c745ab80da 100644
--- a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
+++ b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Deep Freeze Ruby Objects
 EAPI=7
 HOMEPAGE=https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ice_nine-0.11.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=42dc1561531ced3579021f7f7083637e
+_md5_=e387fadb1f32ca1dbc2387ab9b5c9a61
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
index 6f8852f0cbbd..a3891a6e763e 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressio
 EAPI=7
 HOMEPAGE=https://github.com/ammar/regexp_parser
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.1.1.tar.gz -> regexp_parser-2.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=23c8890b03292c8047d087ee28783809
+_md5_=e60ba6926a0f8aa71f4fff5b3b834e19
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 8888042bfa5e..606e13fcb718 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-git-0.5.2 b/metadata/md5-cache/dev-scheme/guile-git-0.5.2
new file mode 100644
index 000000000000..cced08d5d1a6
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/guile-git-0.5.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare test
+DEPEND=>=dev-scheme/guile-2.0.11:= dev-scheme/bytestructures >=dev-libs/libgit2-1:=
+DESCRIPTION=Guile bindings of git
+EAPI=8
+HOMEPAGE=https://gitlab.com/guile-git/guile-git
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-scheme/guile-2.0.11:= dev-scheme/bytestructures >=dev-libs/libgit2-1:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/guile-git/guile-git/uploads/6450f3991aa524484038cdcea3fb248d/guile-git-0.5.2.tar.gz
+_md5_=1c8ee849c544c8229b9fcf99e7caad2f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 18aba082caea..7cd926fa920f 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.68.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.68.3
index 6d5ccf5cdb8e..9f45e72cfa28 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.68.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.68.3
@@ -5,11 +5,11 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.3.tar.xz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=320b1470fda2f1bf9b3a6f0ebe1676f7
+_md5_=4d5591cae3271dcd12b4dd65cbaf8416
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.68.3 b/metadata/md5-cache/dev-util/glib-utils-2.68.3
index 770ff905c881..fe388281b4e5 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.68.3
+++ b/metadata/md5-cache/dev-util/glib-utils-2.68.3
@@ -5,11 +5,11 @@ DESCRIPTION=Build utilities for GLib using projects
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_single_target_python3_8 python_single_target_python3_9
-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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea8b589b810677d3c67e2f6da9e21347
+_md5_=138bc448849ca2f3adcd06ca2f061307
diff --git a/metadata/md5-cache/dev-util/vbindiff-3.0_beta5-r1 b/metadata/md5-cache/dev-util/vbindiff-3.0_beta5-r1
index 67976bf7d77f..8cd1dfb24c70 100644
--- a/metadata/md5-cache/dev-util/vbindiff-3.0_beta5-r1
+++ b/metadata/md5-cache/dev-util/vbindiff-3.0_beta5-r1
@@ -3,9 +3,9 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Visual binary diff utility
 EAPI=8
 HOMEPAGE=https://www.cjmweb.net/vbindiff/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/mrdudz/vbindiff/releases/download/3.0_beta5/vbindiff-3.0_beta5.tar.gz
-_md5_=74364459d4e5f860c540786b9270b71f
+_md5_=6854392d51854937eef8ed2d53fd7b0e
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 872145c5a1f1..91768a0cba20 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.50.7 b/metadata/md5-cache/gnome-base/librsvg-2.50.7
index e5f0c85930f3..3e56b95f6e27 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.50.7
+++ b/metadata/md5-cache/gnome-base/librsvg-2.50.7
@@ -4,7 +4,7 @@ DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
 IUSE=+introspection +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/cairo-1.16.0[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.44.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.50/librsvg-2.50.7.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=838c36fa1e2ed77b98da2ef9cc7deadf
+_md5_=34ea5fc9b53e1e36b4a756a482cbcf9b
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index ad24354eb120..905ead918692 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-13.0.8 b/metadata/md5-cache/gnome-extra/gucharmap-13.0.8
index 8d2dc86b13d9..1017c095aac0 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-13.0.8
+++ b/metadata/md5-cache/gnome-extra/gucharmap-13.0.8
@@ -5,11 +5,11 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 IUSE=debug +introspection gtk-doc vala
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3+
 RDEPEND==app-i18n/unicode-data-13.0* >=dev-libs/glib-2.32:2 media-libs/freetype:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/pango-1.42.4-r2[introspection?]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/13.0.8/gucharmap-13.0.8.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc32b0717d0863adce3927dcf53ea6b1
+_md5_=7f2edf75dbe907e9a5c03bc4387008f7
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-40.2 b/metadata/md5-cache/gnome-extra/yelp-xsl-40.2
index 8fff4df98e43..6dc7b4272374 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-40.2
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-40.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/itstool
 DESCRIPTION=XSL stylesheets for yelp
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/yelp-xsl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
 RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/40/yelp-xsl-40.2.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=631bc89a986ab83e69f63f7ec771a2ce
+_md5_=abb39bc5e06be0bcf7f00f060b4a464a
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 8140e2de88ff..2beb5540df93 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/libhandy-1.2.3 b/metadata/md5-cache/gui-libs/libhandy-1.2.3
index daedbf2b19e2..2a152be311d2 100644
--- a/metadata/md5-cache/gui-libs/libhandy-1.2.3
+++ b/metadata/md5-cache/gui-libs/libhandy-1.2.3
@@ -5,7 +5,7 @@ DESCRIPTION=Building blocks for modern adaptive GNOME apps
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libhandy/
 IUSE=examples glade gtk-doc +introspection test +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libhandy/1.2/libhandy-1.2.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3cd20c8d141cadd8d775f0ce2d433a6e
+_md5_=6b02b0f119c8ada8555750a2d60f7100
diff --git a/metadata/md5-cache/gui-libs/libwpe-1.10.1 b/metadata/md5-cache/gui-libs/libwpe-1.10.1
index c29091644344..30adef9bda4d 100644
--- a/metadata/md5-cache/gui-libs/libwpe-1.10.1
+++ b/metadata/md5-cache/gui-libs/libwpe-1.10.1
@@ -4,10 +4,10 @@ DEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/libwpe-1.10.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0a69a20ac4346800ada89971f10640d6
+_md5_=8cb19e7ade67a2bee7e57db19ccb060c
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
index d0f7a3726343..9128555001ae 100644
--- a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-li
 DESCRIPTION=WPE backend designed for Linux desktop systems
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.10.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=312a0a9a0c077d006abd1a496c2ca433
+_md5_=b9dd38002ad40ec83b1772645cabfe39
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index e379157bfd24..f1c6dcbf2769 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.2-r2 b/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
index beaaf178ca1c..a0ee4c374e85 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Simple relay-only local mail transport agent
 EAPI=7
 HOMEPAGE=http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer
 IUSE=ssl test
-KEYWORDS=amd64 arm arm64 ppc x86 ~x64-cygwin
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86 ~x64-cygwin
 LICENSE=GPL-2
 RDEPEND=acct-group/nullmail acct-user/nullmail virtual/logger sys-apps/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta(+)] !mail-mta/netqmail !mail-mta/opensmtpd[mta(+)] !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta(+)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7c009ccf071e67f907895d3359d11392
+_md5_=8475e629312a1bc9b331c459b9f91148
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index a01c2ef7af96..511fb1c73f56 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/glu-9.0.2 b/metadata/md5-cache/media-libs/glu-9.0.2
index 55328d0929e8..aa8398654b8c 100644
--- a/metadata/md5-cache/media-libs/glu-9.0.2
+++ b/metadata/md5-cache/media-libs/glu-9.0.2
@@ -5,10 +5,10 @@ DESCRIPTION=The OpenGL Utility Library
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/mesa/glu
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=SGI-B-2.0
 RDEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aa6eb5151128f4f3292b5f136a75fd84
+_md5_=911121c815edbbb90045987266e9af4c
diff --git a/metadata/md5-cache/media-libs/libldac-2.0.2.3 b/metadata/md5-cache/media-libs/libldac-2.0.2.3
index 649c024a74c3..b4cdb2898744 100644
--- a/metadata/md5-cache/media-libs/libldac-2.0.2.3
+++ b/metadata/md5-cache/media-libs/libldac-2.0.2.3
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=LDAC codec library from AOSP
 EAPI=7
 HOMEPAGE=https://android.googlesource.com/platform/external/libldac/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/EHfive/ldacBT/releases/download/v2.0.2.3/ldacBT-2.0.2.3.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e27efc1761b2662490c6713900be716f
+_md5_=b41f6237905fe0bf4a8af0b797a03875
diff --git a/metadata/md5-cache/media-libs/libopenaptx-0.2.0 b/metadata/md5-cache/media-libs/libopenaptx-0.2.0
index da3f9c1c8dc7..e396b0e9e671 100644
--- a/metadata/md5-cache/media-libs/libopenaptx-0.2.0
+++ b/metadata/md5-cache/media-libs/libopenaptx-0.2.0
@@ -3,9 +3,9 @@ DESCRIPTION=Reverse-engineered aptX and aptX HD library
 EAPI=7
 HOMEPAGE=https://github.com/pali/libopenaptx
 IUSE=cpu_flags_x86_avx2
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/pali/libopenaptx/archive/0.2.0.tar.gz -> libopenaptx-0.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=268c2ab148c6252ab126fcd5bbf6678e
+_md5_=5638a80628ada983c8fb3958c732c38a
diff --git a/metadata/md5-cache/media-libs/mesa-21.1.4 b/metadata/md5-cache/media-libs/mesa-21.1.4
index 8ca283b39c1d..178b6fa8ae4c 100644
--- a/metadata/md5-cache/media-libs/mesa-21.1.4
+++ b/metadata/md5-cache/media-libs/mesa-21.1.4
@@ -5,7 +5,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.105[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.105[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.105[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.105[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
 REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-21.1.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=48e2868ff21838c172dfc6ffee2dfce5
+_md5_=97bee53d8b9c7abae6a2ce7c88391fc1
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 406e0d5056dd..f1b41766e039 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.30-r2 b/metadata/md5-cache/media-video/pipewire-0.3.30-r2
index ad3bc58b18c4..01bc82d3aeb4 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.30-r2
+++ b/metadata/md5-cache/media-video/pipewire-0.3.30-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Multimedia processing graphs
 EAPI=7
 HOMEPAGE=https://pipewire.org/
 IUSE=bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=jack-sdk? ( !jack-client )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.30/pipewire-0.3.30.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=a42e298d8a10304d19d36069bc50aa5a
+_md5_=5c29755233cda45183e6e5abf5e2d2a7
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 9afd0ae5cd2d..30517cd99962 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/gupnp-1.2.7 b/metadata/md5-cache/net-libs/gupnp-1.2.7
index dba426f19ed8..dbfb4beac8c5 100644
--- a/metadata/md5-cache/net-libs/gupnp-1.2.7
+++ b/metadata/md5-cache/net-libs/gupnp-1.2.7
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented framework for creating UPnP devs and control poin
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
 IUSE=connman gtk-doc +introspection kernel_linux networkmanager vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.66:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.2.3:0=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ?? ( connman networkmanager )
 SLOT=0/1.2-0
 SRC_URI=mirror://gnome/sources/gupnp/1.2/gupnp-1.2.7.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7f20ad66128ad24da7428fe1206f1850
+_md5_=0b2a7da595823687b594bd8a48228bf4
diff --git a/metadata/md5-cache/net-libs/libmbim-1.24.8 b/metadata/md5-cache/net-libs/libmbim-1.24.8
index 7a9881d23a8a..7f1399aa8fb5 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.24.8
+++ b/metadata/md5-cache/net-libs/libmbim-1.24.8
@@ -5,9 +5,9 @@ DESCRIPTION=Mobile Broadband Interface Model (MBIM) modem protocol helper librar
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim
 IUSE=udev
-KEYWORDS=~alpha amd64 arm arm64 ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.48:2 udev? ( dev-libs/libgudev:= )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.24.8.tar.xz
-_md5_=7af3f4d23b5366ce66f9802eace2de54
+_md5_=79c3c35bf78a8bd2abf67a74a404f28a
diff --git a/metadata/md5-cache/net-libs/libqmi-1.28.6 b/metadata/md5-cache/net-libs/libqmi-1.28.6
index 105c49c9abe4..b6910b80978f 100644
--- a/metadata/md5-cache/net-libs/libqmi-1.28.6
+++ b/metadata/md5-cache/net-libs/libqmi-1.28.6
@@ -5,9 +5,9 @@ DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol l
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
 IUSE=gtk-doc +mbim
-KEYWORDS=amd64 arm arm64 ~mips ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0 )
 SLOT=0/5.7
 SRC_URI=https://www.freedesktop.org/software/libqmi/libqmi-1.28.6.tar.xz
-_md5_=26e8514526b26390d3f97d983bfc8b0e
+_md5_=e6ff1ac84a72e788c506a1f420a28d0d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index acf49657bd96..c2344115667a 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/iputils-20210722 b/metadata/md5-cache/net-misc/iputils-20210722
index 6ce47428e437..05d4bc2c1794 100644
--- a/metadata/md5-cache/net-misc/iputils-20210722
+++ b/metadata/md5-cache/net-misc/iputils-20210722
@@ -11,4 +11,4 @@ RDEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/li
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/20210722.tar.gz -> iputils-20210722.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20210722.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=263ab3630c720b5f9ce01100c311c11e
+_md5_=7a7686ca3fd2d45a774700ab2d2f94a2
diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999
index 9828c9b792c7..527f135232d4 100644
--- a/metadata/md5-cache/net-misc/iputils-99999999
+++ b/metadata/md5-cache/net-misc/iputils-99999999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) ) filecaps? ( sys-libs/libcap )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=263ab3630c720b5f9ce01100c311c11e
+_md5_=7a7686ca3fd2d45a774700ab2d2f94a2
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.16.6 b/metadata/md5-cache/net-misc/modemmanager-1.16.6
index d5d4b56f62db..4310b8b0551d 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.16.6
+++ b/metadata/md5-cache/net-misc/modemmanager-1.16.6
@@ -5,11 +5,11 @@ DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
 IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2 udev? ( >=dev-libs/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.24.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection?] ) qmi? ( >=net-libs/libqmi-1.28.6:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev )
 REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.16.6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=94132e17584bd3b19ee0ccc192fedfb7
+_md5_=2ad1c2bd11b825674f7327da46445583
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index cd38890a2b01..624eae340222 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/fprintd-1.90.9 b/metadata/md5-cache/sys-auth/fprintd-1.90.9
index 121f3e0e7f42..9779cd399945 100644
--- a/metadata/md5-cache/sys-auth/fprintd-1.90.9
+++ b/metadata/md5-cache/sys-auth/fprintd-1.90.9
@@ -5,11 +5,11 @@ DESCRIPTION=D-Bus service to access fingerprint readers
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/libfprint/fprintd
 IUSE=doc pam systemd test
-KEYWORDS=~amd64 ~ia64 ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint:2 sys-auth/polkit pam? ( systemd? ( sys-apps/systemd ) !systemd? ( sys-auth/elogind ) sys-libs/pam )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.90.9/fprintd-v1.90.9.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3cc5ebb03357fa7329118d7d6f82d2fc
+_md5_=48874547876de90c97cf044526c66524
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 30bf4f89dd54..d2d79a00b191 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/storcli-7.1804 b/metadata/md5-cache/sys-block/storcli-7.1804
new file mode 100644
index 000000000000..4e0ecc32dc9d
--- /dev/null
+++ b/metadata/md5-cache/sys-block/storcli-7.1804
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=MegaRAID StorCLI (successor of the MegaCLI)
+EAPI=7
+HOMEPAGE=https://www.broadcom.com/support/download-search?dk=storcli
+KEYWORDS=-* amd64
+LICENSE=Avago LSI BSD
+SLOT=0/7.18
+SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.1804.0000.0000_Unified_StorCLI-PUL.zip -> storcli-7.1804.zip
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=66e0839ec2738b0e4ecef1c3395b5fa2
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index b03a2352879d..a742fe9ed276 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 62fb74208191..204d6a74725b 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210724.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=585e80830020114a684607a7fd858b3d
+_md5_=148a712b5a2cddf28b4b6be11c9b1316
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 6d4e2e9f55e3..438edd3b48ab 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/parallel-20210622 b/metadata/md5-cache/sys-process/parallel-20210622
index e9328a4d603b..749328e5fe2e 100644
--- a/metadata/md5-cache/sys-process/parallel-20210622
+++ b/metadata/md5-cache/sys-process/parallel-20210622
@@ -5,10 +5,10 @@ DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote mac
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
 IUSE=verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20210622.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210622.tar.bz2.sig )
 _eclasses_=verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=0976998ba221b7e275f6fbc75bde284b
+_md5_=5d68ad401c879d589a68e7a3a748f45f
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 83b5466252e6..f65ffa29536f 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.2.2 b/metadata/md5-cache/x11-apps/fonttosfnt-1.2.2
index 3c4d8b601ac9..ea49e7da66f6 100644
--- a/metadata/md5-cache/x11-apps/fonttosfnt-1.2.2
+++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.2.2
@@ -4,10 +4,10 @@ DEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libfontenc x11-base/xorg-p
 DESCRIPTION=X.Org fonttosfnt application
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fonttosfnt
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libfontenc
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/fonttosfnt-1.2.2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=768c85c8c060f1242eb23b3bb08e285c
+_md5_=c4fd7266e6c3e9720d7ad0169a57e04e
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index f0bbf2002293..e4d7dc7b2cf4 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0
index 9a6dc7aeb887..6261f09fc99d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=X.org input driver based on libinput
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
 IUSE=kernel_linux
-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
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.11.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-1.1.0.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=0cd633ec6b2b04ff44f74bb2771e48de
+_md5_=198634d202515ae4fb3cedf283c31510
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index fad360c9985c..4fe259c3cfbd 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.2 b/metadata/md5-cache/x11-libs/libX11-1.7.2
index 6ff8a10172bf..b52b16d89ef5 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.7.2
+++ b/metadata/md5-cache/x11-libs/libX11-1.7.2
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org X11 library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
 IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<x11-base/xorg-proto-2019.2 x11-misc/compose-tables
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=0aa811eab4fcc9d59db28f25947338ee
+_md5_=d4d80c518a2c59943afb5af06c108ff4
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.106 b/metadata/md5-cache/x11-libs/libdrm-2.4.106
index 0901bbdfcd73..564ecd48671c 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.106
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.106
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=7
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.106.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=23ffa4c2746a1554782077da520e1be7
+_md5_=e25003964cec56522a41f0c42561d4c4
diff --git a/metadata/md5-cache/x11-libs/pango-1.48.7 b/metadata/md5-cache/x11-libs/pango-1.48.7
index 770cc9f07299..9e3e60f45b7c 100644
--- a/metadata/md5-cache/x11-libs/pango-1.48.7
+++ b/metadata/md5-cache/x11-libs/pango-1.48.7
@@ -5,7 +5,7 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=7
 HOMEPAGE=https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango
 IUSE=gtk-doc +introspection sysprof test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.62.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.12.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.10:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=gtk-doc? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://ftp.gnome.org/pub/GNOME/sources/pango/1.48/pango-1.48.7.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b77115e3da9def5a4992d0bf00b08533
+_md5_=b7d6443d4e0028008125d07965a6cbc4
diff --git a/metadata/md5-cache/x11-libs/vte-0.64.2 b/metadata/md5-cache/x11-libs/vte-0.64.2
index 7bc566c40613..ce97b1bda6a1 100644
--- a/metadata/md5-cache/x11-libs/vte-0.64.2
+++ b/metadata/md5-cache/x11-libs/vte-0.64.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library providing a virtual terminal emulator widget
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
 IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-3+
 RDEPEND=>=x11-libs/gtk+-3.24.14:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.64.2/vte-0.64.2.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.64.1-command-notify.patch.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a8de3907d1e7f27e7eeebbdf2f8e364c
+_md5_=c3d07ee06c13b63cc5513da0936770b8
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 6cab70e7015d..edfecd7be1f2 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.7.2 b/metadata/md5-cache/x11-misc/compose-tables-1.7.2
index 18660f3f5ea4..9b363a67e97c 100644
--- a/metadata/md5-cache/x11-misc/compose-tables-1.7.2
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.7.2
@@ -4,10 +4,10 @@ DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
 DESCRIPTION=X.Org Compose Key tables from libX11
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=!<x11-libs/libX11-1.7.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=b3edb83f4dbca27b244be000c82351da
+_md5_=c6783b4262ea6b197b7249b6552cddab
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1a499dec1e0f..b166d8cb6d9d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 13127 BLAKE2B 48dcdc744faac295d7e940945e2b94bc36fdb9280374bfc294be22c17310f4955e8cf9ed86e79377561110355907e899de6dbb881be09a380095cf3f459a4d0c SHA512 1e3e0397f22b3a604da99aad6077f9ef3eab37fc45ead99cd2477203abb00c21ec19cfd941874474dcdfe39c72bb1da6fc88446968c21e2b8cd07dd690e2c3d2
-TIMESTAMP 2021-07-24T10:39:00Z
+TIMESTAMP 2021-07-24T18:09:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmD77cRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmD8V0BfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA5wA//fxq5NUsWyyz+a2nG1DdYQ7RLzdy4ZD015rJoqPNEI2cDnk75WI4TRDET
-4kpAdT0QOiuwIB8qvaSEKMK7GBUvhcN+mcI/YvT6Q+AFzjHFdIN3qUJY8B6CXPCA
-n4P4c3aA/xkOYgmAawlo0fD5JgE7XWknVLcMn+A8X9PUxxD4r3Lmzs1aqQ85ipXw
-LfAXG7PKyH7383ttl4M/LhQP8145E/Fl/MQh1d2ePpIBa8LpZIKOe/w3mbINSupC
-DDvfGBtXDf5HLxT9Ds1SAPuI5Yd8yEH+ppyfqlPXKKvMrq0JaWnzx6KyrOkTDOu/
-62A+usqsyK/foJZGSJfw9jZ3Z4ZNYmGvCUORe93SGTeOo5TnJN5L/yNqstYTz6Ov
-EuUW6+5+Rhomm6+nKKQLdDlifI4FUbcrf+qBvLmYvXJKnckhQoW5gpkyVjqkknxg
-Z2HUq3ZcQLgi6cjGvuEwSQ8pfXL4OP7OgxQNoV5NgcUKs2nl96sADbUlC8YGsBaR
-sZJWVrr1C//bFHxszN6WbDLA8kusvEUJ6fOABbuu/qXNwhHFFKkVjBJNNOoz/au+
-ob80qzS/s3lAicuE544GYO+GmQkf8xnpPf3qg42wklQWgVPrAI91CZ7+jK8Of1Zr
-U+hh0nuwz8aG7EfLPPke1Hvn3vZ8H9yIjwn3a+N95v1pgUgAUZo=
-=yU4D
+klDTHhAAhAxDe/769+7i9BsOqXpR3NQpXN+VJOZzK+LqPtGNSpEF7i7dn7pWW8ah
+Yk/+1KYAbYbXfW08i38T/NvH8LiH9avrOsubr7hoXCL+2jOGiKOP9eqCdkJkOeBO
+dlr0EAVGuQTrvz/HEaWC1XZZngu/nAKnQma1f9jCwgk/0f9GBmIpVbTlUPI3L7oh
+6EAmyR0guGgMOUudG2Y+3+YEprgekCeqNVUewprFnsfJLRMI0aTMUW9cLF9nn0HG
+6nBzhPNu5hxH/mA+2GlfU9ctE8nYSHEX8sb3Z4gtnrWfVks9cPDa2dZ/eCzv7tix
+br5DYRV5ImtZj3gokyS3DfADtHCrTFX0IvQQ3V0AYSSIajFh6teIM+3JzWhPVimP
+z+VEZcvhjGyFatnIPZUluRytyJv2DhxEoGKwLYnlGdPlfTfH0Kly9a5xZQVXx95J
+QeTnwv/0eBihPaOqMn14PHugm0zECuZU6aoxtOZX0zIfTZOd3DAUJu4V3Xgxwy4A
+Jx2VBa2x1A7L9d7WImM37gxFANn1aHeSaIhEA0ontgEdemB1N4+vfOy9U3YSvabP
+HuKbAj/uPUoB93Bf98GB39G2pos93kuiDgfzZttrL7zUAvaWs63ZwyhVvZEzAgdt
+8niXx6YFmFMpunCg679EiRsJrCUnmnqkvps9Ba7H2nc/hqpqQow=
+=EItC
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 36c501de0268..360999900e20 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Jul 2021 10:38:56 +0000
+Sat, 24 Jul 2021 18:08:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index baf8e8e2a116..7ef580539053 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jul 24 10:38:56 AM UTC 2021
+Sat Jul 24 06:08:57 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e99426003930..5e7fda7f9f8e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Jul 2021 10:45:01 +0000
+Sat, 24 Jul 2021 18:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 4e34d54ee3ba..9c41adba5e78 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2968220cfc3cfbabc2dd4444850dcc38d8570591 1627122496 2021-07-24T10:28:16+00:00
+eaf5eeeb1a75fb4d3b51e17edc9d039310da82e6 1627148022 2021-07-24T17:33:42+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 22264368bb5a..04e00e6cd7c8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1627122901 Sat 24 Jul 2021 10:35:01 AM UTC
+1627149901 Sat 24 Jul 2021 06:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 36c501de0268..e287d533e2fb 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Jul 2021 10:38:56 +0000
+Sat, 24 Jul 2021 18:08:57 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 0dfc477881bc..0987c7eca79d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 919b40f5e942..ea35a76c83c4 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -2,6 +2,6 @@ DIST gupnp-1.2.6.tar.xz 142652 BLAKE2B 12f3fd59b6c8616dcbc32ab4feeeccde864af6da0
 DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409
 DIST gupnp-1.3.0.tar.xz 150160 BLAKE2B 300147881e30300cd2bbff7ffc2666d6281dc165cbfcca46617a59c244bb699d49f26074e07909782038f5a87939ac342fe5ae5468a9c38d8065ceea70293c6b SHA512 6367f3d616acef433a26d2475b4ec3067ced9d09e9e9ccf6400f30abc4202e0dd524aa33beb7bb5f88c9a62ff69fafc0d283dc0cb80220f53bfd027205069763
 EBUILD gupnp-1.2.6.ebuild 2065 BLAKE2B 2f76e6584658f65b4bef9beb15c6f39f63204af7aa468955002d6698aba3c00cea9b7d7b468ef4b4fcd7c6688d8693ca1ca4b13178f0cadb3d0f3a97c1364ab2 SHA512 e3add284a70c4d19b9e3978ea5eadfc668f69eddc3128d7f905e85d0609cc444c9a5d5fc46fc16969e0a879004c603f0eba538ddc6a6f59dc3c2f67644e83388
-EBUILD gupnp-1.2.7.ebuild 2066 BLAKE2B 0c36906a29505e42bae46c506628da361272981f3ec9f3b4cd1f4eb94a170b374aee3cb8054549e4c53cf693eb19a6e3d89aaf1f76ec20e67982dce5ca28de53 SHA512 623a495d00c395ce02c746b0fbde69f0620c7f257cba3e5b4881b785690210259be874f3aefa38ff159a464a559276b3109e91fd03ac27b1e7b46f454ae5ca0e
+EBUILD gupnp-1.2.7.ebuild 2065 BLAKE2B 3fe0f17df8f0b46738a499c4bc397df8f2cee85c043dbc5e05c15c233eac2d4e913d2faf411b98426f4065e38ffe4be693e6e5cafd733015444ef956cf00429c SHA512 56fccfb391d16337c85fa9db4230eb3ec4c370b3b23c9953eb2cbe3c4b481be563eda9dd9858382ebf836063a60eec0af156389d2e0191853da5b657c7120f78
 EBUILD gupnp-1.3.0.ebuild 2106 BLAKE2B 18dc5285702f075e17d40a683eb764e5d3ea94af0e9f631ea420f494d7c6e0c9bb81729b6d4a50b90c02552de79d07589f13ce651e82761fd21fc31e7f355854 SHA512 588d198c7df6ec981286a6a8cf50370a68a50f767c957606095c7094c9b3f78ba035034c7161eff681a6a539555eaa7bc52f8cd43f4aa9a3e63294ca753bfb88
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.2.7.ebuild b/net-libs/gupnp/gupnp-1.2.7.ebuild
index d060442b7c12..1bc7fdb240a0 100644
--- a/net-libs/gupnp/gupnp-1.2.7.ebuild
+++ b/net-libs/gupnp/gupnp-1.2.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
 SLOT="0/1.2-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 8ca6bb88b06b..688be465d7af 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,5 @@
 DIST libmbim-1.24.6.tar.xz 511468 BLAKE2B 89c4fa25573d4e58ec993e4fa24e0ff3ab6146c905fd3110240d2dbd3ba20af8c135e5eb552b2c48b1166444e52023e314d70d4fe5904ede5e2c6d3d05724955 SHA512 b0b15aa5ffdc65e9d7af211df771f85021488258f7c50638ad109173a61ef38872b9ab42005cd972fd3cb24e617bd3fe7b0b79d335e2144558daa218fb2c4653
 DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af
 EBUILD libmbim-1.24.6.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
-EBUILD libmbim-1.24.8.ebuild 818 BLAKE2B 959a4177a2825416b4527ed0328f7cb9ad3a93625f0dfdd1c7d6581521638f299824222eac6121001c88964c630fec4b7f1f9a732fa66dfc2db81100ddfaced6 SHA512 9e64f5819e4e9f3d023fc258be199d19a83f91fdc9f61e36486ab187e9a312986385a3991f840c9709e3375b01b70cb8197b414e0b82ad2afe773fa5e92d833c
+EBUILD libmbim-1.24.8.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libmbim/libmbim-1.24.8.ebuild b/net-libs/libmbim/libmbim-1.24.8.ebuild
index acd7495675b6..bbdba255bb73 100644
--- a/net-libs/libmbim/libmbim-1.24.8.ebuild
+++ b/net-libs/libmbim/libmbim-1.24.8.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 x86"
 IUSE="udev"
 
 RDEPEND=">=dev-libs/glib-2.48:2
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 5aebc07df53a..7c776a119456 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,6 @@
 DIST libqmi-1.28.4.tar.xz 1168088 BLAKE2B 828a8688a49a08f0848414b8e51c2ece4a0035ecdf449a5dc9e2cf3b6ecaf1525d5a1c29e329a584ec054f66b9a141d0ba3980b8affb34db3088ed2b5591a265 SHA512 dad3cd2740804d2ec6aa04f0f140d385c00d5a3854d75ccdf54ee6fa4f3cdfc02de5da21cd8b43d5a7c6b467b94b5001bc857fbab01aeedbdb51c0e3d9da9690
 DIST libqmi-1.28.6.tar.xz 1192736 BLAKE2B 30330a8d085b26fc461c6fec2cfa58757e91093243aed8a4ac6df53a7656881f295a800979ff8fd42b815f96fafd128848765ecfb163e8101ac9c9a52eaaf507 SHA512 f4f7022e8c9b60618062548ec97450d98a5125dbd0e26df3dfb8bda5ab19a1f4c7864d35f7bd77217a4fe5562ce665fa613902b1d2185680bfa5d0c1e229e6dd
 EBUILD libqmi-1.28.4.ebuild 1222 BLAKE2B 4e226ffda064e482aec9c9fb12c93e8ec57b97aaa7d43048e5a183ef63579c3940ac7fbfc3ca8a3ca75c08c8131f4f890124e42e22de558a18cd9171b8392096 SHA512 b862fde5d896147e419b131bf9e123e4bf76171d557363db2cf77726509861d3c8db5bef9b3f706ac59e38f901cc2f18d413287bd637d0a43ac449ae252b7f15
-EBUILD libqmi-1.28.6.ebuild 1224 BLAKE2B 5f8802aa9a858919c287b4e6336eae536041765556a2686675da9525c01ecca1d23e6aefb4ec7ef20e6b31cc9fdc8718c209c1252489f14e115a78c440014228 SHA512 9279a0bc8663e945aa4ef3ee02b72b2805937f65ff968aed227fde2468234158668fc3e0e9ec59cce3d4a445c6b6aa43d54ab4f5a775d6675e7f912402e695b9
+EBUILD libqmi-1.28.6.ebuild 1222 BLAKE2B 4e226ffda064e482aec9c9fb12c93e8ec57b97aaa7d43048e5a183ef63579c3940ac7fbfc3ca8a3ca75c08c8131f4f890124e42e22de558a18cd9171b8392096 SHA512 b862fde5d896147e419b131bf9e123e4bf76171d557363db2cf77726509861d3c8db5bef9b3f706ac59e38f901cc2f18d413287bd637d0a43ac449ae252b7f15
 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.6.ebuild b/net-libs/libqmi/libqmi-1.28.6.ebuild
index 1af34e2bae9a..c62b2a064ccf 100644
--- a/net-libs/libqmi/libqmi-1.28.6.ebuild
+++ b/net-libs/libqmi/libqmi-1.28.6.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 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 606bf74dd0cf..80e332fb8f6d 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index d0a423a785d1..e873f745469d 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -3,6 +3,6 @@ DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f5
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
 EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670
-EBUILD iputils-20210722.ebuild 4218 BLAKE2B 155c1e2581e7a2c49b5685fc100cd58f9486bb2b45d892b91aec2134ab3273aefe0cb9803fadb8ca8843eb360ebeb7a8b72b3f74d995ff3e6eb9e2c63102afd4 SHA512 f6105cce94fa3ed8af8b4cda65e709499defdad5f5d635b8175691ce6f0217420a52600698beeac4662ec8804efed5a8b178381fab9a0d8e92ac9329a6af974a
-EBUILD iputils-99999999.ebuild 4218 BLAKE2B 155c1e2581e7a2c49b5685fc100cd58f9486bb2b45d892b91aec2134ab3273aefe0cb9803fadb8ca8843eb360ebeb7a8b72b3f74d995ff3e6eb9e2c63102afd4 SHA512 f6105cce94fa3ed8af8b4cda65e709499defdad5f5d635b8175691ce6f0217420a52600698beeac4662ec8804efed5a8b178381fab9a0d8e92ac9329a6af974a
+EBUILD iputils-20210722.ebuild 4347 BLAKE2B 2f525b08abd351e4d45e5db6b8e84ad506a0e7e19e8194a95d9bbc6c052af689706288eafd3d00d9e9c42b93a2cb7c6e272732ce07a3b5e43f99455595e81b1b SHA512 0f21935212e8116a386aa6fee2aa5ee9019d78628727ff68223c557573170bbbbd22a279ac07e7041f198bb1ce9b12b0aa4562058747e73f4f9395f3096a7fea
+EBUILD iputils-99999999.ebuild 4347 BLAKE2B 2f525b08abd351e4d45e5db6b8e84ad506a0e7e19e8194a95d9bbc6c052af689706288eafd3d00d9e9c42b93a2cb7c6e272732ce07a3b5e43f99455595e81b1b SHA512 0f21935212e8116a386aa6fee2aa5ee9019d78628727ff68223c557573170bbbbd22a279ac07e7041f198bb1ce9b12b0aa4562058747e73f4f9395f3096a7fea
 MISC metadata.xml 1509 BLAKE2B 800c6f657d331ad2f73fbd3e6a199732549f89ba31188e8caf5612008b89f60c6a7fb925f2740fcca07d3772f12ea9c5590de834e77201730b848a877061a97a SHA512 5b358f53068f6a49f00141c47f75fde84fe609fd6652e3e717b97b9d36abbfb80ea52c1ef8c2e3a850ab3724f1d4a87093b2bfc1ee5497d082ce1937dc3aa83d
diff --git a/net-misc/iputils/iputils-20210722.ebuild b/net-misc/iputils/iputils-20210722.ebuild
index 731796a22c5e..0e3d015bdb90 100644
--- a/net-misc/iputils/iputils-20210722.ebuild
+++ b/net-misc/iputils/iputils-20210722.ebuild
@@ -110,6 +110,15 @@ src_compile() {
 	meson_src_compile
 }
 
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		einfo "Tests require root privileges; Skipping ..."
+		return
+	fi
+
+	meson_src_test
+}
+
 src_install() {
 	meson_src_install
 
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 731796a22c5e..0e3d015bdb90 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -110,6 +110,15 @@ src_compile() {
 	meson_src_compile
 }
 
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		einfo "Tests require root privileges; Skipping ..."
+		return
+	fi
+
+	meson_src_test
+}
+
 src_install() {
 	meson_src_install
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 172594681a8c..9698743f9251 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -3,5 +3,5 @@ AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e9149
 DIST ModemManager-1.16.4.tar.xz 2335908 BLAKE2B dfd3293e9b685d3b01fa3deec111aafca6f11dc27be0a69e0496036e537eecb6f51f592ce1996f47c86b5d9db2abf3c9b9a26e66e9f058ba59982caf38b28ef9 SHA512 5fb7625c9d41ce0179b4e59745b00b815038239552a5438d71ff36b019b398fc3dc6bef709e91a186f5f7427fcb59d79c0b1c3ca9c3dca867f0d5677fd979506
 DIST ModemManager-1.16.6.tar.xz 2339528 BLAKE2B b76a8b6959d988a27d411384440b9bd1b7ac1a9d780b77319e735c4b42c55c51f51304ae936aa9b385634640bcb1a55696d4bd25ffdaf88eb73839bfefe5e091 SHA512 78a928007732baaa0eaed9d587913774d4fb79049d652474f39176190496012dc4c93fd0bd774ed6f86f845f3b9f345bcccf4c7b2438b83cf5846b2bcdcb39d5
 EBUILD modemmanager-1.16.4.ebuild 3567 BLAKE2B 9e5825b5df612ecc0da6ef056a58fe12e62700be0a215fd67f5f31c9de377930ac15317ed689cda7d0a88f6d027c1757ecc52c5583cd3db8083dbe39d75f1dcd SHA512 f4456cd7b40dc0ba85ba6fa2f3ec8ed3ef9b370cb9b7ee64dfb66034caf9afb33997ea8215a661439533035f62590e98601830256b2fc7780fb775d717349aab
-EBUILD modemmanager-1.16.6.ebuild 3569 BLAKE2B 22e5a59f0fc87712266582d2ac87110b331dc722ceba2d2c42e22b13e1950c1a02492da7dca30b0e3869ac6d678c26b6b46aeedbe105361feb3ebbfdee029e21 SHA512 9b9e8f518f296fcc46ce39f31601d1acac85d84815bf111a8744e9c702d4d81ba39e030e4a69140ec37bd2e83c700e1677a2e8e765f3093c71c32815c484e5a9
+EBUILD modemmanager-1.16.6.ebuild 3567 BLAKE2B 65802d8c7595ae478afea4d0232ca4da9b3a34f6a98bd4dc7443b76899c576b0c31c6c14d0c70378241fda1a5bbc7e5816c5cff12eabce6e4b8ef7a2b5d99bba SHA512 75c7aa58d2cb1097cab704b5a301b3a2a752f9ad043d853e7292d0f8963fc4f1cc0b8775b9df7a880136f5beb980679ed58349b041551787afd627f14b8bee34
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.16.6.ebuild b/net-misc/modemmanager/modemmanager-1.16.6.ebuild
index 779e3984d836..d71786684b84 100644
--- a/net-misc/modemmanager/modemmanager-1.16.6.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.16.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
 REQUIRED_USE="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 8bdca1478646..239b20e47a9e 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index a8e68a9b853c..a16d5e13b432 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -6,5 +6,5 @@ DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55d
 DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f
 EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c5223ada65faf93dc543faaed2a1916e85441f4f27d67c1f46e797d9fb6a09ee16596f94052a689fc3f5f7d107d37ea SHA512 0c02ceca9be196fb9d9f92b8929a64a96b34fa4c6e40c73931aa5ab61a8979f543729f7f9d43e5ca33afe2cfc1c4d6ea00774ff2cd5fb67ba4673a70bb1e4d1c
 EBUILD fprintd-1.90.8.ebuild 1609 BLAKE2B b740300da0690938cd618f1ed5a1380634e0bb041ed0b2634b1327b22a34c7ce5c763d9df1a980aad21cddc191c252258c2ad2128436cc20c2dc796042c87725 SHA512 9ca0ab30704e9b13be1e4569cc6f3e2a4d9047c07d52c0a292dc19287149052bc3dddf0b0f9ceb53f6698231a4b2764680dc9d08f6f38302d0dfee6eb3c371a2
-EBUILD fprintd-1.90.9.ebuild 1618 BLAKE2B a5767a33cb7faa2ed8b510a909ed91eefd84362ebd9c9b31501adb8703ab00fe8a86d1490a72146fa33b3dff5d20e01f7843202c9f88e33c6883d7a7eca22982 SHA512 48b4664618f7ef21e2dc99878989738972462fcc698a43e103a698b1a42374022f467d52408d004c734c5cb3e49d821316e52e7242cb1accabb082f54f9b2abe
+EBUILD fprintd-1.90.9.ebuild 1625 BLAKE2B f7b7900d0eec3e2119da211b9435f64ae803a11a3a1d9d7c9ab1495a13d59e33ffa982ca7a0e0014ef3be1117b4c2146331ba0396cc0571cfca3713144846ad0 SHA512 be70b630ffbac2cc3631d08832cc9d984c2edcb8eb11bfa702840d96eebe55c4bc1cd0c12a7bea1bf7fb10bc6d41a10b1dcbb21d296f201d525738058d635b86
 MISC metadata.xml 269 BLAKE2B cb039f1da13c33bcfc399265c6003a2c4da752be38e7303379a80f46f7fba40d5aa12a3c06f4e4848d2aaa26302b3753a14819ec03e6f976a2bc7d7a9498a9cc SHA512 b6a151f66281c84e0b33d6a9de97fcf86bf16a0299ab076150935e48e2261f8a93f4b97a38ca374033015e0418569c1962136794850763e87039142df39db60f
diff --git a/sys-auth/fprintd/fprintd-1.90.9.ebuild b/sys-auth/fprintd/fprintd-1.90.9.ebuild
index d8be8e17fded..85abf86e9618 100644
--- a/sys-auth/fprintd/fprintd-1.90.9.ebuild
+++ b/sys-auth/fprintd/fprintd-1.90.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${PN}-v
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index e0e768a16e30..ff8596e97120 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index 0db4599ced15..0fc447323edf 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -14,6 +14,7 @@ DIST storcli-7.1410.zip 34424559 BLAKE2B cb0b613d0ccbf6ac36d1aace9174286ffe89d06
 DIST storcli-7.1508.zip 35678755 BLAKE2B 9fb8da35be491afaea3a288b5c4c1ed0806fa9d6831e9a6dbf14d4c00469b1ce6e9d8fe9a98ce64505580420b5c145f002338d3029794af4c54779d9f324ec56 SHA512 43565cc695e9e7a7725474ab8091ea00de8fde7fabffe708c45e4c0e8713b1fcb1a5a25963bba44974b7787bebc06a59f3b8180416fefb0a54b4fd403c6152be
 DIST storcli-7.1613.zip 35016341 BLAKE2B 046651c696e5a20bcd0488c3cb495c7260e7665e3cb93052fce7fc79de019cb310ac7b1615f4ee4cc59a3bddcb81e548b82098a5ba051b1ba94f721115e95ff9 SHA512 5c90bce5502ec725a41c670438acd2e1eb07d21edba6e940f00f568f63a2e9e9095817eb50a4995d1ff8482a60ab77a633f01df0dc0a1abe7b767ce24b38b79b
 DIST storcli-7.1715.zip 40965278 BLAKE2B 044cf3e7b7bc9853ce7ff06050c59ceb877e88ffece2f6494561fcd416e00b41d033ff1ffe0e18b63e55edf2443296bdd3f817c09c48a0e0d69365d41cdd43fd SHA512 79dbd5f2ded4897a3d867bbab76d415b8532a647fc12f369f667e11e772b398954a2d762a011c37ab7a18b4759c3c1f8408d129ceb9b1ae62bce4671380eb988
+DIST storcli-7.1804.zip 41197159 BLAKE2B ade40bce515a3b1715243877f7b255c368296c153232ec268b95d9a61d79b538403da160c0ecfe20e6d5ab80f1d631fd459fba7391cfeb3041c42ed641474b2f SHA512 fd47759c757f61193fd449cb5ea6d33ccfb9ec239176fa4f4d5997afc62e168f0cd24fe9910d8c8fd3a65d2386fbbaa78ac13d53fca2e82c294eea2f45219a3b
 EBUILD storcli-1.19.04.ebuild 2061 BLAKE2B 4325ee37d40cec579ec666a21729c157992db6e71dd52ef0686dd555be2d3fe3b6aad15785427b65dbb0b677a1ce80079a0d08e2fb871d10d230a1bc5d867149 SHA512 f267f5faa8e9d3951b3e166915c9cb090702ae0bf751d923e8206ce73628bf82777965e156e40bb864434b1855af3488bcd5c1ac7748537fff567a2f5964a083
 EBUILD storcli-1.20.15.ebuild 2074 BLAKE2B 8b6fd28e3be1b8895c393ce38d844d85a9d80bca8d8c58be6c7e5f4a8c3560bc219b5e3a3d891cea6a2d274762319fd18c44e3200aa1238abb6a4cd5d2a3c5df SHA512 07da506f5535aa55195dbc8ca04564e7e88073cc61a2ec94f513ce877b156618c8092290793558495ff339273dc8d1b9f02ed07cb35138ff4fdc2301ee021564
 EBUILD storcli-1.21.06.ebuild 2667 BLAKE2B 71249f138b350ca36f6fec6e64672ce923b80e982baac3666e844bd98fcd7ea18c3527b14299f05a9b8c720b3ea39cd25abb4c3bd1d3394bec4ce281203d9c23 SHA512 657a80558476e4134fc2821c5aa9f8de0b3dc6ff3ee38a9385be538f310006d725b52683fd56ead278eb92c57413d3a3096fb09792af93854248cc9aab69c598
@@ -28,4 +29,5 @@ EBUILD storcli-7.1410.ebuild 1701 BLAKE2B 706ca8f5b08be1d5bbd552daa202ab419fe844
 EBUILD storcli-7.1508.ebuild 1686 BLAKE2B 905183e8003dee1d7317633157662844b35ba85744a10671e1d60fc41a878d53d58f9d504f2cb67d3e16d29e3dcfd2dd4c9338ee743177b2b4d8c55674f92def SHA512 0382c253f4b98fde4d498523f7bf76b26cb18b05e8e2e2026274a3695eba91955514f1a1d2fc1a35fc75b75f8b79e04f9fa0ada9ab5d3089df79aaadd392334e
 EBUILD storcli-7.1613.ebuild 1686 BLAKE2B 620c6f13830d7ef1470f1d6ef1f2f0d37528b3b64506283c4f5fd4bd575f6c6867d7b1a2b96befb34df8f666800f40c2cf91e75b13d4e2f92c9df287b977abeb SHA512 4eae2f7667481130727e8fdb13bbdc8e6df08eb10c2fc11453e5ffc597cea5c06b43a0a5fcea5d3d2eabe3fd189cff4394aa8495bdba77a821ce287b8db2861d
 EBUILD storcli-7.1715.ebuild 1686 BLAKE2B 840605886041ef5a01949bc69cb64eaab3de7025f77e6da7f8a49d5364b1308d3fcfb24c8e2b4768768b97ebf74dde7f8283664b10546aad19b6f2a0986185d4 SHA512 e2dd6f7a5e9f7841ba04a2eaaa99534c9d5aaf39ec2293a46f148cf0789e81668afb2b995600f29a84a889ac46ee8ef5d19e7e3c0bdce18499d0bb8cf7a334b5
+EBUILD storcli-7.1804.ebuild 1690 BLAKE2B 9b9e93aafd75777ea2e013b25024f54afda66e5b7d09102efb7d42675d6b3015d3e213a9cea2c29a58ba7378526e5cd1d9a1f946cd5ec3ae037dbcc6b001fa69 SHA512 f46ce5a76445f20ee86a22394b4ad67b090f47cab6f3ff0397ba8faf902a5420235a9f11cd0b4b18dcf03631faa9028d1f598b5c11f94e0fe2b6fa32221613a7
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.1804.ebuild b/sys-block/storcli/storcli-7.1804.ebuild
new file mode 100644
index 000000000000..f3cd616aa398
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1804.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils toolchain-funcs
+
+# Upstream is still using strange version numbers
+MY_PV="00${PV}.0000.0000"
+
+DESCRIPTION="MegaRAID StorCLI (successor of the MegaCLI)"
+HOMEPAGE="https://www.broadcom.com/support/download-search?dk=storcli"
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_PV}_Unified_StorCLI-PUL.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/${PV:0:4}"
+KEYWORDS="-* amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+MY_STORCLI_BASEDIR="/opt/lsi/storcli"
+
+QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli
+	${MY_STORCLI_BASEDIR:1}/storcli32"
+QA_PREBUILT=${QA_PRESTRIPPED}
+
+src_unpack() {
+	mkdir srcfiles || die
+	pushd srcfiles &>/dev/null || die
+	default
+	mv Unified_storcli_all_os/Ubuntu/storcli_*.deb "${WORKDIR}" || die "Failed to move storcli_*.deb"
+	popd &>/dev/null || die
+
+	rm -rf srcfiles || die
+
+	# Unpack Ubuntu package which will be our $S content
+	unpack "${WORKDIR}"/storcli_*.deb
+	rm -f storcli_*.deb || die "Failed to cleanup storcli_*.deb package"
+	unpack "${WORKDIR}"/data.tar.xz
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create clean $S
+	mv "${WORKDIR}"/opt/Mega*/storcli/* "${S}" || die "Failed to move storcli_.deb content to '${S}'"
+	rm -rf "${WORKDIR}"/{opt,control.tar.gz,data.tar.gz,debian-binary} || die "Failed to cleanup no longer needed files"
+}
+
+src_install() {
+	exeinto "${MY_STORCLI_BASEDIR}"
+	newexe storcli64 storcli
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	pax-mark m "${D}${MY_STORCLI_BASEDIR}"/storcli
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index fbb2456f8f5d..b3caa2da9558 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 8649913e812f..8985e60582cf 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -38,5 +38,5 @@ EBUILD glibc-2.33-r1.ebuild 45207 BLAKE2B 0512c0b719895136a6a5ab76e2625805539c87
 EBUILD glibc-2.33-r3.ebuild 45675 BLAKE2B 886a348dcb1af52e29481d8d1d54089306cde01f9c25f421e499280668879bc04ebb3e982d8ad1b509538e8bbb5af1a50ee4de8ff49d159c516382e80724fd30 SHA512 80a0f651e3694da4e291b0a1afd87eb77f7b662a9e7a58c11b4ca40fe6b39dfeabdfde167cfd9631479e722eec02071d7de807b460ef4c0628fe7894f3d414f4
 EBUILD glibc-2.33-r4.ebuild 46053 BLAKE2B 6053e2bb56ea88d94b82ab26ae71d613c7258763efd2b54966f7bb1a78c72464d1600ccd12858d731ee90906ad4aa56bbacb3fdf2e50012385e7d1aa7d0bd095 SHA512 2cb47f7178c4b4f7d7a2d927c383f175eaaf8d511deff63934f10dfcb74f6cc7adf8e42838433c55a25064828db80626698d66cd6960b7dbc9855cd671bce1be
 EBUILD glibc-2.33.ebuild 43992 BLAKE2B b5fd1fa3b2e2b727574028241e7805cab448b37d3975502f12140e2cd6cf98784af36393a1116c13ebaa490db3f18b7b20a56bd53343015abc521201c193eb3f SHA512 911c152ce3ff50ff79db9d53b570ff0fcf837549a072656fef8ad429d02788f89d6ee1266605c539dcbcf273aa791cf075043e8b4895eb8d67404be531631086
-EBUILD glibc-9999.ebuild 46320 BLAKE2B 16ebf65995f94f024ac6135afae42cea1209ae445f2659054b2995685f1299b4f774bf21473101804fa9a0b1bcd1151c917e5b9303bc20ba279eb6edb8ab0c7a SHA512 c3338ad890f1758cbb912121d5bf5deb4ec8095da90e7778fc50b7a7e3a4536080b85190048f8207254636a466472645dfc9fef0a9e502aa7e36100ce79fb5e4
+EBUILD glibc-9999.ebuild 46313 BLAKE2B 6c01b23e125a0a30799bcd34d51da03732f298192ae02afc7ba31df19f30ebf7371e0ed3eac28553bc3e94f2bf7cfd267d08076333ad9d0550560817f72d4722 SHA512 a472e386bc3ecd0321a41a714daf6299ba96fdbd89d987185d8c9fc7c10767497bce648255cb5951e532bb4925a4a2a8032fa6aad8bfcc086acf836b738f91d7
 MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 8904487a6b0e..107ec16a0ba7 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1461,7 +1461,7 @@ glibc_sanity_check() {
 
 	# first let's find the actual dynamic linker here
 	# symlinks may point to the wrong abi
-	local newldso=$(find . -name 'ld-linux*.so.2' -type f -print -quit)
+	local newldso=$(find . -name 'ld*so.?' -type f -print -quit)
 
 	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
 
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index e835ce762eef..79744ef8bef7 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 49048ce9c263..2389a01718c5 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -8,6 +8,6 @@ DIST parallel-20210722.tar.bz2 2248893 BLAKE2B c72da41de516e00af9d73216a134a184b
 DIST parallel-20210722.tar.bz2.sig 2080 BLAKE2B 48186854bb752e50c719f2fc6c964b3dd0b3407bf5d0683dafb475a7e6a537de1ae0e6f054f9105a4860b2fcfab50bc59ca159639bf72fcc42373f457af1cb93 SHA512 bc999d37c6eed6b170b845a01d3b0fb88661ed271fe4c18609144d3d224173ac2c66bd6fe40a5b8ddc4894503a38e558835a45ffad3ee8c0201d04dc1aed9a3c
 EBUILD parallel-20210422-r1.ebuild 888 BLAKE2B 791ac2d68a863daa215171d144e4923aa2826aa16cb7cb4dbccd6517adfb1ba6049e5cbc84af2027ed9785cfe9fce61c04df0d9d5228ccdb57934e02c4a632f6 SHA512 eb9e83be56d468988c1cfdb6ba9906e4f7b8db210f3dc36088b051a23da91eb1ce64342cdf05a86e3b58511ae4b1c707ac7dd8392e3bb3ca329aa5d49e8040af
 EBUILD parallel-20210522.ebuild 888 BLAKE2B 791ac2d68a863daa215171d144e4923aa2826aa16cb7cb4dbccd6517adfb1ba6049e5cbc84af2027ed9785cfe9fce61c04df0d9d5228ccdb57934e02c4a632f6 SHA512 eb9e83be56d468988c1cfdb6ba9906e4f7b8db210f3dc36088b051a23da91eb1ce64342cdf05a86e3b58511ae4b1c707ac7dd8392e3bb3ca329aa5d49e8040af
-EBUILD parallel-20210622.ebuild 892 BLAKE2B 74cc5985f1f9cf5288a7c6874622e8b7d96997a6b7126e8f00f854f341a2cabedaa97e5bd1ff49015fde7d4c5bd10e250bde04f5126636a206d5a1c10a410e85 SHA512 410d4b983df2d2b7bc0c7631d8cd46283ec470650835d9020e9ed5e94601c943bb0c348ba0cc8dd3314d4700a03d4084bc535c52128b1475a9fb697445774808
+EBUILD parallel-20210622.ebuild 891 BLAKE2B 07d1df858c0e3b812a5fd5a3b7621ca0bce6acc40c2fa8f6341d7837311823719f6376a812bcef568101692c7cf135770a7296107ce520cbaf777bd505e18584 SHA512 657fe201f59dc5deb1dc09484d4826e185681226e2e1810e5d0a14b013fb54518d5eb578e784bea57d3a1b5fc1ece52e029e1d015e05a18a3ef87480b967bd03
 EBUILD parallel-20210722.ebuild 892 BLAKE2B 74cc5985f1f9cf5288a7c6874622e8b7d96997a6b7126e8f00f854f341a2cabedaa97e5bd1ff49015fde7d4c5bd10e250bde04f5126636a206d5a1c10a410e85 SHA512 410d4b983df2d2b7bc0c7631d8cd46283ec470650835d9020e9ed5e94601c943bb0c348ba0cc8dd3314d4700a03d4084bc535c52128b1475a9fb697445774808
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20210622.ebuild b/sys-process/parallel/parallel-20210622.ebuild
index df4e4dc4a9df..8f1eb5f6da5c 100644
--- a/sys-process/parallel/parallel-20210622.ebuild
+++ b/sys-process/parallel/parallel-20210622.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 7f26005e19ba..c9c54fc991f7 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index 629d25247a51..7d96fe4da75f 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -3,5 +3,5 @@ DIST fonttosfnt-1.2.1.tar.bz2 146512 BLAKE2B 54b92f586248978f56b1b114a1ec02b19f7
 DIST fonttosfnt-1.2.2.tar.bz2 146855 BLAKE2B 167db11bd49675d411ec06f5581edd7a87d0518755aba05b330db8d24ec1b5f142228c3b3a0be6a740fee8835a25523cd9fc4d7b8e915cc9d51fb95786254770 SHA512 ceac6ccb064043d46f9f16f31fb89c6cbf7f026d049f7b5325d6af97e809b4cd068e6149413bb328c0af601a98b5070e21d469888a6853f6cabecd5b46f60240
 EBUILD fonttosfnt-1.2.0.ebuild 356 BLAKE2B e9d3f967a9627ddc95c971f99db33075a699b03340351821fba43022a81c0825a5831d45d1210c5c51be69ed4c5176ec193db214f50e1875d3f78b2bdbc271a5 SHA512 e43910fc1d262e11e982663ed0ae8284890f0aa3a2b441702b9263619ef575732176154860452cbd009c15330366a4ee877ea16508c2a1d5a02f5fc7dc85db23
 EBUILD fonttosfnt-1.2.1.ebuild 356 BLAKE2B d3046317971c869dbdaa434699dbade16acffdca3cb4d94361824ac058eb915a2c4a9495bbe10b77542b81e48dba5e3a9c9c4e7dc0e6ad6e9d6f2f58f94d852f SHA512 71f9dd2dede55007f4f5bd2c815fda111f479ef360e9d4826a50258aabf12bae5709870270e3b7962f5416ed7cddf549fbfe9b39f5cd619884331c68533f8567
-EBUILD fonttosfnt-1.2.2.ebuild 359 BLAKE2B 01ee4c83392145c48e391f10ca39d166bf16c976d8da6cc9e71ade690fbbe11b577010da552b10c45435503ba98260903d9c40e1e6914ae3d67131cebeddad3c SHA512 d7a5b6b1e29c16af79bea5e370bd55a1b8e2f30cedec4482aafa46af1fdecb1ef60af3e2868c3bcc66dc3c4e9b52142e3e6c10e6606e2056a5d403e08fd36d6e
+EBUILD fonttosfnt-1.2.2.ebuild 357 BLAKE2B bb9d0dcaef319d81e5e512d141f502560a5c92c7428977fba0070b69f9a759b58828c00a6df77fa3975407bd97d84075080e929871d3f9183507e0477c19709f SHA512 feff0298a9c20b02cc2b7ee099e669e7e94ecc2d9d2f85f4b50c74aa2fb4e8ea7cead0d61fb8ba5f1a4e33ec99aae728e1d9595f790d70bae4e471394c0cfb95
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
index 9c308ccfea51..a38b926ee12e 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="media-libs/freetype:2
 	x11-libs/libX11
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index ca85035f7794..3477c630fed5 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index bf69442b40bf..a57fe6d107d2 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-input-libinput-1.0.1.tar.bz2 379125 BLAKE2B 4cfb4ee34e2bb134c4e0345cb0ff40ce73f336cd60715095af3de1a1231ad192f24cf8b69b6b4339b037cb9a2bae6d33d92e6631d81ed2d24f6684767d804b4e SHA512 bb3cc4e9507d5ff6e430aabb5c87e412e8bbc5fd18b85fa4826123cb6be2f8f41078863fda09304f9dbd1264bbf1c3c7d6c11700ede0a5db733fbd1a03ec915b
 DIST xf86-input-libinput-1.1.0.tar.bz2 380727 BLAKE2B 03f394340bb79ee928509471200434fd8efa1385a1747bd1c95743e2d235f806c7b2816496ec74518c18dc967c6761ea779d0c66b525aa80ac6a36bb80c4a45b SHA512 7def9a4834a9203d1672613b1a4b384a0eb3d664818865b375969bf9ca96c512b752859acc8916de9224f7e488f8d59953308e53b983dfa8031ca01fd707fa2b
 EBUILD xf86-input-libinput-1.0.1.ebuild 452 BLAKE2B 0779a934b634a38c08d843f571c6096859a98db0460467deaba93ba73f1705ca2f8ebbdc6e0780f2e593ae0c7f204a86e2ea3779a5e8a89694264856cafafb68 SHA512 69579671a84bd692308c9de79c50a9989cddc0a079f1c01a0cc68a6ea1c175c6d501d8acd25a75b13cee876d1d56489e9848f793a05e6c782078c85a5c6b702a
-EBUILD xf86-input-libinput-1.1.0.ebuild 456 BLAKE2B 3d0d5941ecf23f51dfc94b2d5672813412228dceaeee707be15e9283c32581c7406a7bb6fb9ddb303018d22288d870af093baa0e14ad57ed6be2d21a719b7bb9 SHA512 43e6ad7af31c1b1a8edee483bde5c753abda5441b835b98b7bba17080d94b481c62d669f777dc1e52634343b12050c26c1adeb1cb50d2e0b822fd362f25e1088
+EBUILD xf86-input-libinput-1.1.0.ebuild 454 BLAKE2B 9dbcc3ec26881ccd5182370d2310746c6024508dcc1ca5912bfc455522907ccbd9b17bb22f2e9aa87a22ca8d5af04254d5591e5c8596f8e5c2bbd5c60e635176 SHA512 166ecdc08b916a90fe3a8a45b73ac0272b1f7cf0efe9df4f86ba0e89caad388a868f013098e125c604a42f0fe70e9aa665f40ea7390182ce11c5c36b88574a09
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
index 280f61547b7b..67050b07e6d4 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-3
 
 DESCRIPTION="X.org input driver based on libinput"
 
-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=""
 
 RDEPEND=">=dev-libs/libinput-1.11.0:0="
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e52fe52c9010..bd10a10b208b 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index c744c3aa99cb..c028a41735f6 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -3,5 +3,5 @@ DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8
 DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 EBUILD libX11-1.7.0.ebuild 879 BLAKE2B 86220953f41861753950b58fea111d9f7023514f9d8af00520d67753ab84ca7c9ea4d04be650c7fabf40a560c9ed60a0d4e9b6b29bd983c388622ddabfc2b657 SHA512 f276e0a0894432c99d6c16b4cd86501c83d141d1cf1301105a53bce3910cf0611576c9b748b4d3a95957ec9409d738dff2bab944b5637d1ab0cde89b8cb9d3ed
 EBUILD libX11-1.7.1.ebuild 933 BLAKE2B 3f04d4391f7a64679b7a10aeb3f68b1178ad9bf6389bd6607fda2cb654694a9b862da89856dc7e60e951a11908f065ca269a829f7181bf7b20300ba7dee73fba SHA512 8dc77dae5065e805a0f8af0c0f2c95c3c2541fc9b5cc19decc064cda661640673ecc2d8ca56daeb95e0ff1618fdd109376f6d0b13f7d54022789afe051e76ff7
-EBUILD libX11-1.7.2.ebuild 936 BLAKE2B 3d163f67f803b0cf4c3bc8a0af1ae7c4ce802a4392ec0e6d9cf40a05614fd8fd0ce1e6a5d9ad53be49b8101248c2ea1d62bf3106b05d2384327e6771da3a29e8 SHA512 bd5b28d4814328d6669c6355ddb3ecfa47b81b3ec0bb58a4cd9eaf825bd13d1e7c13d09fd3c41b9a1092b7ec917ca8e69e0636242842d456d7608250cb928f5f
+EBUILD libX11-1.7.2.ebuild 934 BLAKE2B fc8a960addbd77ec5925295bf34be691946adb62961d42229972b7fcfcdd8390369ed35e9c9a1cd9a2702929f8cd420535aac22bf1c66e51aba8f132b9a0b441 SHA512 26ae1616e85b4c98f959626f600a63794d1b1571627e608d9be9da7745e5aab00f9b77ce2253cd736a6f93bda814029017ebdb3bdc31855dca37ea4b8eb4372e
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
index 848b6ade703a..077e229d9eb1 100644
--- a/x11-libs/libX11/libX11-1.7.2.ebuild
+++ b/x11-libs/libX11/libX11-1.7.2.ebuild
@@ -10,7 +10,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 67fa585e3e8f..e609513a8eec 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -2,7 +2,7 @@ DIST libdrm-2.4.105.tar.xz 420376 BLAKE2B 1443dd378263358e7af64ee63ac6d25d2c5efa
 DIST libdrm-2.4.106.tar.xz 418176 BLAKE2B b0f935297239560179ec8994b62c7161494d4c1aa33bbfdc4d5e4ecff97d252f7556575391ebf486e24257c365415e656b9f84ac883dc9d56baf39e79ff8c5f2 SHA512 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e1591111ed240da42612d5af5e75558db6f6a85d14617d
 DIST libdrm-2.4.107.tar.xz 425612 BLAKE2B a685cd9a6549c7bdf1efb4e7ebddd0ea49554fa718f8328c868a1f245e7c072933e49546591c056ba7ece8d8841b8138e4247dd8697238a18c2cd92fe5446341 SHA512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0
 EBUILD libdrm-2.4.105.ebuild 1988 BLAKE2B cfb94eaf9f6bc949b597d915556b52f9de85d0c10aa20aca571a27f99500f9543dc368771ee61c59b89e18f5d9ecbd72eb17f716b9a7ecea35a6d7b4f9b18efd SHA512 32c0df2d09c9088ff2fd2dcfff73ebd78355c8132e2f042413300b31e63b4ffb878f57cc513733da190b6e19b241b5c2a0cba5b7aaf7d5f46d3f5358664ffa8f
-EBUILD libdrm-2.4.106.ebuild 1745 BLAKE2B 6503e8c9743223faacd60ede3bab2aa848d73557a8d705aaf329333a16e1204ad5b97897d41c5850ca4026c9b21af01bbfb1100a2ad7598e771d58744b15ebed SHA512 8c4f0ca72b8fc0166182ac1533274cf7296d1bae0890728e5886e6f53c8160c16734ef3b685b6ac8fb13c85600e55daba55acc1760d394848f058aa0fe982df6
+EBUILD libdrm-2.4.106.ebuild 1743 BLAKE2B 9b2740e590c37ef476ec224797c525c7e926e78dd1ad2ae12d389609dbb91cc58d04984ff1d0f6598ecce2cf38a2c66191fa49b99d9ec35644673331bd00891b SHA512 d952cc35347917f7be1aa256e1a997c69d72977b7fba566b70f48d6106bdeb9c85edcb631c9064806a6c1b10e840731637d8e51cd4abfcf7b62398f044afa88e
 EBUILD libdrm-2.4.107.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
 EBUILD libdrm-9999.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.106.ebuild b/x11-libs/libdrm/libdrm-2.4.106.ebuild
index d27d24510b94..4ca4e6353d7b 100644
--- a/x11-libs/libdrm/libdrm-2.4.106.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.106.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 1e359050e266..2be8ff33ce99 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -7,5 +7,5 @@ DIST pango-1.48.7.tar.xz 2050880 BLAKE2B 2ee048d9713aed0972ffdf3feb96c7c0683ffa1
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
 EBUILD pango-1.48.5-r1.ebuild 2140 BLAKE2B e53a8cab9f9de8c8e5828fbfe3784877ef4c416ee39a1780a49b0978c5f4a85ff21e2a53a3204c65a51458d25b143ce8361dc8323fa34167981066040cb982ab SHA512 ebadd72e5bfb7ed5fccc1da685d6b973c7931fcc076c6a466e49e8c41980e0a781f3ff42272b83b0b9db02224b9a30881fd2f0c484c9f0f163101f17e1b5b3c9
 EBUILD pango-1.48.7-r1.ebuild 2053 BLAKE2B 1b729b32692a2324bffc00de5e03d800fc6db3810385b8110b7664e3c6349cc4fbd7e2888f765166d5505b8ec0edb1464106ff35a8c75ca0ae6ce824777f3537 SHA512 81e4946d186614e2028d6ed714e3798590b7fde1ba45f943e10f7a9e1796270ef656f80c8a8455dc49fc6409a77eb39d6585e580bef5363032c4379a08d9816e
-EBUILD pango-1.48.7.ebuild 2192 BLAKE2B ba28af20a0b5252417a4d9015b677813e17f9b8af39c6a77d2722d98a09f9204401d0c4633c6d9ad49c28036e43c9a4448a0606c4c19bc3891ba871e41d03e6c SHA512 e85b1995777074a2f1a3c01e11325986a5ece62952874b848748ddd7cc88de5d30700972dd34048835b54d3b7427a800d929c8a6fbd19b2832e414cad03e3fef
+EBUILD pango-1.48.7.ebuild 2190 BLAKE2B 748b0b14323d74607ca92991bb6a58440869fc3fc9996c858c1bb9f7b91d7c9911d358d8e1de7f53cb3bceab6aa09fe38491680851ab4883526bb4a59b33186b SHA512 d789063995b19a11a48c54899fbbfcdeb56b06bbb5f8ddc54b5ab919f05fbe5d420b2b462c1abf2ca37648e9ef20983b6decb21f60e083e0ccd291161723db89
 MISC metadata.xml 522 BLAKE2B 9e37b7287a6d6567d68daea4265ae5d13d3c336682408bdeb4f7ef92b9cd9907c4f69052fb52b59a8cd55eb40d04c660fedde562ac2a85e41844189810ed4fb8 SHA512 6af19288fc9a7e9f441f64df4e74f32ade7303df52e1c285275e41f34f0d7664b22167793c08e79e6667fe27f44afe5c1b8548d68f5878d63a432e293956fd82
diff --git a/x11-libs/pango/pango-1.48.7.ebuild b/x11-libs/pango/pango-1.48.7.ebuild
index 1557e6e9bf99..b225dec34899 100644
--- a/x11-libs/pango/pango-1.48.7.ebuild
+++ b/x11-libs/pango/pango-1.48.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 IUSE="gtk-doc +introspection sysprof test X"
 RESTRICT="!test? ( test )"
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 76282f2c6b69..080bdfca1cdc 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -9,5 +9,5 @@ DIST vte-0.64.1.tar.bz2 486720 BLAKE2B bd8fb1f471a43aadf015cce8ae38c646521ca66e3
 DIST vte-0.64.2.tar.bz2 486837 BLAKE2B 3e127d61e4018607ca2df170108aef65b224a48df4d57545c98cbdb9753cbe7b9821e91a5bccd09d8c39af95d747a2ff01c69320e9245f5a82e7887b62c32c97 SHA512 6cbc1ee25a0ef2b00bcf26c07042eccc14fdea323e4445123db9fad05bf2e799579d723f6147c08712aec9b94e17003ce8f9e6ebe65278fdb3832cf77cba5be5
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
 EBUILD vte-0.64.1.ebuild 2519 BLAKE2B 8bc513c5b6b024735dc09dd72c10d3a45020470a0ee1221750e249e2afacce105c833360cf812086af95eb774c5f99e46701627b5ba92de433281783d4ed973e SHA512 fcf3ed398d972b5e661d0396995e9cdd4d9d15dfc4a88e441084f8805673d6f933da05618ab80c5babd7c689883129976e9b8d9c4f9439c367ef6d00ead66bee
-EBUILD vte-0.64.2.ebuild 2521 BLAKE2B 75defa46812af385eb5d4d968338f879b5dfb13fd7afb27a25de0431a7fc0def10d2ae54fce55605ffa8fb3bf53f4beea2829429ed0054929cfac8beb0f34be0 SHA512 3687198a039f41b5ecc7c2e2bfeb4a62c9ddf774590ba82ea7d02b51b2081b6d6655eda4afdb7f450a11cb80a50d61631cc8b4a548f99df3ea82cd9c57618272
+EBUILD vte-0.64.2.ebuild 2519 BLAKE2B 8bc513c5b6b024735dc09dd72c10d3a45020470a0ee1221750e249e2afacce105c833360cf812086af95eb774c5f99e46701627b5ba92de433281783d4ed973e SHA512 fcf3ed398d972b5e661d0396995e9cdd4d9d15dfc4a88e441084f8805673d6f933da05618ab80c5babd7c689883129976e9b8d9c4f9439c367ef6d00ead66bee
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.64.2.ebuild b/x11-libs/vte/vte-0.64.2.ebuild
index d606f85d2d0b..f41c77ca5132 100644
--- a/x11-libs/vte/vte-0.64.2.ebuild
+++ b/x11-libs/vte/vte-0.64.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91"
 IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 # Upstream is hostile and refuses to upload tarballs.
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e8de53fb52eb..33d332f6dd96 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 718921a481ee..39d74fbcabd4 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -3,5 +3,5 @@ DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8
 DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 EBUILD compose-tables-1.7.0.ebuild 875 BLAKE2B 175050ee8e184a4f740f4fc2bbfc55076ffd7609ab1736f0f8fa915d5c58938734e8d2f8bcc4e4554e4a41987b62d1bde5d427a9b16a3fb3a175a4639ca7c99f SHA512 8b38cb39673e97611c30dfb27e0a6bb751c9c9027e098fa09da52d31322cf8c17fa8052906c2aa6238d7253c66c31d9a6a67927af2ee93c8ef9f2570146f5828
 EBUILD compose-tables-1.7.1.ebuild 921 BLAKE2B 17b09ddcc3e3edb7f3680b303de817b1fa68e0b092b81e574bce64c738673a7406d412413f89f46fb5cd99b62e5f0e1db48ebfea0f7eaf0bf84d818820f959a5 SHA512 529bdff9f93c80a549f2dbee98aa78b5e4063ab4edf4dbcd93825b9fde10a847ff4a7af95b42cd71f56b9db39319331869101f3eb000daa65ef8d0cab07cd1b0
-EBUILD compose-tables-1.7.2.ebuild 924 BLAKE2B 87f2ace30201d761a0ca63f3c09864a4cac930be8830d313f0e393a7de25d9e9eb45246a96b38c06bea3abb98a638ddad3046fa9e81ca7142fe4aa49d33c1664 SHA512 9c6dc79ad6be05ac6629bcfe66e48a7e4c4eed10ea4481e8a931fba2375f2fd0cc1c13553edb07348004f1e383e1f8007ba0ffbe1e1f4f95368bf11709cfcf34
+EBUILD compose-tables-1.7.2.ebuild 922 BLAKE2B 5f0404670c616a7fb245ec2a0b3e3a2fe042d2613a4328460ba3cea5ea36f0af914a5049254aad7325a83c3ad3ec0258df274d93e3abb0ac4c9b83a0ad573ac8 SHA512 bc8c259f5b472610f98f1001451b100ebb45ca9989a8a1380d316d368068663e1eccb0b673bc5ad0815c601cd053f1f0de228dec7a2ac118b0d6691a1fba882a
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
index 5b0de90716c7..fafef2927bc0 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 19:42:07 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 19:42:07 +0100
commit	fbd9734cedfe790955100b8e4ab3613457d77b1a (patch)
tree	3eda83643563749dd2792dfb880eaeca1d061c18
parent	6abaca02d36f161c81e2d5ee467719a89f88b2c5 (diff)